diff options
| author | Ted Gould <ted@gould.cx> | 2009-12-10 12:39:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-12-10 12:39:41 -0600 |
| commit | 10e6923a8868dd8468e6e211a3631deafb578a3e (patch) | |
| tree | 2a79277658598c8f47d22670d974a6c543fd1c2b /libdbusmenu-glib/client.c | |
| parent | 38c9adcb94c6ab0d273815705b474a801f56a59d (diff) | |
| parent | 54203154fee5b70cf37c4ce4f92176d67597a7e8 (diff) | |
| download | libdbusmenu-10e6923a8868dd8468e6e211a3631deafb578a3e.tar.gz libdbusmenu-10e6923a8868dd8468e6e211a3631deafb578a3e.tar.bz2 libdbusmenu-10e6923a8868dd8468e6e211a3631deafb578a3e.zip | |
Merge in some of the changes from the 0.2 branch. Specifically we're taking:
* Changing the name to org.ayatana
* Underline fixes
* Documenation of the DBus API
We're not taking
* Updates to the test suite
* New tools
Diffstat (limited to 'libdbusmenu-glib/client.c')
| -rw-r--r-- | libdbusmenu-glib/client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index ab307bd..61f1ccf 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -351,7 +351,7 @@ id_update (DBusGProxy * proxy, guint id, DbusmenuClient * client) DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id); g_return_if_fail(menuitem != NULL); - org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem); + org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem); return; } @@ -472,7 +472,7 @@ build_proxies (DbusmenuClient * client) priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus, priv->dbus_name, priv->dbus_object, - "org.freedesktop.dbusmenu", + "org.ayatana.dbusmenu", &error); if (error != NULL) { g_warning("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message); @@ -647,7 +647,7 @@ static void menuitem_activate (DbusmenuMenuitem * mi, DbusmenuClient * client) { DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); - org_freedesktop_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi); + org_ayatana_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi); return; } @@ -689,7 +689,7 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it propdata->item = item; propdata->parent = parent; - org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata); + org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata); } else { g_warning("Unable to allocate memory to get properties for menuitem. This menuitem will never be realized."); } @@ -829,7 +829,7 @@ update_layout (DbusmenuClient * client) update_layout_cb, client, NULL, - G_TYPE_STRING, "org.freedesktop.dbusmenu", + G_TYPE_STRING, "org.ayatana.dbusmenu", G_TYPE_STRING, "layout", G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID); |