diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-25 07:52:05 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-25 07:52:05 +0800 |
| commit | 85b2913a380c69f14ae0254ad23b10fabfb33667 (patch) | |
| tree | c1cf143e37294dd9dd3667ebbe0a1d0c00b04b56 /shell/e-shell-nm.c | |
| parent | e7a31c5035a0afeed6c1675e30487c1e2bdc139f (diff) | |
| download | gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.gz gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.bz2 gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.lz gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.xz gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.zst gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.zip | |
Merge revisions 36534:36684 from trunk.
svn path=/branches/kill-bonobo/; revision=36685
Diffstat (limited to 'shell/e-shell-nm.c')
| -rw-r--r-- | shell/e-shell-nm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index 930e80f124..c0cae505dc 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -51,13 +51,12 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, gpointer user_data) { - DBusError error; + DBusError error = DBUS_ERROR_INIT; const gchar *object; EShell *shell = user_data; EShellLineStatus line_status; gboolean device_active; - dbus_error_init (&error); object = dbus_message_get_path (message); if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") && @@ -94,16 +93,16 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, gboolean e_shell_dbus_initialize (EShell *shell) { - DBusError error; + DBusError error = DBUS_ERROR_INIT; g_return_val_if_fail (E_IS_SHELL (shell), FALSE); if (dbus_connection != NULL) return TRUE; - dbus_error_init (&error); - if (!(dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error))) { - g_warning ("could not get system bus: %s\n", error.message); + dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); + if (dbus_connection == NULL) { + g_warning ("%s", error.message); dbus_error_free (&error); return FALSE; } @@ -120,6 +119,7 @@ e_shell_dbus_initialize (EShell *shell) "sender='" NM_DBUS_SERVICE "'," "path='" NM_DBUS_PATH "'", &error); if (dbus_error_is_set (&error)) { + g_warning ("%s", error.message); dbus_error_free (&error); goto exception; } |