~bratsche/ubuntu/maverick/gtk+2.0/menu-activation-fix
» Revision
171
: debian/patches/043_ubuntu_menu_proxy.patch
« back to all changes in this revision
Viewing changes to debian/patches/043_ubuntu_menu_proxy.patch
- browse files at revision 171
- compare with another revision
- download diff
- download tarball
- view history from revision 171
- Committer: Bazaar Package Importer
- Author(s): Sebastien Bacher
- Date: 2010-06-16 23:44:28 UTC
- Revision ID: james.westby@ubuntu.com-20100616234428-ffks97ganx4cysmx
Tags: 2.21.2-0ubuntu3
debian/patches/043_ubuntu_menu_proxy.patch: updated version by Cody Russell
- files modified:
- debian/changelog
added
removed
debian/patches/043_ubuntu_menu_proxy.patch
1
Index: gtk+2.0-2.21.1/gtk/Makefile.am
1
Index: gtk+2.0-2.21.2/gtk/Makefile.am
2
2
===================================================================
3
--- gtk+2.0-2.21.1.orig/gtk/Makefile.am 2010-06-10 18:52:57.000000000 +0200
4
+++ gtk+2.0-2.21.1/gtk/Makefile.am 2010-06-10 18:52:58.000000000 +0200
3
--- gtk+2.0-2.21.2.orig/gtk/Makefile.am 2010-06-16 23:43:18.000000000 +0200
4
+++ gtk+2.0-2.21.2/gtk/Makefile.am 2010-06-16 23:43:18.000000000 +0200
5
5
@@ -253,6 +253,8 @@
6
6
gtkmenu.h \
7
7
gtkmenubar.h \
20
20
gtkmenushell.c \
21
21
gtkmenutoolbutton.c \
22
22
gtkmessagedialog.c \
23
Index: gtk+2.0-2.21.1/gtk/gtk.h
23
Index: gtk+2.0-2.21.2/gtk/gtk.h
24
24
===================================================================
25
--- gtk+2.0-2.21.1.orig/gtk/gtk.h 2010-05-30 08:52:43.000000000 +0200
26
+++ gtk+2.0-2.21.1/gtk/gtk.h 2010-06-10 18:52:58.000000000 +0200
25
--- gtk+2.0-2.21.2.orig/gtk/gtk.h 2010-06-10 14:53:46.000000000 +0200
26
+++ gtk+2.0-2.21.2/gtk/gtk.h 2010-06-16 23:43:18.000000000 +0200
27
27
@@ -65,6 +65,8 @@
28
28
#include <gtk/gtkcellview.h>
29
29
#include <gtk/gtkcheckbutton.h>
33
33
#include <gtk/gtkclipboard.h>
34
34
#include <gtk/gtkcolorbutton.h>
35
35
#include <gtk/gtkcolorsel.h>
36
Index: gtk+2.0-2.21.1/gtk/gtk.symbols
36
Index: gtk+2.0-2.21.2/gtk/gtk.symbols
37
37
===================================================================
38
--- gtk+2.0-2.21.1.orig/gtk/gtk.symbols 2010-06-10 18:52:57.000000000 +0200
39
+++ gtk+2.0-2.21.1/gtk/gtk.symbols 2010-06-10 18:52:58.000000000 +0200
40
@@ -2566,6 +2566,21 @@
38
--- gtk+2.0-2.21.2.orig/gtk/gtk.symbols 2010-06-16 23:43:18.000000000 +0200
39
+++ gtk+2.0-2.21.2/gtk/gtk.symbols 2010-06-16 23:43:18.000000000 +0200
40
@@ -2567,6 +2567,21 @@
41
41
#endif
42
42
#endif
43
43
59
59
#if IN_HEADER(__GTK_MENU_SHELL_H__)
60
60
#if IN_FILE(__GTK_MENU_SHELL_C__)
61
61
gtk_menu_shell_activate_item
62
Index: gtk+2.0-2.21.1/gtk/gtkmenubar.c
62
Index: gtk+2.0-2.21.2/gtk/gtkmenubar.c
63
63
===================================================================
64
--- gtk+2.0-2.21.1.orig/gtk/gtkmenubar.c 2010-04-10 04:20:02.000000000 +0200
65
+++ gtk+2.0-2.21.1/gtk/gtkmenubar.c 2010-06-10 18:52:58.000000000 +0200
64
--- gtk+2.0-2.21.2.orig/gtk/gtkmenubar.c 2010-04-10 04:20:02.000000000 +0200
65
+++ gtk+2.0-2.21.2/gtk/gtkmenubar.c 2010-06-16 23:43:18.000000000 +0200
66
66
@@ -69,6 +69,7 @@
67
67
guint prop_id,
68
68
GValue *value,
144
144
if (gtk_widget_get_visible (widget))
145
145
{
146
146
menu_bar = GTK_MENU_BAR (widget);
147
Index: gtk+2.0-2.21.1/gtk/gtkmenushell.c
147
Index: gtk+2.0-2.21.2/gtk/gtkmenushell.c
148
148
===================================================================
149
--- gtk+2.0-2.21.1.orig/gtk/gtkmenushell.c 2010-05-30 08:52:44.000000000 +0200
150
+++ gtk+2.0-2.21.1/gtk/gtkmenushell.c 2010-06-10 18:53:08.000000000 +0200
149
--- gtk+2.0-2.21.2.orig/gtk/gtkmenushell.c 2010-06-10 14:53:46.000000000 +0200
150
+++ gtk+2.0-2.21.2/gtk/gtkmenushell.c 2010-06-16 23:43:18.000000000 +0200
151
151
@@ -37,6 +37,7 @@
152
152
#include "gtkmenubar.h"
153
153
#include "gtkmenuitem.h"
245
245
if (class->insert)
246
246
class->insert (menu_shell, child, position);
247
247
}
248
Index: gtk+2.0-2.21.1/gtk/tests/Makefile.am
248
Index: gtk+2.0-2.21.2/gtk/tests/Makefile.am
249
249
===================================================================
250
--- gtk+2.0-2.21.1.orig/gtk/tests/Makefile.am 2010-05-30 08:52:44.000000000 +0200
251
+++ gtk+2.0-2.21.1/gtk/tests/Makefile.am 2010-06-10 18:52:58.000000000 +0200
250
--- gtk+2.0-2.21.2.orig/gtk/tests/Makefile.am 2010-06-10 14:53:46.000000000 +0200
251
+++ gtk+2.0-2.21.2/gtk/tests/Makefile.am 2010-06-16 23:43:18.000000000 +0200
252
252
@@ -47,6 +47,10 @@
253
253
recentmanager_SOURCES = recentmanager.c
254
254
recentmanager_LDADD = $(progs_ldadd)
260
260
TEST_PROGS += floating
261
261
floating_SOURCES = floating.c
262
262
floating_LDADD = $(progs_ldadd)
263
Index: gtk+2.0-2.21.1/gtk/tests/menuproxy.c
263
Index: gtk+2.0-2.21.2/gtk/tests/menuproxy.c
264
264
===================================================================
265
265
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
266
+++ gtk+2.0-2.21.1/gtk/tests/menuproxy.c 2010-06-10 18:52:58.000000000 +0200
266
+++ gtk+2.0-2.21.2/gtk/tests/menuproxy.c 2010-06-16 23:43:18.000000000 +0200
267
267
@@ -0,0 +1,278 @@
268
268
+/*
269
269
+ * Copyright (C) 2009 Canonical, Ltd.
543
543
+
544
544
+ return g_test_run();
545
545
+}
546
Index: gtk+2.0-2.21.1/gtk/ubuntumenuproxy.c
546
Index: gtk+2.0-2.21.2/gtk/ubuntumenuproxy.c
547
547
===================================================================
548
548
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
549
+++ gtk+2.0-2.21.1/gtk/ubuntumenuproxy.c 2010-06-10 18:52:58.000000000 +0200
549
+++ gtk+2.0-2.21.2/gtk/ubuntumenuproxy.c 2010-06-16 23:43:18.000000000 +0200
550
550
@@ -0,0 +1,151 @@
551
551
+/*
552
552
+ * Copyright (C) 2010 Canonical, Ltd.
699
699
+
700
700
+#define __UBUNTU_MENU_PROXY_C__
701
701
+#include "gtkaliasdef.c"
702
Index: gtk+2.0-2.21.1/gtk/ubuntumenuproxy.h
702
Index: gtk+2.0-2.21.2/gtk/ubuntumenuproxy.h
703
703
===================================================================
704
704
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
705
+++ gtk+2.0-2.21.1/gtk/ubuntumenuproxy.h 2010-06-10 18:52:58.000000000 +0200
705
+++ gtk+2.0-2.21.2/gtk/ubuntumenuproxy.h 2010-06-16 23:43:18.000000000 +0200
706
706
@@ -0,0 +1,72 @@
707
707
+/*
708
708
+ * Copyright (C) 2010 Canonical, Ltd.
776
776
+G_END_DECLS
777
777
+
778
778
+#endif /* __UBUNTU_MENU_PROXY_H__ */
779
Index: gtk+2.0-2.21.1/gtk/ubuntumenuproxymodule.c
779
Index: gtk+2.0-2.21.2/gtk/ubuntumenuproxymodule.c
780
780
===================================================================
781
781
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
782
+++ gtk+2.0-2.21.1/gtk/ubuntumenuproxymodule.c 2010-06-10 18:52:58.000000000 +0200
782
+++ gtk+2.0-2.21.2/gtk/ubuntumenuproxymodule.c 2010-06-16 23:43:18.000000000 +0200
783
783
@@ -0,0 +1,212 @@
784
784
+/*
785
785
+ * Copyright (C) 2010 Canonical, Ltd.
993
993
+
994
994
+#define __UBUNTU_MENU_PROXY_MODULE_C__
995
995
+#include "gtkaliasdef.c"
996
Index: gtk+2.0-2.21.1/gtk/ubuntumenuproxymodule.h
996
Index: gtk+2.0-2.21.2/gtk/ubuntumenuproxymodule.h
997
997
===================================================================
998
998
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
999
+++ gtk+2.0-2.21.1/gtk/ubuntumenuproxymodule.h 2010-06-10 18:52:58.000000000 +0200
999
+++ gtk+2.0-2.21.2/gtk/ubuntumenuproxymodule.h 2010-06-16 23:43:18.000000000 +0200
1000
1000
@@ -0,0 +1,69 @@
1001
1001
+/*
1002
1002
+ * Copyright (C) 2010 Canonical, Ltd.
1067
1067
+G_END_DECLS
1068
1068
+
1069
1069
+#endif /* __UBUNTU_MENU_PROXY_MODULE_H__ */
1070
Index: gtk+2.0-2.21.2/gtk/gtkwindow.c
1071
===================================================================
1072
--- gtk+2.0-2.21.2.orig/gtk/gtkwindow.c 2010-06-16 23:43:21.000000000 +0200
1073
+++ gtk+2.0-2.21.2/gtk/gtkwindow.c 2010-06-16 23:43:26.000000000 +0200
1074
@@ -94,7 +94,8 @@
1075
PROP_GRAVITY,
1076
PROP_TRANSIENT_FOR,
1077
PROP_OPACITY,
1078
-
1079
+ PROP_NO_PROXY,
1080
+
1081
/* Readonly properties */
1082
PROP_IS_ACTIVE,
1083
PROP_HAS_TOPLEVEL_FOCUS,
1084
@@ -195,6 +196,8 @@
1085
1086
gdouble opacity;
1087
1088
+ gboolean no_proxy;
1089
+
1090
gchar *startup_id;
1091
};
1092
1093
@@ -502,6 +505,14 @@
1094
NULL,
1095
GTK_PARAM_READWRITE));
1096
1097
+ g_object_class_install_property (object_class,
1098
+ PROP_NO_PROXY,
1099
+ g_param_spec_boolean ("ubuntu-no-proxy",
1100
+ P_("Disable menu proxies for this window"),
1101
+ P_("Disable menu proxies for this window"),
1102
+ FALSE,
1103
+ GTK_PARAM_READWRITE));
1104
+
1105
/**
1106
* GtkWindow:startup-id:
1107
*
1108
@@ -1069,6 +1080,9 @@
1109
case PROP_MNEMONICS_VISIBLE:
1110
gtk_window_set_mnemonics_visible (window, g_value_get_boolean (value));
1111
break;
1112
+ case PROP_NO_PROXY:
1113
+ priv->no_proxy = g_value_get_boolean (value);
1114
+ break;
1115
default:
1116
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1117
break;
1118
@@ -1187,6 +1201,9 @@
1119
case PROP_MNEMONICS_VISIBLE:
1120
g_value_set_boolean (value, priv->mnemonics_visible);
1121
break;
1122
+ case PROP_NO_PROXY:
1123
+ g_value_set_boolean (value, priv->no_proxy);
1124
+ break;
1125
default:
1126
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1127
break;
Loggerhead is a web-based interface for Breezy
Version: 2.0.1