diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2014-11-09 11:21:58 -0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2015-06-29 09:04:03 -0700 |
| commit | c705262e4906e201a1d0ed19ee0663325208adb1 (patch) | |
| tree | c3b6651d5d43f61ad68b9f32f889ca1ba0ac22f4 /daemon | |
| parent | 7e78262511c58cb55ccbbd23ffb3307c19a95e84 (diff) | |
| download | gnome-keyring-c705262e4906e201a1d0ed19ee0663325208adb1.tar.gz | |
dbus: cleanup error handling
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/dbus/gkd-dbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/daemon/dbus/gkd-dbus.c b/daemon/dbus/gkd-dbus.c index 069bf8d7..743995f4 100644 --- a/daemon/dbus/gkd-dbus.c +++ b/daemon/dbus/gkd-dbus.c @@ -134,6 +134,7 @@ gkd_dbus_singleton_acquire (gboolean *acquired) GVariant *acquire_variant; guint res; GError *error = NULL; + GkdOrgGnomeKeyringDaemon *skeleton; g_assert (acquired); @@ -142,8 +143,7 @@ gkd_dbus_singleton_acquire (gboolean *acquired) /* First register the object */ if (!object_registered) { - GError *error = NULL; - GkdOrgGnomeKeyringDaemon *skeleton = gkd_org_gnome_keyring_daemon_skeleton_new (); + skeleton = gkd_org_gnome_keyring_daemon_skeleton_new (); g_signal_connect (skeleton, "handle-get-control-directory", G_CALLBACK (handle_get_control_directory), NULL); @@ -158,7 +158,7 @@ gkd_dbus_singleton_acquire (gboolean *acquired) egg_cleanup_register (cleanup_singleton, skeleton); } else { g_message ("couldn't register dbus object path: %s", error->message); - g_error_free (error); + g_clear_error (&error); } } |