← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gtk+2.0/utopic

« back to all changes in this revision

Viewing changes to debian/patches/062_dnd_menubar.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2013-06-07 17:15:49 UTC
  • Revision ID: package-import@ubuntu.com-20130607171549-mxb2rt9jscf01sfb
Tags: 2.24.18-0ubuntu2
* debian/patches/043_ubuntu_menu_proxy.patch,
  debian/patches/072_indicator_menu_update.patch,
  debian/libgtk2.0-0.symbols:
  - drop old menu patches, we deprecate appmenu-gtk in favor of the new
    unity-gtk-module code
* debian/patches/gtk-shell-shows-menubar.patch:
  -list gtk-shell-shows-menubar setting, that's required to have 
   the local menubars hidding under unity in favor of the unity ones, 
   thanks William Hua for the work on those changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/062_dnd_menubar.patch
1
1
# Comment: let click on menubar to do dnd
2
2
# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=611313
3
3
#
4
 
Index: gtk+-2.24.12/gtk/gtkmenushell.c
 
4
Index: gtk+2.0-2.24.18/gtk/gtkmenushell.c
5
5
===================================================================
6
 
--- gtk+-2.24.12.orig/gtk/gtkmenushell.c        2012-09-04 16:42:45.274564166 +1200
7
 
+++ gtk+-2.24.12/gtk/gtkmenushell.c     2012-09-04 16:42:47.162564101 +1200
8
 
@@ -394,6 +394,14 @@
9
 
                                                          FALSE,
10
 
                                                          GTK_PARAM_READWRITE));
 
6
--- gtk+2.0-2.24.18.orig/gtk/gtkmenushell.c     2013-06-05 19:21:26.045252150 +0200
 
7
+++ gtk+2.0-2.24.18/gtk/gtkmenushell.c  2013-06-05 19:21:26.041252150 +0200
 
8
@@ -406,6 +406,14 @@
 
9
                                                         TRUE,
 
10
                                                         GTK_PARAM_READWRITE));
11
11
 
12
12
+
13
13
+  gtk_widget_class_install_style_property (widget_class,
20
20
   g_type_class_add_private (object_class, sizeof (GtkMenuShellPrivate));
21
21
 }
22
22
 
23
 
@@ -649,18 +657,45 @@
 
23
@@ -609,18 +617,45 @@
24
24
 
25
25
   if (!menu_shell->active || !menu_shell->button)
26
26
     {