← Back to branch summary

~charlesk/appmenu-gtk/lp-788640

« back to all changes in this revision

Viewing changes to src/bridge.c

  • Committer: Cody Russell
  • Date: 2010-05-07 14:41:07 UTC
  • Revision ID: crussell@canonical.com-20100507144107-3ypdmslcqqz0ppof
Rename dbus object/interface

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/bridge.c
36
36
 
37
37
#include "bridge.h"
38
38
 
39
 
#define UPANEL_MENU_DBUS_OBJECT "/org/ayatana/upanel/menu"
 
39
#define APP_MENU_DBUS_OBJECT "/org/ayatana/WindowMenu/Registrar"
 
40
#define APP_MENU_INTERFACE   "org.ayatana.WindowMenu.Registrar"
40
41
 
41
42
static void app_menu_bridge_insert         (GtkMenuProxy      *proxy,
42
43
                                            GtkWidget         *child,
59
60
 
60
61
  bridge->priv->items = g_hash_table_new (g_direct_hash, g_direct_equal);
61
62
 
62
 
  bridge->priv->server = dbusmenu_server_new (UPANEL_MENU_DBUS_OBJECT);
 
63
  bridge->priv->server = dbusmenu_server_new (APP_MENU_DBUS_OBJECT);
63
64
  bridge->priv->root = dbusmenu_menuitem_new ();
64
65
 
65
66
  dbusmenu_server_set_root (bridge->priv->server,
266
267
                                             DBUS_INTERFACE_DBUS);
267
268
 
268
269
      if (!org_freedesktop_DBus_request_name (bus_proxy,
269
 
                                              "ayatana.upanel.menu",
 
270
                                              APP_MENU_INTERFACE,
270
271
                                              0,
271
272
                                              &nameret,
272
273
                                              &error))