← Back to branch summary

~dbusmenu-team/libdbusmenu/ubuntu

« back to all changes in this revision

Viewing changes to libdbusmenu-glib/client.c

  • Committer: Ted Gould
  • Date: 2009-12-10 18:53:54 UTC
  • mfrom: (3.8.23 trunk.0.1)
  • Revision ID: ted@gould.cx-20091210185354-1way8phs026zp8b9
* Upstream release 0.1.8
  * Changing the name to org.ayatana
  * Underline fixes
  * Documenation of the DBus API 

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdbusmenu-glib/client.c
351
351
        DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id);
352
352
        g_return_if_fail(menuitem != NULL);
353
353
 
354
 
        org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem);
 
354
        org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem);
355
355
        return;
356
356
}
357
357
 
472
472
        priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus,
473
473
                                                          priv->dbus_name,
474
474
                                                          priv->dbus_object,
475
 
                                                          "org.freedesktop.dbusmenu",
 
475
                                                          "org.ayatana.dbusmenu",
476
476
                                                          &error);
477
477
        if (error != NULL) {
478
478
                g_warning("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
647
647
menuitem_activate (DbusmenuMenuitem * mi, DbusmenuClient * client)
648
648
{
649
649
        DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
650
 
        org_freedesktop_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi);
 
650
        org_ayatana_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi);
651
651
        return;
652
652
}
653
653
 
689
689
                        propdata->item    = item;
690
690
                        propdata->parent  = parent;
691
691
 
692
 
                        org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
 
692
                        org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
693
693
                } else {
694
694
                        g_warning("Unable to allocate memory to get properties for menuitem.  This menuitem will never be realized.");
695
695
                }
829
829
                                                    update_layout_cb,
830
830
                                                    client,
831
831
                                                    NULL,
832
 
                                                    G_TYPE_STRING, "org.freedesktop.dbusmenu",
 
832
                                                    G_TYPE_STRING, "org.ayatana.dbusmenu",
833
833
                                                    G_TYPE_STRING, "layout",
834
834
                                                    G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID);
835
835