ayatana-commits team mailing list archive

[Cody Russell <crussell@xxxxxxxxxxxxx>]

Cody Russell has proposed merging lp:~bratsche/appmenu-gtk/namespace into lp:appmenu-gtk.

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

-- 
https://code.launchpad.net/~bratsche/appmenu-gtk/namespace/+merge/27310
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-06-09 15:11:45 +0000
+++ src/bridge.c	2010-06-10 21:03:28 +0000
@@ -41,11 +41,11 @@
 #define APP_MENU_INTERFACE   "org.ayatana.WindowMenu.Registrar"
 #define APP_MENU_PATH        "/this/is/a/long/object/path"
 
-static void app_menu_bridge_insert         (GtkMenuProxy      *proxy,
+static void app_menu_bridge_insert         (UbuntuMenuProxy   *proxy,
                                             GtkWidget         *shell,
                                             GtkWidget         *child,
                                             guint              position);
-static gboolean app_menu_bridge_show_local (GtkMenuProxy      *proxy);
+static gboolean app_menu_bridge_show_local (UbuntuMenuProxy   *proxy);
 
 struct _AppMenuBridgePrivate
 {
@@ -57,7 +57,7 @@
 static DBusGProxy *dbusproxy = NULL;
 static gboolean    registered = FALSE;
 
-G_DEFINE_DYNAMIC_TYPE(AppMenuBridge, app_menu_bridge, GTK_TYPE_MENU_PROXY)
+G_DEFINE_DYNAMIC_TYPE(AppMenuBridge, app_menu_bridge, UBUNTU_TYPE_MENU_PROXY)
 
 static void
 app_menu_bridge_init (AppMenuBridge *bridge)
@@ -79,12 +79,12 @@
 static void
 app_menu_bridge_class_init (AppMenuBridgeClass *class)
 {
-  GtkMenuProxyClass *proxy_class;
+  UbuntuMenuProxyClass *proxy_class;
   GObjectClass *object_class;
 
   app_menu_bridge_parent_class = g_type_class_peek_parent (class);
 
-  proxy_class = GTK_MENU_PROXY_CLASS (class);
+  proxy_class = UBUNTU_MENU_PROXY_CLASS (class);
   object_class = G_OBJECT_CLASS (class);
 
   proxy_class->insert = app_menu_bridge_insert;
@@ -196,9 +196,9 @@
 }
 
 static void
-toplevel_notify_cb (GtkWidget    *widget,
-                    GParamSpec   *pspec,
-                    GtkMenuProxy *proxy)
+toplevel_notify_cb (GtkWidget       *widget,
+                    GParamSpec      *pspec,
+                    UbuntuMenuProxy *proxy)
 {
   if (pspec->name == g_intern_static_string ("parent"))
     {
@@ -257,10 +257,10 @@
 }
 
 static void
-app_menu_bridge_insert (GtkMenuProxy *proxy,
-                        GtkWidget    *parent,
-                        GtkWidget    *child,
-                        guint         position)
+app_menu_bridge_insert (UbuntuMenuProxy *proxy,
+                        GtkWidget       *parent,
+                        GtkWidget       *child,
+                        guint            position)
 {
   AppMenuBridge        *bridge;
   AppMenuBridgePrivate *priv;
@@ -384,7 +384,7 @@
 }
 
 static gboolean
-app_menu_bridge_show_local (GtkMenuProxy *proxy)
+app_menu_bridge_show_local (UbuntuMenuProxy *proxy)
 {
   const gchar *env = g_getenv ("APPMENU_DISPLAY_BOTH");
 
@@ -392,7 +392,7 @@
 }
 
 G_MODULE_EXPORT void
-menu_proxy_module_load (GtkMenuProxyModule *module)
+menu_proxy_module_load (UbuntuMenuProxyModule *module)
 {
   static gboolean registered = FALSE;
 
@@ -419,6 +419,6 @@
 }
 
 G_MODULE_EXPORT void
-menu_proxy_module_unload (GtkMenuProxyModule *module)
+menu_proxy_module_unload (UbuntuMenuProxyModule *module)
 {
 }

=== modified file 'src/bridge.h'
--- src/bridge.h	2010-05-27 18:27:39 +0000
+++ src/bridge.h	2010-06-10 21:03:28 +0000
@@ -20,7 +20,7 @@
 #ifndef __APP_MENU_BRIDGE_H__
 #define __APP_MENU_BRIDGE_H__
 
-#include <gtk/gtkmenuproxy.h>
+#include <gtk/ubuntumenuproxy.h>
 
 #define APP_MENU_TYPE_BRIDGE         (app_menu_bridge_get_type ())
 #define APP_MENU_BRIDGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), APP_MENU_TYPE_BRIDGE, AppMenuBridge))
@@ -35,13 +35,13 @@
 
 struct _AppMenuBridge
 {
-  GtkMenuProxy parent_object;
+  UbuntuMenuProxy parent_object;
   AppMenuBridgePrivate *priv;
 };
 
 struct _AppMenuBridgeClass
 {
-  GtkMenuProxyClass parent_class;
+  UbuntuMenuProxyClass parent_class;
 };
 
 GType app_menu_bridge_get_type () G_GNUC_CONST;