← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/072_indicator_menu_update.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/072_indicator_menu_update.patch
1
 
## Description: Adding two signals that are needed for Application Indicator to
2
 
##              keep up-to-date with changed GtkMenu(Item)s.
3
 
## Origin/Author: Cody Russell <bratsche@gnome.org>, 
4
 
##                Sense Hofstede <sense@ubuntu.com>
5
 
## Bug: unknown and https://launchpad.net/bug/608219
6
 
Index: gtk+-2.24.12/gtk/gtkcontainer.c
7
 
===================================================================
8
 
--- gtk+-2.24.12.orig/gtk/gtkcontainer.c        2011-08-16 14:30:52.000000000 +1200
9
 
+++ gtk+-2.24.12/gtk/gtkcontainer.c     2012-09-04 16:42:52.074563931 +1200
10
 
@@ -48,6 +48,8 @@
11
 
   REMOVE,
12
 
   CHECK_RESIZE,
13
 
   SET_FOCUS_CHILD,
14
 
+  CHILD_ADDED,
15
 
+  CHILD_REMOVED,
16
 
   LAST_SIGNAL
17
 
 };
18
 
 
19
 
@@ -291,6 +293,24 @@
20
 
                  _gtk_marshal_VOID__OBJECT,
21
 
                  G_TYPE_NONE, 1,
22
 
                  GTK_TYPE_WIDGET);
23
 
+  container_signals[CHILD_ADDED] =
24
 
+    g_signal_new (I_("child-added"),
25
 
+                  G_OBJECT_CLASS_TYPE (object_class),
26
 
+                  G_SIGNAL_RUN_LAST,
27
 
+                  0,
28
 
+                  NULL, NULL,
29
 
+                  _gtk_marshal_VOID__OBJECT,
30
 
+                  G_TYPE_NONE, 1,
31
 
+                  GTK_TYPE_WIDGET);
32
 
+  container_signals[CHILD_REMOVED] =
33
 
+    g_signal_new (I_("child-removed"),
34
 
+                  G_OBJECT_CLASS_TYPE (object_class),
35
 
+                  G_SIGNAL_RUN_LAST,
36
 
+                  0,
37
 
+                  NULL, NULL,
38
 
+                  _gtk_marshal_VOID__OBJECT,
39
 
+                  G_TYPE_NONE, 1,
40
 
+                  GTK_TYPE_WIDGET);
41
 
 }
42
 
 
43
 
 static void
44
 
Index: gtk+-2.24.12/gtk/gtkmenushell.c
45
 
===================================================================
46
 
--- gtk+-2.24.12.orig/gtk/gtkmenushell.c        2012-09-04 16:42:47.162564101 +1200
47
 
+++ gtk+-2.24.12/gtk/gtkmenushell.c     2012-09-04 16:42:52.074563931 +1200
48
 
@@ -559,6 +559,8 @@
49
 
                               GTK_WIDGET (menu_shell),
50
 
                               child,
51
 
                               position);
52
 
+
53
 
+  g_signal_emit_by_name (menu_shell, "child-added", child);
54
 
 }
55
 
 
56
 
 static void
57
 
Index: gtk+-2.24.12/gtk/gtkmenuitem.c
58
 
===================================================================
59
 
--- gtk+-2.24.12.orig/gtk/gtkmenuitem.c 2012-09-04 16:42:45.278564166 +1200
60
 
+++ gtk+-2.24.12/gtk/gtkmenuitem.c      2012-09-04 16:42:52.074563931 +1200
61
 
@@ -52,6 +52,8 @@
62
 
   ACTIVATE_ITEM,
63
 
   TOGGLE_SIZE_REQUEST,
64
 
   TOGGLE_SIZE_ALLOCATE,
65
 
+  SUBMENU_ADDED,
66
 
+  SUBMENU_REMOVED,
67
 
   LAST_SIGNAL
68
 
 };
69
 
 
70
 
@@ -244,6 +246,25 @@
71
 
                  G_TYPE_NONE, 1,
72
 
                  G_TYPE_INT);
73
 
 
74
 
+  menu_item_signals[SUBMENU_ADDED] =
75
 
+    g_signal_new (I_("submenu-added"),
76
 
+                 G_OBJECT_CLASS_TYPE (gobject_class),
77
 
+                 G_SIGNAL_RUN_FIRST,
78
 
+                 0,
79
 
+                 NULL, NULL,
80
 
+                 _gtk_marshal_VOID__OBJECT,
81
 
+                 G_TYPE_NONE, 1,
82
 
+                 GTK_TYPE_WIDGET);
83
 
+ 
84
 
+ menu_item_signals[SUBMENU_REMOVED] =
85
 
+    g_signal_new (I_("submenu-removed"),
86
 
+                 G_OBJECT_CLASS_TYPE (gobject_class),
87
 
+                 G_SIGNAL_RUN_FIRST,
88
 
+                 0,
89
 
+                 NULL, NULL,
90
 
+                 _gtk_marshal_VOID__VOID,
91
 
+                 G_TYPE_NONE, 0);
92
 
+
93
 
   /**
94
 
    * GtkMenuItem:right-justified:
95
 
    *
96
 
@@ -791,6 +812,14 @@
97
 
       if (GTK_WIDGET (menu_item)->parent)
98
 
        gtk_widget_queue_resize (GTK_WIDGET (menu_item));
99
 
 
100
 
+        if(submenu == NULL)
101
 
+      {
102
 
+        g_signal_emit_by_name (menu_item, "submenu-removed");
103
 
+      }
104
 
+        else
105
 
+      {
106
 
+        g_signal_emit_by_name (menu_item, "submenu-added", GTK_WIDGET(submenu));
107
 
+      }
108
 
       g_object_notify (G_OBJECT (menu_item), "submenu");
109
 
     }
110
 
 }