diff options
Diffstat (limited to 'shell/e-shell-nm.c')
| -rw-r--r-- | shell/e-shell-nm.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index 4c0a8a52e1..de06ed2d8a 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -51,9 +51,9 @@ reinit_dbus (gpointer user_data) { if (init_dbus (user_data)) return FALSE; - + /* keep trying to re-establish dbus connection */ - + return TRUE; } @@ -68,41 +68,41 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, EShell *shell = e_shell_window_peek_shell ((EShellWindow *) user_data); GNOME_Evolution_ShellState shell_state; EShellLineStatus line_status; - + dbus_error_init (&error); object = dbus_message_get_path (message); - + if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") && strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) { dbus_connection_unref (dbus_connection); dbus_connection = NULL; - + g_timeout_add (3000, reinit_dbus, window); - + return DBUS_HANDLER_RESULT_HANDLED; } - + if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) status = E_SHELL_LINE_DOWN; - else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive")) + else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive")) status = E_SHELL_LINE_UP; else return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - + if (!dbus_message_get_args (message, &error, DBUS_TYPE_OBJECT_PATH, &object, DBUS_TYPE_INVALID)) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - + line_status = e_shell_get_line_status (shell); - + if (line_status == E_SHELL_LINE_STATUS_ONLINE && status == E_SHELL_LINE_DOWN) { shell_state = GNOME_Evolution_FORCED_OFFLINE; - e_shell_go_offline (shell, window, shell_state); + e_shell_go_offline (shell, window, shell_state); } else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && status == E_SHELL_LINE_UP) { shell_state = GNOME_Evolution_USER_ONLINE; e_shell_go_online (shell, window, shell_state); } - + return DBUS_HANDLER_RESULT_HANDLED; } @@ -110,23 +110,23 @@ static gboolean init_dbus (EShellWindow *window) { DBusError error; - + 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_error_free (&error); return FALSE; } - + dbus_connection_setup_with_g_main (dbus_connection, NULL); dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE); - + if (!dbus_connection_add_filter (dbus_connection, e_shell_network_monitor, window, NULL)) goto exception; - + dbus_bus_add_match (dbus_connection, "type='signal'," "interface='" NM_DBUS_INTERFACE "'," @@ -136,21 +136,21 @@ init_dbus (EShellWindow *window) dbus_error_free (&error); goto exception; } - + return TRUE; - + exception: - + dbus_connection_unref (dbus_connection); dbus_connection = NULL; - + return FALSE; } int e_shell_dbus_initialise (EShellWindow *window) { g_type_init (); - + return init_dbus (window); } |