ayatana-commits team mailing list archive

[Aurélien Gâteau <aurelien.gateau@xxxxxxxxxxxxx>]

Aurélien Gâteau has proposed merging lp:~agateau/appmenu-gtk/iface-renaming into lp:appmenu-gtk.

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)


Renames interfaces from WindowMenu to AppMenu.

I needed this change to test my dbusmenu click-to-dump branch, so I thought I'd share. Obviously you need to fix the appmenu applet in the same way for it to work on GNOME.
-- 
https://code.launchpad.net/~agateau/appmenu-gtk/iface-renaming/+merge/30410
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/application-menu-registrar.xml'
--- src/application-menu-registrar.xml	2010-05-07 14:45:37 +0000
+++ src/application-menu-registrar.xml	2010-07-20 14:08:45 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
-	<interface name="org.ayatana.WindowMenu.Registrar">
+	<interface name="org.ayatana.AppMenu.Registrar">
 
 <!-- Methods -->
 		<method name="RegisterWindow">

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-07-08 16:46:32 +0000
+++ src/bridge.c	2010-07-20 14:08:45 +0000
@@ -38,9 +38,9 @@
 #include "bridge.h"
 #include "application-menu-registrar-client.h"
 
-#define APP_MENU_DBUS_NAME   "org.ayatana.WindowMenu.Registrar"
-#define APP_MENU_DBUS_OBJECT "/org/ayatana/WindowMenu/Registrar"
-#define APP_MENU_INTERFACE   "org.ayatana.WindowMenu.Registrar"
+#define APP_MENU_DBUS_NAME   "org.ayatana.AppMenu.Registrar"
+#define APP_MENU_DBUS_OBJECT "/org/ayatana/AppMenu/Registrar"
+#define APP_MENU_INTERFACE   "org.ayatana.AppMenu.Registrar"
 #define APP_MENU_PATH        "/this/is/a/long/object/path"
 
 static void app_menu_bridge_insert         (UbuntuMenuProxy   *proxy,
@@ -256,7 +256,7 @@
 
       if (!context->registered && context->server != NULL && context->root != NULL && GTK_IS_WINDOW (widget) && bridge->priv->appmenuproxy != NULL)
         {
-          org_ayatana_WindowMenu_Registrar_register_window_async (bridge->priv->appmenuproxy,
+          org_ayatana_AppMenu_Registrar_register_window_async (bridge->priv->appmenuproxy,
                                                                   GDK_WINDOW_XID (gtk_widget_get_window (widget)),
                                                                   context->path,
                                                                   register_application_window_cb,