Merge lp:~desrt/appmenu-gtk/ignore-gtkmodelmenu into lp:appmenu-gtk/12.10

[desrt]

Ignore menus from gtkmodelmenu, in two ways:

    - if we notice a GtkMenuShell from a gtkmodelmenu then don't try to
      monitor its toplevel

    - when searching for menubars inside of toplevels, ignore ones created
      by gtkmodelmenu

  Ignore menus from gtkmodelmenu, in two ways:

    - if we notice a GtkMenuShell from a gtkmodelmenu then don't try to
      monitor its toplevel

    - when searching for menubars inside of toplevels, ignore ones created
      by gtkmodelmenu

[Ted Gould (ted)]

review: Approve

[jenkins (martin-mrazik+qa)]

FAILED: Autolanding.
No commit message was specified.
http://jenkins.qa.ubuntu.com/job/appmenu-gtk-autolanding/6/

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/./label=precise/8/console

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Copying description to commit message to trigger autolanding

=== modified file 'src/bridge.c'
--- src/bridge.c	2012-08-22 06:56:22 +0000
+++ src/bridge.c	2012-09-18 14:59:19 +0000
@@ -585,6 +585,10 @@
 find_menu_bar (GtkWidget * widget)
 {
 	if (GTK_IS_MENU_BAR(widget) || GTK_IS_MENU_ITEM(widget)) {
+                /* If this is from gtkmodelmenu ignore it */
+                if (g_object_get_data (G_OBJECT (widget), "gtk-model-menu-binding"))
+                        return NULL;
+
 		return dbusmenu_gtk_parse_menu_structure(widget);
 	}
 
@@ -839,6 +843,10 @@
   AppMenuBridge        *bridge;
   GtkWidget            *toplevel = NULL;
 
+  /* If this is from gtkmodelmenu, don't bother... */
+  if (g_object_get_data (G_OBJECT (parent), "gtk-model-menu-binding"))
+    return;
+
   if (GTK_IS_TEAROFF_MENU_ITEM (child))
     return;