diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-10-18 12:07:52 +0200 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-10-18 12:07:52 +0200 |
| commit | e271582da5b0d4ba5a69a44f58cdb4b278118ca9 (patch) | |
| tree | 49a2828ba5f392aa16499cccf5de105823a9edea /libmessaging-menu | |
| parent | ff7c774b2769d696ea6dd232befe0157ddd24bd1 (diff) | |
| parent | 3a5caf3d7f33d62aecb4e51db4cfb0be96d85dad (diff) | |
| download | ayatana-indicator-messages-e271582da5b0d4ba5a69a44f58cdb4b278118ca9.tar.gz ayatana-indicator-messages-e271582da5b0d4ba5a69a44f58cdb4b278118ca9.tar.bz2 ayatana-indicator-messages-e271582da5b0d4ba5a69a44f58cdb4b278118ca9.zip | |
Merge lp:~larsu/indicator-messages/lp1064314
Fixes a crash in libmessaging-menu when menus and action groups cannot be
exported.
Diffstat (limited to 'libmessaging-menu')
| -rw-r--r-- | libmessaging-menu/messaging-menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c index 70861d3..6348dcf 100644 --- a/libmessaging-menu/messaging-menu.c +++ b/libmessaging-menu/messaging-menu.c @@ -190,7 +190,7 @@ export_menus_and_actions (GObject *source, if (!id) { g_warning ("unable to export action group: %s", error->message); - g_error_free (error); + g_clear_error (&error); } id = g_dbus_connection_export_menu_model (bus, @@ -200,7 +200,7 @@ export_menus_and_actions (GObject *source, if (!id) { g_warning ("unable to export menu: %s", error->message); - g_error_free (error); + g_clear_error (&error); } g_object_unref (bus); |