diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 12 | ||||
| -rw-r--r-- | shell/e-shell-nm.c | 177 | ||||
| -rw-r--r-- | shell/e-shell.c | 8 |
3 files changed, 0 insertions, 197 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 8afc886d46..0a93912680 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -2,13 +2,6 @@ if ENABLE_TEST_COMPONENT SUBDIRS = . test endif -if NM_SUPPORT -NM_CPPFLAGS = \ - $(DBUS_GLIB_CFLAGS) \ - $(NM_CFLAGS) -NM_SUPPORT_FILES = e-shell-nm.c -endif - # Executable bin_PROGRAMS = evolution @@ -61,7 +54,6 @@ libeshell_la_CPPFLAGS = \ $(SHELL_CFLAGS) libeshell_la_SOURCES = \ - $(NM_SUPPORT_FILES) \ $(eshellinclude_HEADERS) \ e-shell.c \ e-shell-backend.c \ @@ -92,10 +84,6 @@ libeshell_la_LIBADD = \ $(GNOME_PLATFORM_LIBS) \ $(SHELL_LIBS) -if NM_SUPPORT -libeshell_la_LIBADD += $(DBUS_GLIB_LIBS) -endif - # Evolution executable if HAVE_WINDRES diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c deleted file mode 100644 index 7f17d9716f..0000000000 --- a/shell/e-shell-nm.c +++ /dev/null @@ -1,177 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Shreyas Srinivasan <sshreyas@novell.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#define DBUS_API_SUBJECT_TO_CHANGE 1 - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <stdio.h> -#include <string.h> -#include <glib.h> -#include <e-shell.h> -#include <dbus/dbus.h> -#include <dbus/dbus-glib-lowlevel.h> -#include <dbus/dbus-glib.h> -#include <NetworkManager/NetworkManager.h> - -static DBusConnection *dbus_connection; - -/* Forward Declaration */ -gboolean e_shell_dbus_initialize (EShell *shell); - -static gboolean -reinit_dbus (EShell *shell) -{ - return !e_shell_dbus_initialize (shell); -} - -static DBusHandlerResult -e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, - DBusMessage *message, - gpointer user_data) -{ - DBusError error = DBUS_ERROR_INIT; - EShell *shell = user_data; - const gchar *path; - guint32 state; - - path = dbus_message_get_path (message); - - if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") && - path != NULL && strcmp (path, DBUS_PATH_LOCAL) == 0) { - dbus_connection_unref (dbus_connection); - dbus_connection = NULL; - - g_timeout_add_seconds (3, (GSourceFunc) reinit_dbus, shell); - - return DBUS_HANDLER_RESULT_HANDLED; - } - - if (!dbus_message_is_signal (message, NM_DBUS_INTERFACE, "StateChanged")) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - dbus_message_get_args ( - message, &error, - DBUS_TYPE_UINT32, &state, - DBUS_TYPE_INVALID); - - if (dbus_error_is_set (&error)) { - g_warning ("%s", error.message); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - - switch (state) { - case NM_STATE_CONNECTED: - e_shell_set_network_available (shell, TRUE); - break; - case NM_STATE_ASLEEP: - case NM_STATE_DISCONNECTED: - e_shell_set_network_available (shell, FALSE); - break; - default: - break; - } - - return DBUS_HANDLER_RESULT_HANDLED; -} - -static void -check_initial_state (EShell *shell) -{ - DBusMessage *message = NULL, *response = NULL; - guint32 state = -1; - DBusError error = DBUS_ERROR_INIT; - - message = dbus_message_new_method_call ( - NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "state"); - - /* assuming this should be safe to call syncronously */ - response = dbus_connection_send_with_reply_and_block ( - dbus_connection, message, 100, &error); - - if (response) - dbus_message_get_args ( - response, &error, DBUS_TYPE_UINT32, - &state, DBUS_TYPE_INVALID); - else { - g_warning ("%s", error.message); - dbus_error_free (&error); - return; - } - - /* Update the state only in the absence of a network connection, - * otherwise let the old state prevail. */ - if (state == NM_STATE_DISCONNECTED) - e_shell_set_network_available (shell, FALSE); - - dbus_message_unref (message); - dbus_message_unref (response); -} - -gboolean -e_shell_dbus_initialize (EShell *shell) -{ - DBusError error = DBUS_ERROR_INIT; - - g_return_val_if_fail (E_IS_SHELL (shell), FALSE); - - if (dbus_connection != NULL) - return TRUE; - - dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); - if (dbus_connection == NULL) { - g_warning ("%s", 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, shell, NULL)) - goto exception; - - check_initial_state (shell); - - dbus_bus_add_match (dbus_connection, - "type='signal'," - "interface='" NM_DBUS_INTERFACE "'," - "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; - } - - return TRUE; - -exception: - - dbus_connection_unref (dbus_connection); - dbus_connection = NULL; - - return FALSE; -} diff --git a/shell/e-shell.c b/shell/e-shell.c index 8bbcde784d..459ebdc64a 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -98,10 +98,6 @@ static GDebugKey debug_keys[] = { static gpointer default_shell; static guint signals[LAST_SIGNAL]; -#if defined(NM_SUPPORT) && NM_SUPPORT -gboolean e_shell_dbus_initialize (EShell *shell); -#endif - G_DEFINE_TYPE_WITH_CODE ( EShell, e_shell, UNIQUE_TYPE_APP, G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) @@ -1087,10 +1083,6 @@ e_shell_init (EShell *shell) g_object_ref_sink (shell->priv->preferences_window); -#if defined(NM_SUPPORT) && NM_SUPPORT - e_shell_dbus_initialize (shell); -#endif - /* Add our icon directory to the theme's search path * here instead of in main() so Anjal picks it up. */ icon_theme = gtk_icon_theme_get_default (); |