DBus Menu

Merge lp:~charlesk/libdbusmenu/lp-981766 into lp:libdbusmenu/0.6

  1. lp-981766
  2. Merge into trunk.0.6
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 414
Merged at revision: 414
Proposed branch: lp:~charlesk/libdbusmenu/lp-981766
Merge into: lp:libdbusmenu/0.6
Diff against target: 15 lines (+5/-0)
1 file modified
libdbusmenu-glib/server.c (+5/-0)
To merge this branch: bzr merge lp:~charlesk/libdbusmenu/lp-981766
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+102032@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Good catch.

  review approve
  status approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/server.c'
2--- libdbusmenu-glib/server.c 2012-04-10 22:54:52 +0000
3+++ libdbusmenu-glib/server.c 2012-04-15 16:08:20 +0000
4@@ -463,6 +463,11 @@
5 {
6 DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(object);
7
8+ if (priv->dbusobject != NULL) {
9+ g_free (priv->dbusobject);
10+ priv->dbusobject = NULL;
11+ }
12+
13 if (priv->icon_dirs != NULL) {
14 g_strfreev(priv->icon_dirs);
15 priv->icon_dirs = NULL;

Subscribers

People subscribed via source and target branches

to all changes: