indicator-object.h   indicator-object.h 
skipping to change at line 63 skipping to change at line 63
#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_ENTRY_SCROLLED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_ENTRY_SCROLLED, INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_SIGNAL_MENU_SHOW "menu-show" #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW "menu-show"
#define INDICATOR_OBJECT_SIGNAL_MENU_SHOW_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_MENU_SHOW, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_MENU_SHOW, INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED "show-now-changed" #define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED "show-now-changed"
#define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED_ID (g_signal_lookup(INDICA TOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED_ID (g_signal_lookup(INDICA TOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED, INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE "accessible-desc-upd ate" #define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE "accessible-desc-upd ate"
#define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID (g_signal_lookup( INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID (g_signal_lookup( INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE "secondary-activate" #define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE "secondary-activate"
#define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE_ID (g_signal_lookup(INDI CATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE_ID (g_signal_lookup(INDI CATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, INDICATOR_OBJECT_TYPE))
/* the name of the property to decide whether or not entries are visible by
default */
#define INDICATOR_OBJECT_DEFAULT_VISIBILITY "indicator-object-defaul
t-visibility"
typedef struct _IndicatorObject IndicatorObject; typedef struct _IndicatorObject IndicatorObject;
typedef struct _IndicatorObjectClass IndicatorObjectClass; typedef struct _IndicatorObjectClass IndicatorObjectClass;
typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate; typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate;
typedef struct _IndicatorObjectEntry IndicatorObjectEntry; typedef struct _IndicatorObjectEntry IndicatorObjectEntry;
/** /**
IndicatorObjectClass: IndicatorObjectClass:
@parent_class: #GObjectClass @parent_class: #GObjectClass
@get_label: Gets the label for this object. Should be set @get_label: Gets the label for this object. Should be set
to #NULL if @get_entries is set. Should NOT ref the to #NULL if @get_entries is set. Should NOT ref the
skipping to change at line 94 skipping to change at line 97
@get_entries: Gets all of the entires for this object returning @get_entries: Gets all of the entires for this object returning
a #GList of #IndicatorObjectEntries. The list should be a #GList of #IndicatorObjectEntries. The list should be
under the ownership of the caller but the entires will under the ownership of the caller but the entires will
not be. not be.
@get_location: Returns the location that a particular entry @get_location: Returns the location that a particular entry
should be placed in. This is really only relevant for should be placed in. This is really only relevant for
indicators that have more than one entry. indicators that have more than one entry.
@get_show_now: Returns whether the entry is requesting to @get_show_now: Returns whether the entry is requesting to
be shown "right now" in that it has something important be shown "right now" in that it has something important
to tell the user. to tell the user.
@entry_being_removed: Called before an entry is removed.
The default implementation is to ref and unparent the
entry's widgets so that they can be re-added later.
@entry_was_added: Called after an entry is added.
The default implementation is to unref the entry's widgets i
f
previously reffed by entry_being_removed's default impementa
tion
@entry_activate: Should be called when the menus for a given @entry_activate: Should be called when the menus for a given
entry are shown to the user. entry are shown to the user.
@entry_close: Called when the menu is closed. @entry_close: Called when the menu is closed.
@entry_added: Slot for #IndicatorObject::entry-added @entry_added: Slot for #IndicatorObject::entry-added
@entry_removed: Slot for #IndicatorObject::entry-removed @entry_removed: Slot for #IndicatorObject::entry-removed
@entry_moved: Slot for #IndicatorObject::entry-moved @entry_moved: Slot for #IndicatorObject::entry-moved
@menu_show: Slot for #IndicatorObject::menu-show @menu_show: Slot for #IndicatorObject::menu-show
@entry_scrolled: Slot for #IndicatorObject::entry-scrolled @entry_scrolled: Slot for #IndicatorObject::entry-scrolled
@show_now_changed: Slot for #IndicatorObject::show-now-changed @show_now_changed: Slot for #IndicatorObject::show-now-changed
@accessible_desc_update: Slot for #IndicatorObject::accessible-desc- update @accessible_desc_update: Slot for #IndicatorObject::accessible-desc- update
skipping to change at line 120 skipping to change at line 129
GtkLabel * (*get_label) (IndicatorObject * io); GtkLabel * (*get_label) (IndicatorObject * io);
GtkImage * (*get_image) (IndicatorObject * io); GtkImage * (*get_image) (IndicatorObject * io);
GtkMenu * (*get_menu) (IndicatorObject * io); GtkMenu * (*get_menu) (IndicatorObject * io);
const gchar * (*get_accessible_desc) (IndicatorObject * io); const gchar * (*get_accessible_desc) (IndicatorObject * io);
const gchar * (*get_name_hint) (IndicatorObject * io); const gchar * (*get_name_hint) (IndicatorObject * io);
GList * (*get_entries) (IndicatorObject * io); GList * (*get_entries) (IndicatorObject * io);
guint (*get_location) (IndicatorObject * io, IndicatorObjectEnt ry * entry); guint (*get_location) (IndicatorObject * io, IndicatorObjectEnt ry * entry);
gboolean (*get_show_now) (IndicatorObject * io, IndicatorObjectEnt ry * entry); gboolean (*get_show_now) (IndicatorObject * io, IndicatorObjectEnt ry * entry);
void (*entry_being_removed) (IndicatorObject * io, IndicatorOb
jectEntry * entry);
void (*entry_was_added) (IndicatorObject * io, IndicatorObject
Entry * entry);
void (*entry_activate) (IndicatorObject * io, IndicatorObjectE ntry * entry, guint timestamp); void (*entry_activate) (IndicatorObject * io, IndicatorObjectE ntry * entry, guint timestamp);
void (*entry_activate_window) (IndicatorObject * io, Indicator ObjectEntry * entry, guint windowid, guint timestamp);
void (*entry_close) (IndicatorObject * io, IndicatorObjectEntr y * entry, guint timestamp); void (*entry_close) (IndicatorObject * io, IndicatorObjectEntr y * entry, guint timestamp);
/* Signals */ /* Signals */
void (*entry_added) (IndicatorObject * io, IndicatorObjectEn try * entry, gpointer user_data); void (*entry_added) (IndicatorObject * io, IndicatorObjectEn try * entry, gpointer user_data);
void (*entry_removed) (IndicatorObject * io, IndicatorObjectEn try * entry, gpointer user_data); void (*entry_removed) (IndicatorObject * io, IndicatorObjectEn try * entry, gpointer user_data);
void (*entry_moved) (IndicatorObject * io, IndicatorObjectEn try * entry, guint old_pos, guint new_pos, gpointer user_data); void (*entry_moved) (IndicatorObject * io, IndicatorObjectEn try * entry, guint old_pos, guint new_pos, gpointer user_data);
void (*entry_scrolled) (IndicatorObject * io, IndicatorObject Entry * entry, gint delta, IndicatorScrollDirection direction); void (*entry_scrolled) (IndicatorObject * io, IndicatorObject Entry * entry, gint delta, IndicatorScrollDirection direction);
void (*menu_show) (IndicatorObject * io, IndicatorObjectEn try * entry, guint timestamp, gpointer user_data); void (*menu_show) (IndicatorObject * io, IndicatorObjectEn try * entry, guint timestamp, gpointer user_data);
void (*show_now_changed) (IndicatorObject * io, IndicatorObjec tEntry * entry, gboolean show_now_state, gpointer user_data); void (*show_now_changed) (IndicatorObject * io, IndicatorObjec tEntry * entry, gboolean show_now_state, gpointer user_data);
void (*accessible_desc_update) (IndicatorObject * io, Indicato rObjectEntry * entry, gpointer user_data); void (*accessible_desc_update) (IndicatorObject * io, Indicato rObjectEntry * entry, gpointer user_data);
skipping to change at line 154 skipping to change at line 167
@priv: A cached reference to the private data for the @priv: A cached reference to the private data for the
instance. instance.
*/ */
struct _IndicatorObject { struct _IndicatorObject {
GObject parent; GObject parent;
IndicatorObjectPrivate * priv; IndicatorObjectPrivate * priv;
}; };
/** /**
IndicatorObjectEntry: IndicatorObjectEntry:
@parent_object: The #IndicatorObject that created this entry
@label: The label to be shown on the panel @label: The label to be shown on the panel
@image: The image to be shown on the panel @image: The image to be shown on the panel
@menu: The menu to be added to the menubar @menu: The menu to be added to the menubar
@accessible_desc: The accessible description @accessible_desc: The accessible description
of the indicator of the indicator
@name_hint: A name to describe the indicator being placed to allow @name_hint: A name to describe the indicator being placed to allow
the caller to be more aware of the individual entries. the caller to be more aware of the individual entries.
@reserved1: Reserved for future use @reserved1: Reserved for future use
@reserved2: Reserved for future use @reserved2: Reserved for future use
@reserved3: Reserved for future use @reserved3: Reserved for future use
@reserved4: Reserved for future use @reserved4: Reserved for future use
*/ */
struct _IndicatorObjectEntry { struct _IndicatorObjectEntry {
IndicatorObject * parent_object;
GtkLabel * label; GtkLabel * label;
GtkImage * image; GtkImage * image;
GtkMenu * menu; GtkMenu * menu;
const gchar * accessible_desc; const gchar * accessible_desc;
const gchar * name_hint; const gchar * name_hint;
void (*reserved1) (void); void (*reserved1) (void);
void (*reserved2) (void); void (*reserved2) (void);
void (*reserved3) (void); void (*reserved3) (void);
void (*reserved4) (void); void (*reserved4) (void);
}; };
GType indicator_object_get_type (void); GType indicator_object_get_type (void);
IndicatorObject * indicator_object_new_from_file (const gchar * file); IndicatorObject * indicator_object_new_from_file (const gchar * file);
GList * indicator_object_get_entries (IndicatorObject * io); GList * indicator_object_get_entries (IndicatorObject * io);
guint indicator_object_get_location (IndicatorObject * io, IndicatorObjec tEntry * entry); guint indicator_object_get_location (IndicatorObject * io, IndicatorObjec tEntry * entry);
guint indicator_object_get_show_now (IndicatorObject * io, IndicatorObjec tEntry * entry); guint indicator_object_get_show_now (IndicatorObject * io, IndicatorObjec tEntry * entry);
void indicator_object_set_visible (IndicatorObject * io, gboolean visible );
void indicator_object_entry_activate (IndicatorObject * io, IndicatorObj ectEntry * entry, guint timestamp); void indicator_object_entry_activate (IndicatorObject * io, IndicatorObj ectEntry * entry, guint timestamp);
void indicator_object_entry_activate_window (IndicatorObject * io, Indic atorObjectEntry * entry, guint windowid, guint timestamp);
void indicator_object_entry_close (IndicatorObject * io, IndicatorObject Entry * entry, guint timestamp); void indicator_object_entry_close (IndicatorObject * io, IndicatorObject Entry * entry, guint timestamp);
void indicator_object_set_environment (IndicatorObject * io, const GStrv void indicator_object_set_environment (IndicatorObject * io, GStrv env);
env); GStrv indicator_object_get_environment (IndicatorObject * io);
const GStrv indicator_object_get_environment (IndicatorObject * io);
gboolean indicator_object_check_environment (IndicatorObject * io, const gc har * env); gboolean indicator_object_check_environment (IndicatorObject * io, const gc har * env);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 9 change blocks. 
3 lines changed or deleted 25 lines changed or added


 indicator-service-manager.h   indicator-service-manager.h 
skipping to change at line 79 skipping to change at line 79
@parent: #GObject @parent: #GObject
*/ */
struct _IndicatorServiceManager { struct _IndicatorServiceManager {
GObject parent; GObject parent;
}; };
GType indicator_service_manager_get_type (void); GType indicator_service_manager_get_type (void);
IndicatorServiceManager * indicator_service_manager_new (gchar * IndicatorServiceManager * indicator_service_manager_new (const gc
dbus_name); har * dbus_name);
IndicatorServiceManager * indicator_service_manager_new_version (gchar * IndicatorServiceManager * indicator_service_manager_new_version (const gc
dbus_name, har * dbus_name,
guint ve rsion); guint ve rsion);
gboolean indicator_service_manager_connected (Indicato rServiceManager * sm); gboolean indicator_service_manager_connected (Indicato rServiceManager * sm);
void indicator_service_manager_set_refresh (Indicato rServiceManager * sm, void indicator_service_manager_set_refresh (Indicato rServiceManager * sm,
guint ti me_in_ms); guint ti me_in_ms);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
4 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/