DBus Menu

Merge lp:~chrisccoulson/libdbusmenu/lp1103050 into lp:libdbusmenu/13.04

  1. lp1103050
  2. Merge into trunk.13.04
Proposed by Chris Coulson
Status: Merged
Approved by: Charles Kerr
Approved revision: 439
Merged at revision: 439
Proposed branch: lp:~chrisccoulson/libdbusmenu/lp1103050
Merge into: lp:libdbusmenu/13.04
Diff against target: 30 lines (+6/-0)
1 file modified
libdbusmenu-glib/server.c (+6/-0)
To merge this branch: bzr merge lp:~chrisccoulson/libdbusmenu/lp1103050
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+144341@code.launchpad.net

Description of the change

Fix a memory leak (bug 1103050)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/24/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/24/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/24//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

<3

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c 2012-11-21 18:13:53 +0000
+++ libdbusmenu-glib/server.c 2013-01-22 16:32:52 +0000
@@ -1705,6 +1705,8 @@
1705 } else {1705 } else {
1706 if (~g_dbus_message_get_flags (g_dbus_method_invocation_get_message (invocation)) & G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED) {1706 if (~g_dbus_message_get_flags (g_dbus_method_invocation_get_message (invocation)) & G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED) {
1707 g_dbus_method_invocation_return_value(invocation, NULL);1707 g_dbus_method_invocation_return_value(invocation, NULL);
1708 } else {
1709 g_object_unref(invocation);
1708 }1710 }
1709 }1711 }
17101712
@@ -1755,6 +1757,8 @@
1755 if (gotone) {1757 if (gotone) {
1756 if (~g_dbus_message_get_flags (g_dbus_method_invocation_get_message (invocation)) & G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED) {1758 if (~g_dbus_message_get_flags (g_dbus_method_invocation_get_message (invocation)) & G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED) {
1757 g_dbus_method_invocation_return_value(invocation, g_variant_new_tuple(&errors, 1));1759 g_dbus_method_invocation_return_value(invocation, g_variant_new_tuple(&errors, 1));
1760 } else {
1761 g_object_unref(invocation);
1758 }1762 }
1759 } else {1763 } else {
1760 gchar * ids = g_variant_print(errors, FALSE);1764 gchar * ids = g_variant_print(errors, FALSE);
@@ -1867,6 +1871,8 @@
1867 g_variant_builder_add_value(&tuple, errors);1871 g_variant_builder_add_value(&tuple, errors);
18681872
1869 g_dbus_method_invocation_return_value(invocation, g_variant_builder_end(&tuple));1873 g_dbus_method_invocation_return_value(invocation, g_variant_builder_end(&tuple));
1874 } else {
1875 g_object_unref(invocation);
1870 }1876 }
1871 } else {1877 } else {
1872 gchar * ids = g_variant_print(errors, FALSE);1878 gchar * ids = g_variant_print(errors, FALSE);

Subscribers

People subscribed via source and target branches

to all changes: