Merge lp:~dbusmenu-team/libdbusmenu/ubuntu into lp:~ubuntu-desktop/libdbusmenu/ubuntu

Proposed by Ted Gould on 2011-10-13
Status: Rejected
Rejected by: Ken VanDine on 2011-10-13
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 244 lines (+69/-22)
8 files modified
ChangeLog (+28/-0)
configure (+11/-11)
configure.ac (+3/-3)
debian/changelog (+10/-0)
docs/libdbusmenu-glib/reference/version.xml (+1/-1)
docs/libdbusmenu-gtk/reference/version.xml (+1/-1)
libdbusmenu-gtk/client.c (+14/-6)
libdbusmenu-gtk/genericmenuitem.c (+1/-0)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine 2011-10-13 Disapprove on 2011-10-13
Review via email: mp+79311@code.launchpad.net
To post a comment you must log in.
lp:~dbusmenu-team/libdbusmenu/ubuntu updated on 2011-10-13
162. By Ken VanDine on 2011-10-13

releasing version 0.5.0-0ubuntu3

Ken VanDine (ken-vandine) wrote :

The ~ubuntu-desktop branch wasn't current, we had already had uploads which included these fixes so no point in updating just for the version. I manually merged the changes from 0.5.0-0ubuntu3 into the packaging branch and pushed it.

review: Disapprove

Unmerged revisions

177. By Sebastien Bacher on 2012-03-09

releasing version 0.5.93-0ubuntu2

176. By Sebastien Bacher on 2012-03-09

Backport fix for signal warnings displayed on close (lp: #950762)

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 19:40:10 +0000
3+++ ChangeLog 2011-10-13 16:36:18 +0000
4@@ -1,5 +1,33 @@
5 # Generated by Makefile. Do not edit.
6
7+2011-10-13 Ted Gould <ted@gould.cx>
8+
9+ 0.5.1
10+
11+2011-10-12 Ted Gould <ted@gould.cx>
12+
13+ Allow about-to-show on 0 based items (root items)
14+
15+2011-09-30 Ken VanDine <ken.vandine@canonical.com>
16+
17+ id of 0 in dbusmenu_client_send_about_to_show is valid, and used in appindicators like nm-applet (LP: #862989)
18+
19+2011-10-12 Ted Gould <ted@gould.cx>
20+
21+ Make sure to finally unref the GTK menuitem
22+
23+2011-10-04 Michael Terry <michael.terry@canonical.com>
24+
25+ remove last ref from GtkMenuItems that we create
26+
27+2011-10-12 Ted Gould <ted@gould.cx>
28+
29+ If the child is copied make sure we don't delete the original.
30+
31+2011-10-05 Michael Terry <michael.terry@canonical.com>
32+
33+ when resetting an image widget and it's the only child of the menuitem, make sure we don't try to use free'd memory
34+
35 2011-09-29 Ted Gould <ted@gould.cx>
36
37 0.5.0
38
39=== modified file 'configure'
40--- configure 2011-09-29 19:41:43 +0000
41+++ configure 2011-10-13 16:36:18 +0000
42@@ -1,6 +1,6 @@
43 #! /bin/sh
44 # Guess values for system-dependent variables and create Makefiles.
45-# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.0.
46+# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.1.
47 #
48 # Report bugs to <ted@canonical.com>.
49 #
50@@ -572,8 +572,8 @@
51 # Identity of this package.
52 PACKAGE_NAME='libdbusmenu'
53 PACKAGE_TARNAME='libdbusmenu'
54-PACKAGE_VERSION='0.5.0'
55-PACKAGE_STRING='libdbusmenu 0.5.0'
56+PACKAGE_VERSION='0.5.1'
57+PACKAGE_STRING='libdbusmenu 0.5.1'
58 PACKAGE_BUGREPORT='ted@canonical.com'
59 PACKAGE_URL=''
60
61@@ -1429,7 +1429,7 @@
62 # Omit some internal or obsolete options to make the list less imposing.
63 # This message is too long to be a string in the A/UX 3.1 sh.
64 cat <<_ACEOF
65-\`configure' configures libdbusmenu 0.5.0 to adapt to many kinds of systems.
66+\`configure' configures libdbusmenu 0.5.1 to adapt to many kinds of systems.
67
68 Usage: $0 [OPTION]... [VAR=VALUE]...
69
70@@ -1499,7 +1499,7 @@
71
72 if test -n "$ac_init_help"; then
73 case $ac_init_help in
74- short | recursive ) echo "Configuration of libdbusmenu 0.5.0:";;
75+ short | recursive ) echo "Configuration of libdbusmenu 0.5.1:";;
76 esac
77 cat <<\_ACEOF
78
79@@ -1649,7 +1649,7 @@
80 test -n "$ac_init_help" && exit $ac_status
81 if $ac_init_version; then
82 cat <<\_ACEOF
83-libdbusmenu configure 0.5.0
84+libdbusmenu configure 0.5.1
85 generated by GNU Autoconf 2.68
86
87 Copyright (C) 2010 Free Software Foundation, Inc.
88@@ -2020,7 +2020,7 @@
89 This file contains any messages produced by compilers while
90 running configure, to aid debugging if configure makes a mistake.
91
92-It was created by libdbusmenu $as_me 0.5.0, which was
93+It was created by libdbusmenu $as_me 0.5.1, which was
94 generated by GNU Autoconf 2.68. Invocation command line was
95
96 $ $0 $@
97@@ -2841,7 +2841,7 @@
98
99 # Define the identity of the package.
100 PACKAGE=libdbusmenu
101- VERSION=0.5.0
102+ VERSION=0.5.1
103
104
105 # Some tools Automake needs.
106@@ -14309,7 +14309,7 @@
107 ###########################
108
109 LIBDBUSMENU_CURRENT=4
110-LIBDBUSMENU_REVISION=5
111+LIBDBUSMENU_REVISION=6
112 LIBDBUSMENU_AGE=0
113
114
115@@ -15659,7 +15659,7 @@
116 # report actual input values of CONFIG_FILES etc. instead of their
117 # values after options handling.
118 ac_log="
119-This file was extended by libdbusmenu $as_me 0.5.0, which was
120+This file was extended by libdbusmenu $as_me 0.5.1, which was
121 generated by GNU Autoconf 2.68. Invocation command line was
122
123 CONFIG_FILES = $CONFIG_FILES
124@@ -15725,7 +15725,7 @@
125 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
126 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
127 ac_cs_version="\\
128-libdbusmenu config.status 0.5.0
129+libdbusmenu config.status 0.5.1
130 configured by $0, generated by GNU Autoconf 2.68,
131 with options \\"\$ac_cs_config\\"
132
133
134=== modified file 'configure.ac'
135--- configure.ac 2011-09-29 19:41:43 +0000
136+++ configure.ac 2011-10-13 16:36:18 +0000
137@@ -1,11 +1,11 @@
138
139-AC_INIT(libdbusmenu, 0.5.0, ted@canonical.com)
140+AC_INIT(libdbusmenu, 0.5.1, ted@canonical.com)
141 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
142
143 AC_PREREQ(2.62)
144
145 AM_CONFIG_HEADER(config.h)
146-AM_INIT_AUTOMAKE(libdbusmenu, 0.5.0, [-Wno-portability])
147+AM_INIT_AUTOMAKE(libdbusmenu, 0.5.1, [-Wno-portability])
148
149 AM_MAINTAINER_MODE
150
151@@ -172,7 +172,7 @@
152 ###########################
153
154 LIBDBUSMENU_CURRENT=4
155-LIBDBUSMENU_REVISION=5
156+LIBDBUSMENU_REVISION=6
157 LIBDBUSMENU_AGE=0
158
159 AC_SUBST(LIBDBUSMENU_CURRENT)
160
161=== modified file 'debian/changelog'
162--- debian/changelog 2011-09-30 14:18:44 +0000
163+++ debian/changelog 2011-10-13 16:36:18 +0000
164@@ -1,3 +1,13 @@
165+libdbusmenu (0.5.1-0ubuntu1~ppa1) oneiric; urgency=low
166+
167+ * New upstream release.
168+ * Allow for an ID of 0 in about_to_show for indicators (LP: #862989)
169+ * Clear the image pointer when we take it
170+ * Ensure we drop all references to the GTK widget when a menuitem
171+ gets destroyed (LP: #835646)
172+
173+ -- Ted Gould <ted@ubuntu.com> Thu, 13 Oct 2011 11:31:15 -0500
174+
175 libdbusmenu (0.5.0-0ubuntu2) oneiric; urgency=low
176
177 * libdbusmenu-glib/client.c
178
179=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
180--- docs/libdbusmenu-glib/reference/version.xml 2011-09-29 19:41:43 +0000
181+++ docs/libdbusmenu-glib/reference/version.xml 2011-10-13 16:36:18 +0000
182@@ -1,1 +1,1 @@
183-0.5.0
184+0.5.1
185
186=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
187--- docs/libdbusmenu-gtk/reference/version.xml 2011-09-29 19:41:43 +0000
188+++ docs/libdbusmenu-gtk/reference/version.xml 2011-10-13 16:36:18 +0000
189@@ -1,1 +1,1 @@
190-0.5.0
191+0.5.1
192
193=== modified file 'libdbusmenu-gtk/client.c'
194--- libdbusmenu-gtk/client.c 2011-08-22 19:54:42 +0000
195+++ libdbusmenu-gtk/client.c 2011-10-13 16:36:18 +0000
196@@ -823,14 +823,22 @@
197 return;
198 }
199
200+static void
201+destroy_gmi (GtkMenuItem * gmi)
202+{
203 #ifdef MASSIVEDEBUGGING
204-static void
205-destroy_gmi (GtkMenuItem * gmi, DbusmenuMenuitem * mi)
206-{
207- g_debug("Destorying GTK Menuitem for %d", dbusmenu_menuitem_get_id(mi));
208+ g_debug("Destroying GTK Menuitem %d", gmi);
209+#endif
210+
211+ /* Call gtk_widget_destroy to remove from any containers and cleanup */
212+ gtk_widget_destroy(GTK_WIDGET(gmi));
213+
214+ /* Now remove last ref that we are holding (due to g_object_ref_sink in
215+ dbusmenu_gtkclient_newitem_base). This should finalize the object */
216+ g_object_unref(G_OBJECT(gmi));
217+
218 return;
219 }
220-#endif
221
222 /**
223 * dbusmenu_gtkclient_newitem_base:
224@@ -857,7 +865,7 @@
225
226 /* Attach these two */
227 g_object_ref_sink(G_OBJECT(gmi));
228- g_object_set_data_full(G_OBJECT(item), data_menuitem, gmi, (GDestroyNotify)gtk_widget_destroy);
229+ g_object_set_data_full(G_OBJECT(item), data_menuitem, gmi, (GDestroyNotify)destroy_gmi);
230
231 /* DbusmenuMenuitem signals */
232 g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), client);
233
234=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
235--- libdbusmenu-gtk/genericmenuitem.c 2011-08-25 03:00:46 +0000
236+++ libdbusmenu-gtk/genericmenuitem.c 2011-10-13 16:36:18 +0000
237@@ -449,6 +449,7 @@
238 if (GTK_IS_IMAGE(child)) {
239 /* We've got a label, let's update it. */
240 imagew = GTK_IMAGE(child);
241+ child = NULL;
242 } else if (GTK_IS_BOX(child)) {
243 /* Look for the label in the box */
244 gtk_container_foreach(GTK_CONTAINER(child), set_image_helper, &imagew);

Subscribers

People subscribed via source and target branches

to all changes: