Merge lp:~indicator-applet-developers/indicator-appmenu/ubuntu into lp:~ubuntu-desktop/indicator-appmenu/ubuntu

Proposed by Ted Gould on 2011-10-13
Status: Rejected
Rejected by: Ken VanDine on 2011-10-13
Proposed branch: lp:~indicator-applet-developers/indicator-appmenu/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-appmenu/ubuntu
Diff against target: 183 lines (+33/-31)
7 files modified
ChangeLog (+12/-0)
configure (+10/-10)
configure.ac (+2/-2)
debian/changelog (+8/-0)
debian/patches/double-ref-of-entry-label.patch (+0/-17)
debian/patches/series (+0/-1)
src/window-menus.c (+1/-1)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-appmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine 2011-10-13 Pending
Review via email: mp+79326@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-09-29 15:24:51 +0000
3+++ ChangeLog 2011-10-13 18:40:32 +0000
4@@ -1,5 +1,17 @@
5 # Generated by Makefile. Do not edit.
6
7+2011-10-13 Ted Gould <ted@gould.cx>
8+
9+ 0.3.2
10+
11+2011-10-12 Ted Gould <ted@gould.cx>
12+
13+ Make sure to keep the ref on the label via sinking.
14+
15+2011-10-05 Michael Terry <michael.terry@canonical.com>
16+
17+ don't double-ref entry->label
18+
19 2011-09-29 Ted Gould <ted@gould.cx>
20
21 0.3.1
22
23=== modified file 'configure'
24--- configure 2011-09-29 15:25:16 +0000
25+++ configure 2011-10-13 18:40:32 +0000
26@@ -1,6 +1,6 @@
27 #! /bin/sh
28 # Guess values for system-dependent variables and create Makefiles.
29-# Generated by GNU Autoconf 2.68 for indicator-appmenu 0.3.1.
30+# Generated by GNU Autoconf 2.68 for indicator-appmenu 0.3.2.
31 #
32 # Report bugs to <ted@canonical.com>.
33 #
34@@ -572,8 +572,8 @@
35 # Identity of this package.
36 PACKAGE_NAME='indicator-appmenu'
37 PACKAGE_TARNAME='indicator-appmenu'
38-PACKAGE_VERSION='0.3.1'
39-PACKAGE_STRING='indicator-appmenu 0.3.1'
40+PACKAGE_VERSION='0.3.2'
41+PACKAGE_STRING='indicator-appmenu 0.3.2'
42 PACKAGE_BUGREPORT='ted@canonical.com'
43 PACKAGE_URL=''
44
45@@ -1339,7 +1339,7 @@
46 # Omit some internal or obsolete options to make the list less imposing.
47 # This message is too long to be a string in the A/UX 3.1 sh.
48 cat <<_ACEOF
49-\`configure' configures indicator-appmenu 0.3.1 to adapt to many kinds of systems.
50+\`configure' configures indicator-appmenu 0.3.2 to adapt to many kinds of systems.
51
52 Usage: $0 [OPTION]... [VAR=VALUE]...
53
54@@ -1410,7 +1410,7 @@
55
56 if test -n "$ac_init_help"; then
57 case $ac_init_help in
58- short | recursive ) echo "Configuration of indicator-appmenu 0.3.1:";;
59+ short | recursive ) echo "Configuration of indicator-appmenu 0.3.2:";;
60 esac
61 cat <<\_ACEOF
62
63@@ -1540,7 +1540,7 @@
64 test -n "$ac_init_help" && exit $ac_status
65 if $ac_init_version; then
66 cat <<\_ACEOF
67-indicator-appmenu configure 0.3.1
68+indicator-appmenu configure 0.3.2
69 generated by GNU Autoconf 2.68
70
71 Copyright (C) 2010 Free Software Foundation, Inc.
72@@ -1820,7 +1820,7 @@
73 This file contains any messages produced by compilers while
74 running configure, to aid debugging if configure makes a mistake.
75
76-It was created by indicator-appmenu $as_me 0.3.1, which was
77+It was created by indicator-appmenu $as_me 0.3.2, which was
78 generated by GNU Autoconf 2.68. Invocation command line was
79
80 $ $0 $@
81@@ -2641,7 +2641,7 @@
82
83 # Define the identity of the package.
84 PACKAGE=indicator-appmenu
85- VERSION=0.3.1
86+ VERSION=0.3.2
87
88
89 cat >>confdefs.h <<_ACEOF
90@@ -13687,7 +13687,7 @@
91 # report actual input values of CONFIG_FILES etc. instead of their
92 # values after options handling.
93 ac_log="
94-This file was extended by indicator-appmenu $as_me 0.3.1, which was
95+This file was extended by indicator-appmenu $as_me 0.3.2, which was
96 generated by GNU Autoconf 2.68. Invocation command line was
97
98 CONFIG_FILES = $CONFIG_FILES
99@@ -13753,7 +13753,7 @@
100 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
101 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
102 ac_cs_version="\\
103-indicator-appmenu config.status 0.3.1
104+indicator-appmenu config.status 0.3.2
105 configured by $0, generated by GNU Autoconf 2.68,
106 with options \\"\$ac_cs_config\\"
107
108
109=== modified file 'configure.ac'
110--- configure.ac 2011-09-29 15:25:16 +0000
111+++ configure.ac 2011-10-13 18:40:32 +0000
112@@ -1,11 +1,11 @@
113
114-AC_INIT(indicator-appmenu, 0.3.1, ted@canonical.com)
115+AC_INIT(indicator-appmenu, 0.3.2, ted@canonical.com)
116 AC_COPYRIGHT([Copyright 2010 Canonical])
117
118 AC_PREREQ(2.53)
119
120 AM_CONFIG_HEADER(config.h)
121-AM_INIT_AUTOMAKE(indicator-appmenu, 0.3.1)
122+AM_INIT_AUTOMAKE(indicator-appmenu, 0.3.2)
123
124 AM_MAINTAINER_MODE
125
126
127=== modified file 'debian/changelog'
128--- debian/changelog 2011-10-06 14:31:34 +0000
129+++ debian/changelog 2011-10-13 18:40:32 +0000
130@@ -1,3 +1,11 @@
131+indicator-appmenu (0.3.2-0ubuntu1~ppa1) oneiric; urgency=low
132+
133+ * New upstream release.
134+ * Ensure that the label is ref'd using a ref_sink()
135+ * Drop debian/patches/double-ref-of-entry-label.patch: Upstream
136+
137+ -- Ted Gould <ted@ubuntu.com> Thu, 13 Oct 2011 13:38:29 -0500
138+
139 indicator-appmenu (0.3.1-0ubuntu2) oneiric; urgency=low
140
141 * debian/patches/double-ref-of-entry-label.patch:
142
143=== removed directory 'debian/patches'
144=== removed file 'debian/patches/double-ref-of-entry-label.patch'
145--- debian/patches/double-ref-of-entry-label.patch 2011-10-06 14:31:34 +0000
146+++ debian/patches/double-ref-of-entry-label.patch 1970-01-01 00:00:00 +0000
147@@ -1,17 +0,0 @@
148-Description: Don't add a second ref to a label, just sink the one we own
149-Origin: https://code.launchpad.net/~mterry/indicator-appmenu/double-ref-of-entry-label/+merge/78300
150-Author: Michael Terry <michael.terry@canonical.com>
151-
152-Index: indicator-appmenu/src/window-menus.c
153-===================================================================
154---- indicator-appmenu.orig/src/window-menus.c 2011-10-06 10:17:10.670272189 -0400
155-+++ indicator-appmenu/src/window-menus.c 2011-10-06 10:17:48.794272592 -0400
156-@@ -742,7 +742,7 @@
157- entry->label = GTK_LABEL(gtk_label_new_with_mnemonic(dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL)));
158-
159- if (entry->label != NULL) {
160-- g_object_ref(entry->label);
161-+ g_object_ref_sink(entry->label);
162- }
163-
164- entry->accessible_desc = dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL);
165
166=== removed file 'debian/patches/series'
167--- debian/patches/series 2011-10-06 14:31:34 +0000
168+++ debian/patches/series 1970-01-01 00:00:00 +0000
169@@ -1,1 +0,0 @@
170-double-ref-of-entry-label.patch
171
172=== modified file 'src/window-menus.c'
173--- src/window-menus.c 2011-09-29 15:25:16 +0000
174+++ src/window-menus.c 2011-10-13 18:40:32 +0000
175@@ -742,7 +742,7 @@
176 entry->label = GTK_LABEL(gtk_label_new_with_mnemonic(dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL)));
177
178 if (entry->label != NULL) {
179- g_object_ref(entry->label);
180+ g_object_ref_sink(entry->label);
181 }
182
183 entry->accessible_desc = dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL);

Subscribers

People subscribed via source and target branches

to all changes: