Merge lp:~larsu/indicator-messages/lp1064314 into lp:indicator-messages/12.10

Proposed by Lars Karlitski
Status: Merged
Approved by: Charles Kerr
Approved revision: 323
Merge reported by: Lars Karlitski
Merged at revision: not available
Proposed branch: lp:~larsu/indicator-messages/lp1064314
Merge into: lp:indicator-messages/12.10
Diff against target: 21 lines (+2/-2)
1 file modified
libmessaging-menu/messaging-menu.c (+2/-2)
To merge this branch: bzr merge lp:~larsu/indicator-messages/lp1064314
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
jenkins (community) continuous-integration Approve
Review via email: mp+129146@code.launchpad.net

Description of the change

Clear `error`, because it might be reused.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libmessaging-menu/messaging-menu.c'
2--- libmessaging-menu/messaging-menu.c 2012-10-09 20:12:15 +0000
3+++ libmessaging-menu/messaging-menu.c 2012-10-11 10:40:25 +0000
4@@ -190,7 +190,7 @@
5 if (!id)
6 {
7 g_warning ("unable to export action group: %s", error->message);
8- g_error_free (error);
9+ g_clear_error (&error);
10 }
11
12 id = g_dbus_connection_export_menu_model (bus,
13@@ -200,7 +200,7 @@
14 if (!id)
15 {
16 g_warning ("unable to export menu: %s", error->message);
17- g_error_free (error);
18+ g_clear_error (&error);
19 }
20
21 g_object_unref (bus);

Subscribers

People subscribed via source and target branches