diff -Nru glade-3.11.0/debian/changelog glade-3.11.0/debian/changelog --- glade-3.11.0/debian/changelog 2012-03-09 21:38:43.000000000 +0000 +++ glade-3.11.0/debian/changelog 2012-03-16 16:08:53.000000000 +0000 @@ -1,3 +1,10 @@ +glade (3.11.0-1ubuntu1) precise; urgency=low + + * debian/patches/10_ubuntu_show_embedded_menus.patch: + - Show GtkMenuBar inside glade under Unity (LP: #707606) + + -- Michael Terry Wed, 14 Mar 2012 15:10:39 -0400 + glade (3.11.0-1) unstable; urgency=low * New upstream release. diff -Nru glade-3.11.0/debian/control glade-3.11.0/debian/control --- glade-3.11.0/debian/control 2012-03-09 21:40:31.000000000 +0000 +++ glade-3.11.0/debian/control 2012-03-16 16:13:35.000000000 +0000 @@ -6,8 +6,9 @@ Source: glade Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Deng Xiyue , Emilio Pozuelo Monfort , Jordi Mallach , Josselin Mouette , Michael Biebl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Deng Xiyue , Emilio Pozuelo Monfort , Jordi Mallach , Josselin Mouette , Michael Biebl Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glade Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/glade Build-Depends: cdbs (>= 0.4.41), diff -Nru glade-3.11.0/debian/control.in glade-3.11.0/debian/control.in --- glade-3.11.0/debian/control.in 2012-03-09 20:41:11.000000000 +0000 +++ glade-3.11.0/debian/control.in 2012-03-16 16:09:56.000000000 +0000 @@ -1,7 +1,8 @@ Source: glade Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glade Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/glade diff -Nru glade-3.11.0/debian/patches/10_ubuntu_show_embedded_menus.patch glade-3.11.0/debian/patches/10_ubuntu_show_embedded_menus.patch --- glade-3.11.0/debian/patches/10_ubuntu_show_embedded_menus.patch 1970-01-01 00:00:00.000000000 +0000 +++ glade-3.11.0/debian/patches/10_ubuntu_show_embedded_menus.patch 2012-03-16 16:13:23.000000000 +0000 @@ -0,0 +1,47 @@ +Index: glade-3.11.0/gladeui/glade-widget.c +=================================================================== +--- glade-3.11.0.orig/gladeui/glade-widget.c 2012-03-16 09:04:57.000000000 -0400 ++++ glade-3.11.0/gladeui/glade-widget.c 2012-03-16 11:54:10.830571906 -0400 +@@ -3293,6 +3293,34 @@ + } + } + ++static gboolean ++ubuntu_show_menu_bars_idle_cb (GtkWidget *widget) ++{ ++ g_object_set (G_OBJECT (widget), ++ "ubuntu-local", TRUE, ++ NULL); ++ return FALSE; ++} ++ ++/* Tells Ubuntu to show any embedded menu bars */ ++static void ++ubuntu_show_menu_bars (GtkWidget *widget) ++{ ++ if (GTK_IS_MENU_BAR (widget) && ++ g_object_class_find_property (G_OBJECT_GET_CLASS (widget), ++ "ubuntu-local") != NULL) ++ { ++ /* Set in an idle callback because glade likes to reset properties shortly */ ++ g_idle_add ((GCallback)ubuntu_show_menu_bars_idle_cb, widget); ++ } ++ else if (GTK_IS_CONTAINER (widget)) ++ { ++ gtk_container_foreach (GTK_CONTAINER (widget), ++ (GtkCallback)ubuntu_show_menu_bars, ++ NULL); ++ } ++} ++ + static void + glade_widget_set_object (GladeWidget * gwidget, GObject * new_object, + gboolean destroy) +@@ -3330,6 +3358,7 @@ + gtk_drag_source_unset (GTK_WIDGET (new_object)); + /* We nee to make sure all widgets set the event glade core needs */ + glade_widget_add_events (GTK_WIDGET (new_object)); ++ ubuntu_show_menu_bars (GTK_WIDGET (new_object)); + } + } + diff -Nru glade-3.11.0/debian/patches/series glade-3.11.0/debian/patches/series --- glade-3.11.0/debian/patches/series 2012-03-09 20:52:32.000000000 +0000 +++ glade-3.11.0/debian/patches/series 2012-03-16 16:08:58.000000000 +0000 @@ -1 +1,2 @@ +10_ubuntu_show_embedded_menus.patch 99_ltmain_as-needed.patch