From 97e210b1ec378e4e895e35035ec85146de62de2a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Jun 2009 16:54:05 -0500 Subject: Switching some of the client naming stuff to make everything stick together. --- libdbusmenu-gtk/client.h | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'libdbusmenu-gtk/client.h') diff --git a/libdbusmenu-gtk/client.h b/libdbusmenu-gtk/client.h index 73804c5..d208d16 100644 --- a/libdbusmenu-gtk/client.h +++ b/libdbusmenu-gtk/client.h @@ -26,31 +26,33 @@ License version 3 and version 2.1 along with this program. If not, see */ -#ifndef __DBUSMENU_GTKMENU_H__ -#define __DBUSMENU_GTKMENU_H__ +#ifndef __DBUSMENU_GTKCLIENT_H__ +#define __DBUSMENU_GTKCLIENT_H__ #include #include G_BEGIN_DECLS -#define DBUSMENU_GTKMENU_TYPE (dbusmenu_gtkmenu_get_type ()) -#define DBUSMENU_GTKMENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenu)) -#define DBUSMENU_GTKMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuClass)) -#define DBUSMENU_IS_GTKMENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_GTKMENU_TYPE)) -#define DBUSMENU_IS_GTKMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_GTKMENU_TYPE)) -#define DBUSMENU_GTKMENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuClass)) +#define DBUSMENU_GTKCLIENT_TYPE (dbusmenu_gtkmenu_get_type ()) +#define DBUSMENU_GTKCLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClient)) +#define DBUSMENU_GTKCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientClass)) +#define DBUSMENU_IS_GTKCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_GTKCLIENT_TYPE)) +#define DBUSMENU_IS_GTKCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_GTKCLIENT_TYPE)) +#define DBUSMENU_GTKCLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientClass)) + +#define DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED "root-changed" /** - DbusmenuGtkMenuClass: + DbusmenuGtkClientClass: @parent_class: #GtkMenuClass @reserved1: Reserved for future use. @reserved2: Reserved for future use. @reserved3: Reserved for future use. @reserved4: Reserved for future use. */ -typedef struct _DbusmenuGtkMenuClass DbusmenuGtkMenuClass; -struct _DbusmenuGtkMenuClass { +typedef struct _DbusmenuGtkClientClass DbusmenuGtkClientClass; +struct _DbusmenuGtkClientClass { GtkMenuClass parent_class; /* Reserved */ @@ -61,16 +63,16 @@ struct _DbusmenuGtkMenuClass { }; /** - DbusmenuGtkMenu: + DbusmenuGtkClient: @parent: #GtkMenu */ -typedef struct _DbusmenuGtkMenu DbusmenuGtkMenu; -struct _DbusmenuGtkMenu { +typedef struct _DbusmenuGtkClient DbusmenuGtkClient; +struct _DbusmenuGtkClient { GtkMenu parent; }; -GType dbusmenu_gtkmenu_get_type (void); -DbusmenuGtkMenu * dbusmenu_gtkmenu_new (gchar * dbus_name, gchar * dbus_object); +GType dbusmenu_gtkclient_get_type (void); +DbusmenuGtkClient * dbusmenu_gtkclient_new (gchar * dbus_name, gchar * dbus_object); /** SECTION:gtkmenu @@ -87,9 +89,9 @@ DbusmenuGtkMenu * dbusmenu_gtkmenu_new (gchar * dbus_name, gchar * dbus_object); on DBus. This involves both the DBus name and the DBus object that the menu interface can be found on. Those two value should be set when creating the object using dbusmenu_gtkmenu_new(). They are then - stored on two properties #DbusmenuGtkMenu:dbus-name and #DbusmenuGtkMenu:dbus-object. + stored on two properties #DbusmenuGtkClient:dbus-name and #DbusmenuGtkClient:dbus-object. - After creation the #DbusmenuGtkMenu it will continue to keep in + After creation the #DbusmenuGtkClient it will continue to keep in synchronization with the #DbusmenuServer object across Dbus. If the number of entries change, the menus change, if they change thier properties change, they update in the items. All of this should -- cgit v1.2.3