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

Proposed by Ted Gould
Status: Merged
Merged at revision: 90
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 243 lines (+52/-18)
9 files modified
configure (+11/-11)
configure.ac (+3/-3)
debian/changelog (+8/-0)
debian/control (+4/-1)
debian/rules (+1/-0)
docs/libdbusmenu-glib/reference/version.xml (+1/-1)
docs/libdbusmenu-gtk/reference/version.xml (+1/-1)
libdbusmenu-glib/client.c (+22/-0)
tests/test-glib-properties-client.c (+1/-1)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+33140@code.launchpad.net

Description of the change

0.3.11

To post a comment you must log in.
lp:~dbusmenu-team/libdbusmenu/ubuntu updated
90. By Ken VanDine

* New upstream release.
  * Fix to handle whitespace in layout XML better
  * Fixes to test scripts on ARM

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure'
--- configure 2010-08-12 16:22:27 +0000
+++ configure 2010-08-19 18:52:42 +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.10.3# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.11.
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.10'706PACKAGE_VERSION='0.3.11'
707PACKAGE_STRING='libdbusmenu 0.3.10'707PACKAGE_STRING='libdbusmenu 0.3.11'
708PACKAGE_BUGREPORT='ted@canonical.com'708PACKAGE_BUGREPORT='ted@canonical.com'
709PACKAGE_URL=''709PACKAGE_URL=''
710710
@@ -1533,7 +1533,7 @@
1533 # Omit some internal or obsolete options to make the list less imposing.1533 # Omit some internal or obsolete options to make the list less imposing.
1534 # This message is too long to be a string in the A/UX 3.1 sh.1534 # This message is too long to be a string in the A/UX 3.1 sh.
1535 cat <<_ACEOF1535 cat <<_ACEOF
1536\`configure' configures libdbusmenu 0.3.10 to adapt to many kinds of systems.1536\`configure' configures libdbusmenu 0.3.11 to adapt to many kinds of systems.
15371537
1538Usage: $0 [OPTION]... [VAR=VALUE]...1538Usage: $0 [OPTION]... [VAR=VALUE]...
15391539
@@ -1603,7 +1603,7 @@
16031603
1604if test -n "$ac_init_help"; then1604if test -n "$ac_init_help"; then
1605 case $ac_init_help in1605 case $ac_init_help in
1606 short | recursive ) echo "Configuration of libdbusmenu 0.3.10:";;1606 short | recursive ) echo "Configuration of libdbusmenu 0.3.11:";;
1607 esac1607 esac
1608 cat <<\_ACEOF1608 cat <<\_ACEOF
16091609
@@ -1741,7 +1741,7 @@
1741test -n "$ac_init_help" && exit $ac_status1741test -n "$ac_init_help" && exit $ac_status
1742if $ac_init_version; then1742if $ac_init_version; then
1743 cat <<\_ACEOF1743 cat <<\_ACEOF
1744libdbusmenu configure 0.3.101744libdbusmenu configure 0.3.11
1745generated by GNU Autoconf 2.671745generated by GNU Autoconf 2.67
17461746
1747Copyright (C) 2010 Free Software Foundation, Inc.1747Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2112,7 +2112,7 @@
2112This file contains any messages produced by compilers while2112This file contains any messages produced by compilers while
2113running configure, to aid debugging if configure makes a mistake.2113running configure, to aid debugging if configure makes a mistake.
21142114
2115It was created by libdbusmenu $as_me 0.3.10, which was2115It was created by libdbusmenu $as_me 0.3.11, which was
2116generated by GNU Autoconf 2.67. Invocation command line was2116generated by GNU Autoconf 2.67. Invocation command line was
21172117
2118 $ $0 $@2118 $ $0 $@
@@ -2933,7 +2933,7 @@
29332933
2934# Define the identity of the package.2934# Define the identity of the package.
2935 PACKAGE=libdbusmenu2935 PACKAGE=libdbusmenu
2936 VERSION=0.3.102936 VERSION=0.3.11
29372937
29382938
2939# Some tools Automake needs.2939# Some tools Automake needs.
@@ -13065,7 +13065,7 @@
13065###########################13065###########################
1306613066
13067LIBDBUSMENU_CURRENT=113067LIBDBUSMENU_CURRENT=1
13068LIBDBUSMENU_REVISION=1213068LIBDBUSMENU_REVISION=13
13069LIBDBUSMENU_AGE=013069LIBDBUSMENU_AGE=0
1307013070
1307113071
@@ -14379,7 +14379,7 @@
14379# report actual input values of CONFIG_FILES etc. instead of their14379# report actual input values of CONFIG_FILES etc. instead of their
14380# values after options handling.14380# values after options handling.
14381ac_log="14381ac_log="
14382This file was extended by libdbusmenu $as_me 0.3.10, which was14382This file was extended by libdbusmenu $as_me 0.3.11, which was
14383generated by GNU Autoconf 2.67. Invocation command line was14383generated by GNU Autoconf 2.67. Invocation command line was
1438414384
14385 CONFIG_FILES = $CONFIG_FILES14385 CONFIG_FILES = $CONFIG_FILES
@@ -14445,7 +14445,7 @@
14445cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=114445cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14446ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"14446ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14447ac_cs_version="\\14447ac_cs_version="\\
14448libdbusmenu config.status 0.3.1014448libdbusmenu config.status 0.3.11
14449configured by $0, generated by GNU Autoconf 2.67,14449configured by $0, generated by GNU Autoconf 2.67,
14450 with options \\"\$ac_cs_config\\"14450 with options \\"\$ac_cs_config\\"
1445114451
1445214452
=== modified file 'configure.ac'
--- configure.ac 2010-08-12 16:22:27 +0000
+++ configure.ac 2010-08-19 18:52:42 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.3.10, ted@canonical.com)2AC_INIT(libdbusmenu, 0.3.11, 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.10, [-Wno-portability])8AM_INIT_AUTOMAKE(libdbusmenu, 0.3.11, [-Wno-portability])
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -99,7 +99,7 @@
99###########################99###########################
100100
101LIBDBUSMENU_CURRENT=1101LIBDBUSMENU_CURRENT=1
102LIBDBUSMENU_REVISION=12102LIBDBUSMENU_REVISION=13
103LIBDBUSMENU_AGE=0103LIBDBUSMENU_AGE=0
104104
105AC_SUBST(LIBDBUSMENU_CURRENT)105AC_SUBST(LIBDBUSMENU_CURRENT)
106106
=== modified file 'debian/changelog'
--- debian/changelog 2010-08-12 19:21:26 +0000
+++ debian/changelog 2010-08-19 18:52:42 +0000
@@ -1,3 +1,11 @@
1libdbusmenu (0.3.11-0ubuntu1~ppa1) maverick; urgency=low
2
3 * New upstream release.
4 * Fix to handle whitespace in layout XML better
5 * Fixes to test scripts on ARM
6
7 -- Ted Gould <ted@ubuntu.com> Thu, 19 Aug 2010 13:47:33 -0500
8
1libdbusmenu (0.3.10-0ubuntu1) maverick; urgency=low9libdbusmenu (0.3.10-0ubuntu1) maverick; urgency=low
210
3 * New upstream release.11 * New upstream release.
412
=== modified file 'debian/control'
--- debian/control 2010-08-12 19:21:26 +0000
+++ debian/control 2010-08-19 18:52:42 +0000
@@ -20,7 +20,10 @@
20 gir1.0-glib-2.0,20 gir1.0-glib-2.0,
21 gir1.0-gtk-2.0,21 gir1.0-gtk-2.0,
22 libx11-dev (>= 1.3), 22 libx11-dev (>= 1.3),
23 valac23 valac,
24# Check dependencies
25 xvfb,
26 dbus-test-runner
24Standards-Version: 3.9.127Standards-Version: 3.9.1
25Homepage: https://launchpad.net/dbusmenu28Homepage: https://launchpad.net/dbusmenu
26Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu29Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
2730
=== modified file 'debian/rules'
--- debian/rules 2010-08-12 19:21:26 +0000
+++ debian/rules 2010-08-19 18:52:42 +0000
@@ -3,6 +3,7 @@
3include /usr/share/cdbs/1/rules/debhelper.mk3include /usr/share/cdbs/1/rules/debhelper.mk
4include /usr/share/cdbs/1/class/gnome.mk4include /usr/share/cdbs/1/class/gnome.mk
55
6DEB_MAKE_CHECK_TARGET := check
6DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc7DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
7LDFLAGS += -Wl,-z,defs -Wl,--as-needed8LDFLAGS += -Wl,-z,defs -Wl,--as-needed
89
910
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml 2010-08-12 16:22:27 +0000
+++ docs/libdbusmenu-glib/reference/version.xml 2010-08-19 18:52:42 +0000
@@ -1,1 +1,1 @@
10.3.1010.3.11
22
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml 2010-08-12 16:22:27 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml 2010-08-19 18:52:42 +0000
@@ -1,1 +1,1 @@
10.3.1010.3.11
22
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c 2010-07-20 20:22:40 +0000
+++ libdbusmenu-glib/client.c 2010-08-19 18:52:42 +0000
@@ -1126,6 +1126,9 @@
1126 /* g_debug("Looking at child: %d", position); */1126 /* g_debug("Looking at child: %d", position); */
1127 gint childid = parse_node_get_id(children);1127 gint childid = parse_node_get_id(children);
1128 if (childid < 0) {1128 if (childid < 0) {
1129 /* Don't increment the position when there isn't a valid
1130 node in the XML tree. It's probably a comment. */
1131 position--;
1129 continue;1132 continue;
1130 }1133 }
1131 DbusmenuMenuitem * childmi = NULL;1134 DbusmenuMenuitem * childmi = NULL;
@@ -1143,11 +1146,17 @@
1143 }1146 }
11441147
1145 if (childmi == NULL) {1148 if (childmi == NULL) {
1149 #ifdef MASSIVEDEBUGGING
1150 g_debug("Building new menu item %d at position %d", childid, position);
1151 #endif
1146 /* If we can't recycle, then we build a new one */1152 /* If we can't recycle, then we build a new one */
1147 childmi = parse_layout_new_child(childid, client, item);1153 childmi = parse_layout_new_child(childid, client, item);
1148 dbusmenu_menuitem_child_add_position(item, childmi, position);1154 dbusmenu_menuitem_child_add_position(item, childmi, position);
1149 g_object_unref(childmi);1155 g_object_unref(childmi);
1150 } else {1156 } else {
1157 #ifdef MASSIVEDEBUGGING
1158 g_debug("Recycling menu item %d at position %d", childid, position);
1159 #endif
1151 /* If we can recycle, make sure it's in the right place */1160 /* If we can recycle, make sure it's in the right place */
1152 dbusmenu_menuitem_child_reorder(item, childmi, position);1161 dbusmenu_menuitem_child_reorder(item, childmi, position);
1153 parse_layout_update(childmi, client);1162 parse_layout_update(childmi, client);
@@ -1175,6 +1184,19 @@
1175 children = node->children;1184 children = node->children;
1176 GList * childmis = dbusmenu_menuitem_get_children(item);1185 GList * childmis = dbusmenu_menuitem_get_children(item);
1177 while (children != NULL && childmis != NULL) {1186 while (children != NULL && childmis != NULL) {
1187 gint xmlid = parse_node_get_id(children);
1188 /* If this isn't a valid menu item we need to move on
1189 until we have one. This avoids things like comments. */
1190 if (xmlid < 0) {
1191 children = children->next;
1192 continue;
1193 }
1194
1195 #ifdef MASSIVEDEBUGGING
1196 gint miid = dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(childmis->data));
1197 g_debug("Recursing parse_layout_xml. XML ID: %d MI ID: %d", xmlid, miid);
1198 #endif
1199
1178 parse_layout_xml(client, children, DBUSMENU_MENUITEM(childmis->data), item, proxy);1200 parse_layout_xml(client, children, DBUSMENU_MENUITEM(childmis->data), item, proxy);
11791201
1180 children = children->next;1202 children = children->next;
11811203
=== modified file 'tests/test-glib-properties-client.c'
--- tests/test-glib-properties-client.c 2010-02-05 18:10:47 +0000
+++ tests/test-glib-properties-client.c 2010-08-19 18:52:42 +0000
@@ -121,7 +121,7 @@
121layout_updated (DbusmenuClient * client, gpointer data)121layout_updated (DbusmenuClient * client, gpointer data)
122{122{
123 g_debug("Layout Updated");123 g_debug("Layout Updated");
124 g_timeout_add (250, layout_verify_timer, client);124 g_timeout_add (500, layout_verify_timer, client);
125 return;125 return;
126}126}
127127

Subscribers

People subscribed via source and target branches

to all changes: