diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-20 15:20:21 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-20 15:20:21 -0500 |
| commit | a65d948e90f3e6c7060ebd271e9459ddd5a747f1 (patch) | |
| tree | 7e1a1949d3d2ebe1ed36bb8bd0753a8adf74422c | |
| parent | 76b3d5020bef447e78cc6205309464b411b13836 (diff) | |
| parent | ae9a8d2c2fa9b657b20516737bf72dbc2be7102d (diff) | |
| download | libdbusmenu-a65d948e90f3e6c7060ebd271e9459ddd5a747f1.tar.gz libdbusmenu-a65d948e90f3e6c7060ebd271e9459ddd5a747f1.tar.bz2 libdbusmenu-a65d948e90f3e6c7060ebd271e9459ddd5a747f1.zip | |
Sync to the globbing branch to resolve the conflicts.
| -rw-r--r-- | libdbusmenu-glib/client.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 5e1fe0c..7c73b7b 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -639,10 +639,9 @@ id_update (DBusGProxy * proxy, gint id, DbusmenuClient * client) DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id); g_return_if_fail(menuitem != NULL); - gchar * properties[1] = {NULL}; /* This gets them all */ g_debug("Getting properties"); g_object_ref(menuitem); - get_properties_globber(client, id, (const gchar **)properties, menuitem_get_properties_cb, menuitem); + get_properties_globber(client, id, NULL, menuitem_get_properties_cb, menuitem); return; } |