indicator-object.h   indicator-object.h 
skipping to change at line 52 skipping to change at line 52
#define INDICATOR_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) , INDICATOR_OBJECT_TYPE)) #define INDICATOR_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) , INDICATOR_OBJECT_TYPE))
#define INDICATOR_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_OBJECT_TYPE)) #define INDICATOR_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_OBJECT_TYPE, IndicatorObjectClass)) #define INDICATOR_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_OBJECT_TYPE, IndicatorObjectClass))
#define INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED "entry-added" #define INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED "entry-added"
#define INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_ENTRY_ADDED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_ENTRY_ADDED, INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED "entry-removed" #define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED "entry-removed"
#define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_ENTRY_REMOVED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_ENTRY_REMOVED, INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED "entry-moved" #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED "entry-moved"
#define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_ENTRY_MOVED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID (g_signal_lookup(INDICATO R_OBJECT_SIGNAL_ENTRY_MOVED, INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_SIGNAL_SCROLL "scroll" #define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED "entry-scrolled"
#define INDICATOR_OBJECT_SIGNAL_SCROLL_ID (g_signal_lookup(INDICATO #define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED_ID (g_signal_lookup(INDICATO
R_OBJECT_SIGNAL_SCROLL, INDICATOR_OBJECT_TYPE)) R_OBJECT_SIGNAL_ENTRY_SCROLLED, INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY "scroll-entry"
#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY_ID (g_signal_lookup(#define
INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY, 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))
typedef struct _IndicatorObject IndicatorObject; typedef struct _IndicatorObject IndicatorObject;
typedef struct _IndicatorObjectClass IndicatorObjectClass; typedef struct _IndicatorObjectClass IndicatorObjectClass;
typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate; typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate;
skipping to change at line 82 skipping to change at line 80
to #NULL if @get_entries is set. Should NOT ref the to #NULL if @get_entries is set. Should NOT ref the
object. object.
@get_image: Gets the image for this object. Should be set @get_image: Gets the image 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
object. object.
@get_menu: Gets the image for this object. Should be set @get_menu: Gets the image 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
object. object.
@get_accessible_desc: Gets the accessible descriptionfor this @get_accessible_desc: Gets the accessible descriptionfor this
object. object.
@get_name_hint: Gets the hint of the type of indicator that this
is for the caller.
@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_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
@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
*/ */
struct _IndicatorObjectClass { struct _IndicatorObjectClass {
GObjectClass parent_class; GObjectClass parent_class;
/* Virtual Functions */ /* Virtual Functions */
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);
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_activate) (IndicatorObject * io, IndicatorObjectE ntry * entry, guint timestamp); void (*entry_activate) (IndicatorObject * io, IndicatorObjectE ntry * entry, 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 (*scroll) (IndicatorObject * io, gint delta, Indic atorScrollDirection 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 (*scroll_entry) (IndicatorObject * io, IndicatorObjectEn try * entry, gint delta, IndicatorScrollDirection direction);
void (*accessible_desc_update) (IndicatorObject * io, Indicato rObjectEntry * entry, gpointer user_data); void (*accessible_desc_update) (IndicatorObject * io, Indicato rObjectEntry * entry, gpointer user_data);
/* Reserved */ /* Reserved */
void (*reserved1) (void); void (*reserved1) (void);
void (*reserved2) (void); void (*reserved2) (void);
void (*reserved3) (void); void (*reserved3) (void);
void (*reserved4) (void); void (*reserved4) (void);
void (*reserved5) (void); void (*reserved5) (void);
void (*reserved6) (void); void (*reserved6) (void);
}; };
skipping to change at line 155 skipping to change at line 156
IndicatorObjectPrivate * priv; IndicatorObjectPrivate * priv;
}; };
/** /**
IndicatorObjectEntry: IndicatorObjectEntry:
@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
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 {
GtkLabel * label; GtkLabel * label;
GtkImage * image; GtkImage * image;
GtkMenu * menu; GtkMenu * menu;
const gchar * accessible_desc; const gchar * accessible_desc;
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);
 End of changes. 8 change blocks. 
8 lines changed or deleted 11 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/