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

Proposed by Ted Gould
Status: Merged
Approved by: Ken VanDine
Approved revision: no longer in the source branch.
Merged at revision: 115
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 308 lines (+81/-20)
9 files modified
ChangeLog (+16/-0)
configure (+11/-11)
configure.ac (+3/-3)
debian/changelog (+7/-0)
docs/libdbusmenu-glib/reference/html/ch01.html (+1/-1)
docs/libdbusmenu-glib/reference/version.xml (+1/-1)
docs/libdbusmenu-gtk/reference/html/ch01.html (+1/-1)
docs/libdbusmenu-gtk/reference/version.xml (+1/-1)
libdbusmenu-gtk/parser.c (+40/-2)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+48542@code.launchpad.net

Description of the change

Fun!

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
lp:~dbusmenu-team/libdbusmenu/ubuntu updated
115. By Ken VanDine

releasing version 0.3.96-0ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-01-31 21:45:33 +0000
+++ ChangeLog 2011-02-03 20:16:14 +0000
@@ -1,5 +1,21 @@
1# Generated by Makefile. Do not edit.1# Generated by Makefile. Do not edit.
22
32011-02-03 Ted Gould <ted@gould.cx>
4
5 0.3.96
6
72011-02-03 Ted Gould <ted@gould.cx>
8
9 Ensure that we remove signals from the objects we put them on.
10
112011-02-03 Michael Terry <mike@mterry.name>
12
13 keep track of objects that we set notifies for
14
152011-02-02 Michael Terry <mike@mterry.name>
16
17 disconnect signals when done with menuitem
18
32011-01-31 Ted Gould <ted@gould.cx>192011-01-31 Ted Gould <ted@gould.cx>
420
5 0.3.9521 0.3.95
622
=== modified file 'configure'
--- configure 2011-01-31 21:52:26 +0000
+++ configure 2011-02-03 20:16:14 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.95.3# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.96.
4#4#
5# Report bugs to <ted@canonical.com>.5# Report bugs to <ted@canonical.com>.
6#6#
@@ -703,8 +703,8 @@
703# Identity of this package.703# Identity of this package.
704PACKAGE_NAME='libdbusmenu'704PACKAGE_NAME='libdbusmenu'
705PACKAGE_TARNAME='libdbusmenu'705PACKAGE_TARNAME='libdbusmenu'
706PACKAGE_VERSION='0.3.95'706PACKAGE_VERSION='0.3.96'
707PACKAGE_STRING='libdbusmenu 0.3.95'707PACKAGE_STRING='libdbusmenu 0.3.96'
708PACKAGE_BUGREPORT='ted@canonical.com'708PACKAGE_BUGREPORT='ted@canonical.com'
709PACKAGE_URL=''709PACKAGE_URL=''
710710
@@ -1540,7 +1540,7 @@
1540 # Omit some internal or obsolete options to make the list less imposing.1540 # Omit some internal or obsolete options to make the list less imposing.
1541 # This message is too long to be a string in the A/UX 3.1 sh.1541 # This message is too long to be a string in the A/UX 3.1 sh.
1542 cat <<_ACEOF1542 cat <<_ACEOF
1543\`configure' configures libdbusmenu 0.3.95 to adapt to many kinds of systems.1543\`configure' configures libdbusmenu 0.3.96 to adapt to many kinds of systems.
15441544
1545Usage: $0 [OPTION]... [VAR=VALUE]...1545Usage: $0 [OPTION]... [VAR=VALUE]...
15461546
@@ -1610,7 +1610,7 @@
16101610
1611if test -n "$ac_init_help"; then1611if test -n "$ac_init_help"; then
1612 case $ac_init_help in1612 case $ac_init_help in
1613 short | recursive ) echo "Configuration of libdbusmenu 0.3.95:";;1613 short | recursive ) echo "Configuration of libdbusmenu 0.3.96:";;
1614 esac1614 esac
1615 cat <<\_ACEOF1615 cat <<\_ACEOF
16161616
@@ -1750,7 +1750,7 @@
1750test -n "$ac_init_help" && exit $ac_status1750test -n "$ac_init_help" && exit $ac_status
1751if $ac_init_version; then1751if $ac_init_version; then
1752 cat <<\_ACEOF1752 cat <<\_ACEOF
1753libdbusmenu configure 0.3.951753libdbusmenu configure 0.3.96
1754generated by GNU Autoconf 2.671754generated by GNU Autoconf 2.67
17551755
1756Copyright (C) 2010 Free Software Foundation, Inc.1756Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2121,7 +2121,7 @@
2121This file contains any messages produced by compilers while2121This file contains any messages produced by compilers while
2122running configure, to aid debugging if configure makes a mistake.2122running configure, to aid debugging if configure makes a mistake.
21232123
2124It was created by libdbusmenu $as_me 0.3.95, which was2124It was created by libdbusmenu $as_me 0.3.96, which was
2125generated by GNU Autoconf 2.67. Invocation command line was2125generated by GNU Autoconf 2.67. Invocation command line was
21262126
2127 $ $0 $@2127 $ $0 $@
@@ -2942,7 +2942,7 @@
29422942
2943# Define the identity of the package.2943# Define the identity of the package.
2944 PACKAGE=libdbusmenu2944 PACKAGE=libdbusmenu
2945 VERSION=0.3.952945 VERSION=0.3.96
29462946
29472947
2948# Some tools Automake needs.2948# Some tools Automake needs.
@@ -13280,7 +13280,7 @@
13280###########################13280###########################
1328113281
13282LIBDBUSMENU_CURRENT=313282LIBDBUSMENU_CURRENT=3
13283LIBDBUSMENU_REVISION=313283LIBDBUSMENU_REVISION=4
13284LIBDBUSMENU_AGE=013284LIBDBUSMENU_AGE=0
1328513285
1328613286
@@ -14602,7 +14602,7 @@
14602# report actual input values of CONFIG_FILES etc. instead of their14602# report actual input values of CONFIG_FILES etc. instead of their
14603# values after options handling.14603# values after options handling.
14604ac_log="14604ac_log="
14605This file was extended by libdbusmenu $as_me 0.3.95, which was14605This file was extended by libdbusmenu $as_me 0.3.96, which was
14606generated by GNU Autoconf 2.67. Invocation command line was14606generated by GNU Autoconf 2.67. Invocation command line was
1460714607
14608 CONFIG_FILES = $CONFIG_FILES14608 CONFIG_FILES = $CONFIG_FILES
@@ -14668,7 +14668,7 @@
14668cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=114668cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14669ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"14669ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14670ac_cs_version="\\14670ac_cs_version="\\
14671libdbusmenu config.status 0.3.9514671libdbusmenu config.status 0.3.96
14672configured by $0, generated by GNU Autoconf 2.67,14672configured by $0, generated by GNU Autoconf 2.67,
14673 with options \\"\$ac_cs_config\\"14673 with options \\"\$ac_cs_config\\"
1467414674
1467514675
=== modified file 'configure.ac'
--- configure.ac 2011-01-31 21:52:26 +0000
+++ configure.ac 2011-02-03 20:16:14 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.3.95, ted@canonical.com)2AC_INIT(libdbusmenu, 0.3.96, ted@canonical.com)
3AC_COPYRIGHT([Copyright 2009,2010 Canonical])3AC_COPYRIGHT([Copyright 2009,2010 Canonical])
44
5AC_PREREQ(2.62)5AC_PREREQ(2.62)
66
7AM_CONFIG_HEADER(config.h)7AM_CONFIG_HEADER(config.h)
8AM_INIT_AUTOMAKE(libdbusmenu, 0.3.95, [-Wno-portability])8AM_INIT_AUTOMAKE(libdbusmenu, 0.3.96, [-Wno-portability])
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -136,7 +136,7 @@
136###########################136###########################
137137
138LIBDBUSMENU_CURRENT=3138LIBDBUSMENU_CURRENT=3
139LIBDBUSMENU_REVISION=3139LIBDBUSMENU_REVISION=4
140LIBDBUSMENU_AGE=0140LIBDBUSMENU_AGE=0
141141
142AC_SUBST(LIBDBUSMENU_CURRENT)142AC_SUBST(LIBDBUSMENU_CURRENT)
143143
=== modified file 'debian/changelog'
--- debian/changelog 2011-01-31 22:30:46 +0000
+++ debian/changelog 2011-02-03 20:16:14 +0000
@@ -1,3 +1,10 @@
1libdbusmenu (0.3.96-0ubuntu1~ppa1) natty; urgency=low
2
3 * New upstream release.
4 * Remove signal handlers for correct objects
5
6 -- Ted Gould <ted@ubuntu.com> Thu, 03 Feb 2011 14:11:16 -0600
7
1libdbusmenu (0.3.95-0ubuntu1) natty; urgency=low8libdbusmenu (0.3.95-0ubuntu1) natty; urgency=low
29
3 * New upstream release.10 * New upstream release.
411
=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
--- docs/libdbusmenu-glib/reference/html/ch01.html 2011-01-27 20:19:46 +0000
+++ docs/libdbusmenu-glib/reference/html/ch01.html 2011-02-03 20:16:14 +0000
@@ -21,7 +21,7 @@
21</tr></table>21</tr></table>
22<div class="chapter">22<div class="chapter">
23<div class="titlepage"><div><div><h2 class="title">23<div class="titlepage"><div><div><h2 class="title">
24<a name="id553671"></a>API</h2></div></div></div>24<a name="id450827"></a>API</h2></div></div></div>
25<div class="toc"><dl>25<div class="toc"><dl>
26<dt>26<dt>
27<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span>27<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span>
2828
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml 2011-01-31 21:52:26 +0000
+++ docs/libdbusmenu-glib/reference/version.xml 2011-02-03 20:16:14 +0000
@@ -1,1 +1,1 @@
10.3.9510.3.96
22
=== modified file 'docs/libdbusmenu-gtk/reference/html/ch01.html'
--- docs/libdbusmenu-gtk/reference/html/ch01.html 2011-01-27 20:19:46 +0000
+++ docs/libdbusmenu-gtk/reference/html/ch01.html 2011-02-03 20:16:14 +0000
@@ -21,7 +21,7 @@
21</tr></table>21</tr></table>
22<div class="chapter">22<div class="chapter">
23<div class="titlepage"><div><div><h2 class="title">23<div class="titlepage"><div><div><h2 class="title">
24<a name="id525169"></a>API</h2></div></div></div>24<a name="id338562"></a>API</h2></div></div></div>
25<div class="toc"><dl>25<div class="toc"><dl>
26<dt>26<dt>
27<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"></span>27<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"></span>
2828
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml 2011-01-31 21:52:26 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml 2011-02-03 20:16:14 +0000
@@ -1,1 +1,1 @@
10.3.9510.3.96
22
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c 2011-01-31 21:52:26 +0000
+++ libdbusmenu-gtk/parser.c 2011-02-03 20:16:14 +0000
@@ -31,6 +31,14 @@
31#include "serializablemenuitem.h"31#include "serializablemenuitem.h"
3232
33#define CACHED_MENUITEM "dbusmenu-gtk-parser-cached-item"33#define CACHED_MENUITEM "dbusmenu-gtk-parser-cached-item"
34#define PARSER_DATA "dbusmenu-gtk-parser-data"
35
36typedef struct _ParserData
37{
38 GtkWidget *label;
39 GtkAction *action;
40 GtkWidget *widget;
41} ParserData;
3442
35typedef struct _RecurseContext43typedef struct _RecurseContext
36{44{
@@ -102,6 +110,24 @@
102 the weak ref as well. */110 the weak ref as well. */
103 g_object_steal_data(G_OBJECT(data), CACHED_MENUITEM);111 g_object_steal_data(G_OBJECT(data), CACHED_MENUITEM);
104 g_signal_handlers_disconnect_by_func(data, G_CALLBACK(widget_notify_cb), obj);112 g_signal_handlers_disconnect_by_func(data, G_CALLBACK(widget_notify_cb), obj);
113
114 ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(obj), PARSER_DATA);
115
116 if (pdata != NULL && pdata->label != NULL) {
117 g_signal_handlers_disconnect_by_func(pdata->label, G_CALLBACK(label_notify_cb), obj);
118 g_object_remove_weak_pointer(G_OBJECT(pdata->label), (gpointer*)&pdata->label);
119 }
120
121 if (pdata != NULL && pdata->action != NULL) {
122 g_signal_handlers_disconnect_by_func(pdata->action, G_CALLBACK(action_notify_cb), obj);
123 g_object_remove_weak_pointer(G_OBJECT(pdata->action), (gpointer*)&pdata->action);
124 }
125
126 if (pdata != NULL && pdata->widget != NULL) {
127 g_signal_handlers_disconnect_by_func(pdata->widget, G_CALLBACK(widget_notify_cb), obj);
128 g_object_remove_weak_pointer(G_OBJECT(pdata->widget), (gpointer*)&pdata->widget);
129 }
130
105 return;131 return;
106}132}
107133
@@ -110,8 +136,10 @@
110static void136static void
111object_cache_freed (gpointer data)137object_cache_freed (gpointer data)
112{138{
113 if (!G_IS_OBJECT(data)) return;139 // TODO: make this have access to both data and obj so we can call these
114 g_object_weak_unref(G_OBJECT(data), dbusmenu_cache_freed, data);140 //if (!G_IS_OBJECT(obj)) return;
141 //g_object_weak_unref(G_OBJECT(obj), dbusmenu_cache_freed, data);
142 //dbusmenu_cache_freed(data, obj);
115 return;143 return;
116}144}
117145
@@ -239,6 +267,9 @@
239 {267 {
240 DbusmenuMenuitem *mi = dbusmenu_menuitem_new ();268 DbusmenuMenuitem *mi = dbusmenu_menuitem_new ();
241269
270 ParserData *pdata = g_new0 (ParserData, 1);
271 g_object_set_data_full (G_OBJECT (mi), PARSER_DATA, pdata, g_free);
272
242 gboolean visible = FALSE;273 gboolean visible = FALSE;
243 gboolean sensitive = FALSE;274 gboolean sensitive = FALSE;
244 if (GTK_IS_SEPARATOR_MENU_ITEM (widget))275 if (GTK_IS_SEPARATOR_MENU_ITEM (widget))
@@ -313,10 +344,12 @@
313 {344 {
314 // Sometimes, an app will directly find and modify the label345 // Sometimes, an app will directly find and modify the label
315 // (like empathy), so watch the label especially for that.346 // (like empathy), so watch the label especially for that.
347 pdata->label = label;
316 g_signal_connect (G_OBJECT (label),348 g_signal_connect (G_OBJECT (label),
317 "notify",349 "notify",
318 G_CALLBACK (label_notify_cb),350 G_CALLBACK (label_notify_cb),
319 mi);351 mi);
352 g_object_add_weak_pointer(G_OBJECT (label), (gpointer*)&pdata->label);
320 }353 }
321354
322 if (GTK_IS_ACTIVATABLE (widget))355 if (GTK_IS_ACTIVATABLE (widget))
@@ -332,10 +365,12 @@
332 visible = gtk_action_is_visible (action);365 visible = gtk_action_is_visible (action);
333 sensitive = gtk_action_is_sensitive (action);366 sensitive = gtk_action_is_sensitive (action);
334367
368 pdata->action = action;
335 g_signal_connect_object (action, "notify",369 g_signal_connect_object (action, "notify",
336 G_CALLBACK (action_notify_cb),370 G_CALLBACK (action_notify_cb),
337 mi,371 mi,
338 G_CONNECT_AFTER);372 G_CONNECT_AFTER);
373 g_object_add_weak_pointer(G_OBJECT (action), (gpointer*)&pdata->action);
339 }374 }
340 }375 }
341 }376 }
@@ -367,10 +402,13 @@
367 DBUSMENU_MENUITEM_PROP_ENABLED,402 DBUSMENU_MENUITEM_PROP_ENABLED,
368 sensitive);403 sensitive);
369404
405 pdata->widget = widget;
370 g_signal_connect (widget,406 g_signal_connect (widget,
371 "notify",407 "notify",
372 G_CALLBACK (widget_notify_cb),408 G_CALLBACK (widget_notify_cb),
373 mi);409 mi);
410 g_object_add_weak_pointer(G_OBJECT (widget), (gpointer*)&pdata->widget);
411
374 return mi;412 return mi;
375 }413 }
376414

Subscribers

People subscribed via source and target branches

to all changes: