ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00783
[Merge] lp:~ted/dbusmenu/layout-updated into lp:dbusmenu
Ted Gould has proposed merging lp:~ted/dbusmenu/layout-updated into lp:dbusmenu.
Requested reviews:
DBus Menu Team (dbusmenu-team)
Changing all instances of 'LayoutUpdate' to 'LayoutUpdated' as discussed
on the dbusmenu list.
--
https://code.launchpad.net/~ted/dbusmenu/layout-updated/+merge/17929
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c 2010-01-21 23:16:50 +0000
+++ libdbusmenu-glib/client.c 2010-01-22 21:30:27 +0000
@@ -499,8 +499,8 @@
}
dbus_g_object_register_marshaller(_dbusmenu_server_marshal_VOID__INT_UINT, G_TYPE_NONE, G_TYPE_INT, G_TYPE_UINT, G_TYPE_INVALID);
- dbus_g_proxy_add_signal(priv->menuproxy, "LayoutUpdate", G_TYPE_INT, G_TYPE_UINT, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(priv->menuproxy, "LayoutUpdate", G_CALLBACK(layout_update), client, NULL);
+ dbus_g_proxy_add_signal(priv->menuproxy, "LayoutUpdated", G_TYPE_INT, G_TYPE_UINT, G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal(priv->menuproxy, "LayoutUpdated", G_CALLBACK(layout_update), client, NULL);
dbus_g_object_register_marshaller(_dbusmenu_server_marshal_VOID__UINT_STRING_POINTER, G_TYPE_NONE, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
dbus_g_proxy_add_signal(priv->menuproxy, "ItemPropertyUpdated", G_TYPE_UINT, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
=== modified file 'libdbusmenu-glib/dbus-menu.xml'
--- libdbusmenu-glib/dbus-menu.xml 2010-01-21 23:13:40 +0000
+++ libdbusmenu-glib/dbus-menu.xml 2010-01-22 21:30:27 +0000
@@ -182,7 +182,7 @@
item for the entries that have changed. It is zero if the
whole layout should be considered invalid.
-->
- <signal name="LayoutUpdate">
+ <signal name="LayoutUpdated">
<arg type="i" name="revision" direction="out" />
<arg type="u" name="parent" direction="out" />
</signal>
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c 2010-01-21 23:13:52 +0000
+++ libdbusmenu-glib/server.c 2010-01-22 21:30:27 +0000
@@ -63,7 +63,7 @@
enum {
ID_PROP_UPDATE,
ID_UPDATE,
- LAYOUT_UPDATE,
+ LAYOUT_UPDATED,
LAST_SIGNAL
};
@@ -148,7 +148,7 @@
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT);
/**
- DbusmenuServer::layout-update:
+ DbusmenuServer::layout-updated:
@arg0: The #DbusmenuServer emitting the signal.
@arg1: A revision number representing which revision the update
represents itself as.
@@ -157,10 +157,10 @@
This signal is emitted any time the layout of the
menuitems under this server is changed.
*/
- signals[LAYOUT_UPDATE] = g_signal_new(DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE,
+ signals[LAYOUT_UPDATED] = g_signal_new(DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED,
G_TYPE_FROM_CLASS(class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(DbusmenuServerClass, layout_update),
+ G_STRUCT_OFFSET(DbusmenuServerClass, layout_updated),
NULL, NULL,
_dbusmenu_server_marshal_VOID__INT_UINT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_UINT);
@@ -248,7 +248,7 @@
g_debug("Setting root node to NULL");
}
priv->layout_revision++;
- g_signal_emit(obj, signals[LAYOUT_UPDATE], 0, priv->layout_revision, 0, TRUE);
+ g_signal_emit(obj, signals[LAYOUT_UPDATED], 0, priv->layout_revision, 0, TRUE);
break;
default:
g_return_if_reached();
@@ -306,7 +306,7 @@
/* TODO: We probably need to group the layout update signals to make the number more reasonble. */
DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
priv->layout_revision++;
- g_signal_emit(G_OBJECT(server), signals[LAYOUT_UPDATE], 0, priv->layout_revision, 0, TRUE);
+ g_signal_emit(G_OBJECT(server), signals[LAYOUT_UPDATED], 0, priv->layout_revision, 0, TRUE);
return;
}
@@ -317,7 +317,7 @@
/* TODO: We probably need to group the layout update signals to make the number more reasonble. */
DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
priv->layout_revision++;
- g_signal_emit(G_OBJECT(server), signals[LAYOUT_UPDATE], 0, priv->layout_revision, 0, TRUE);
+ g_signal_emit(G_OBJECT(server), signals[LAYOUT_UPDATED], 0, priv->layout_revision, 0, TRUE);
return;
}
@@ -326,7 +326,7 @@
{
DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
priv->layout_revision++;
- g_signal_emit(G_OBJECT(server), signals[LAYOUT_UPDATE], 0, priv->layout_revision, 0, TRUE);
+ g_signal_emit(G_OBJECT(server), signals[LAYOUT_UPDATED], 0, priv->layout_revision, 0, TRUE);
return;
}
=== modified file 'libdbusmenu-glib/server.h'
--- libdbusmenu-glib/server.h 2009-12-09 19:58:32 +0000
+++ libdbusmenu-glib/server.h 2010-01-22 21:30:27 +0000
@@ -45,7 +45,8 @@
#define DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE "item-property-updated"
#define DBUSMENU_SERVER_SIGNAL_ID_UPDATE "item-updated"
-#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE "layout-update"
+#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED "layout-updated"
+#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED
#define DBUSMENU_SERVER_PROP_DBUS_OBJECT "dbus-object"
#define DBUSMENU_SERVER_PROP_ROOT_NODE "root-node"
@@ -56,7 +57,7 @@
@parent_class: #GObjectClass
@id_prop_update: Slot for #DbusmenuServer::id-prop-update.
@id_update: Slot for #DbusmenuServer::id-update.
- @layout_update: Slot for #DbusmenuServer::layout-update.
+ @layout_updated: Slot for #DbusmenuServer::layout-update.
@dbusmenu_server_reserved1: Reserved for future use.
@dbusmenu_server_reserved2: Reserved for future use.
@dbusmenu_server_reserved3: Reserved for future use.
@@ -71,7 +72,7 @@
/* Signals */
void (*id_prop_update)(guint id, gchar * property, gchar * value);
void (*id_update)(guint id);
- void (*layout_update)(gint revision);
+ void (*layout_updated)(gint revision);
/* Reserved */
void (*dbusmenu_server_reserved1)(void);
Follow ups
