Merge lp:~ted/libdbusmenu/lp785828 into lp:libdbusmenu/0.5

Proposed by Ted Gould
Status: Merged
Merged at revision: 308
Proposed branch: lp:~ted/libdbusmenu/lp785828
Merge into: lp:libdbusmenu/0.5
Diff against target: 42 lines (+7/-4)
2 files modified
configure.ac (+4/-4)
libdbusmenu-gtk/parser.c (+3/-0)
To merge this branch: bzr merge lp:~ted/libdbusmenu/lp785828
Reviewer Review Type Date Requested Status
DBus Menu Team Pending
Review via email: mp+64934@code.launchpad.net

Description of the change

Unsetting a value.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2011-06-16 19:07:27 +0000
+++ configure.ac 2011-06-17 03:18:29 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.4.3, ted@canonical.com)2AC_INIT(libdbusmenu, 0.4.4, 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.4.3, [-Wno-portability])8AM_INIT_AUTOMAKE(libdbusmenu, 0.4.4, [-Wno-portability])
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -133,8 +133,8 @@
133# Lib versioning 133# Lib versioning
134###########################134###########################
135135
136LIBDBUSMENU_CURRENT=4136LIBDBUSMENU_CURRENT=3
137LIBDBUSMENU_REVISION=0137LIBDBUSMENU_REVISION=15
138LIBDBUSMENU_AGE=0138LIBDBUSMENU_AGE=0
139139
140AC_SUBST(LIBDBUSMENU_CURRENT)140AC_SUBST(LIBDBUSMENU_CURRENT)
141141
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c 2011-05-31 21:37:28 +0000
+++ libdbusmenu-gtk/parser.c 2011-06-17 03:18:29 +0000
@@ -873,6 +873,9 @@
873 g_idle_add ((GSourceFunc)recreate_menu_item_in_idle_cb, child);873 g_idle_add ((GSourceFunc)recreate_menu_item_in_idle_cb, child);
874 } 874 }
875 }875 }
876
877 g_value_unset(&prop_value);
878 return;
876}879}
877880
878static void881static void

Subscribers

People subscribed via source and target branches