diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/calendar/e-cal-shell-view-private.c | 2 | ||||
| -rw-r--r-- | modules/network-manager/evolution-network-manager.c | 27 |
2 files changed, 17 insertions, 12 deletions
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 26d6202cf1..a02888db8e 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -38,7 +38,7 @@ # define ETC_LOCALTIME "/etc/localtime" #endif -static const gchar * files_to_check [CHECK_NB] = { +static const gchar * files_to_check[CHECK_NB] = { ETC_TIMEZONE, ETC_TIMEZONE_MAJ, ETC_SYSCONFIG_CLOCK, diff --git a/modules/network-manager/evolution-network-manager.c b/modules/network-manager/evolution-network-manager.c index 4a661e2033..60cc0e806a 100644 --- a/modules/network-manager/evolution-network-manager.c +++ b/modules/network-manager/evolution-network-manager.c @@ -62,10 +62,11 @@ network_manager_get_shell (ENetworkManager *extension) } static void -nm_connection_closed_cb (GDBusConnection *pconnection, gboolean remote_peer_vanished, GError *error, gpointer user_data) +nm_connection_closed_cb (GDBusConnection *pconnection, + gboolean remote_peer_vanished, + GError *error, + ENetworkManager *extension) { - ENetworkManager *extension = user_data; - g_object_unref (extension->connection); extension->connection = NULL; @@ -75,12 +76,12 @@ nm_connection_closed_cb (GDBusConnection *pconnection, gboolean remote_peer_vani static void network_manager_signal_cb (GDBusConnection *connection, - const gchar *sender_name, - const gchar *object_path, - const gchar *interface_name, - const gchar *signal_name, - GVariant *parameters, - gpointer user_data) + const gchar *sender_name, + const gchar *object_path, + const gchar *interface_name, + const gchar *signal_name, + GVariant *parameters, + gpointer user_data) { ENetworkManager *extension = user_data; EShell *shell; @@ -122,7 +123,8 @@ network_manager_check_initial_state (ENetworkManager *extension) /* XXX Assuming this should be safe to call synchronously. */ response = g_dbus_connection_send_message_with_reply_sync ( - extension->connection, message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 100, NULL, NULL, &error); + extension->connection, message, + G_DBUS_SEND_MESSAGE_FLAGS_NONE, 100, NULL, NULL, &error); if (response != NULL) { GVariant *body = g_dbus_message_get_body (response); @@ -181,7 +183,10 @@ network_manager_connect (ENetworkManager *extension) goto fail; } - g_signal_connect (extension->connection, "closed", G_CALLBACK (nm_connection_closed_cb), extension); + g_signal_connect ( + extension->connection, "closed", + G_CALLBACK (nm_connection_closed_cb), extension); + network_manager_check_initial_state (extension); return FALSE; |