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
1=== modified file 'configure.ac'
2--- configure.ac 2011-06-16 19:07:27 +0000
3+++ configure.ac 2011-06-17 03:18:29 +0000
4@@ -1,11 +1,11 @@
5
6-AC_INIT(libdbusmenu, 0.4.3, ted@canonical.com)
7+AC_INIT(libdbusmenu, 0.4.4, ted@canonical.com)
8 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
9
10 AC_PREREQ(2.62)
11
12 AM_CONFIG_HEADER(config.h)
13-AM_INIT_AUTOMAKE(libdbusmenu, 0.4.3, [-Wno-portability])
14+AM_INIT_AUTOMAKE(libdbusmenu, 0.4.4, [-Wno-portability])
15
16 AM_MAINTAINER_MODE
17
18@@ -133,8 +133,8 @@
19 # Lib versioning
20 ###########################
21
22-LIBDBUSMENU_CURRENT=4
23-LIBDBUSMENU_REVISION=0
24+LIBDBUSMENU_CURRENT=3
25+LIBDBUSMENU_REVISION=15
26 LIBDBUSMENU_AGE=0
27
28 AC_SUBST(LIBDBUSMENU_CURRENT)
29
30=== modified file 'libdbusmenu-gtk/parser.c'
31--- libdbusmenu-gtk/parser.c 2011-05-31 21:37:28 +0000
32+++ libdbusmenu-gtk/parser.c 2011-06-17 03:18:29 +0000
33@@ -873,6 +873,9 @@
34 g_idle_add ((GSourceFunc)recreate_menu_item_in_idle_cb, child);
35 }
36 }
37+
38+ g_value_unset(&prop_value);
39+ return;
40 }
41
42 static void

Subscribers

People subscribed via source and target branches