diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-28 16:28:24 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-05 21:03:34 +0800 |
| commit | 16947e6677f6a9adf08746912d36b090a4a2ef4d (patch) | |
| tree | 442bbe5b7e5f91f12bf1ef0a02ab66d29afe611e /src/empathy.c | |
| parent | 0c787fdf8c043331b4857c6bf3ec08936467e42b (diff) | |
| download | gsoc2013-empathy-16947e6677f6a9adf08746912d36b090a4a2ef4d.tar gsoc2013-empathy-16947e6677f6a9adf08746912d36b090a4a2ef4d.tar.gz gsoc2013-empathy-16947e6677f6a9adf08746912d36b090a4a2ef4d.tar.bz2 gsoc2013-empathy-16947e6677f6a9adf08746912d36b090a4a2ef4d.tar.lz gsoc2013-empathy-16947e6677f6a9adf08746912d36b090a4a2ef4d.tar.xz gsoc2013-empathy-16947e6677f6a9adf08746912d36b090a4a2ef4d.tar.zst gsoc2013-empathy-16947e6677f6a9adf08746912d36b090a4a2ef4d.zip | |
stop instantiating EmpathyConnectivity
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/empathy.c b/src/empathy.c index ac84d3317..c629621dd 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -52,7 +52,6 @@ #include <libempathy/empathy-utils.h> #include <libempathy/empathy-chatroom-manager.h> #include <libempathy/empathy-account-settings.h> -#include <libempathy/empathy-connectivity.h> #include <libempathy/empathy-connection-managers.h> #include <libempathy/empathy-request-util.h> #include <libempathy/empathy-ft-factory.h> @@ -119,7 +118,6 @@ struct _EmpathyApp EmpathyChatroomManager *chatroom_manager; EmpathyFTFactory *ft_factory; EmpathyPresenceManager *presence_mgr; - EmpathyConnectivity *connectivity; GSettings *gsettings; EmpathyNotificationsApprover *notifications_approver; EmpathyConnectionAggregator *conn_aggregator; @@ -157,7 +155,6 @@ empathy_app_dispose (GObject *object) #endif tp_clear_object (&self->presence_mgr); - tp_clear_object (&self->connectivity); tp_clear_object (&self->icon); tp_clear_object (&self->account_manager); tp_clear_object (&self->log_manager); @@ -522,17 +519,6 @@ empathy_app_init (EmpathyApp *self) } static void -use_conn_notify_cb (GSettings *gsettings, - const gchar *key, - gpointer user_data) -{ - EmpathyConnectivity *connectivity = user_data; - - empathy_connectivity_set_use_conn (connectivity, - g_settings_get_boolean (gsettings, key)); -} - -static void migrate_config_to_xdg_dir (void) { gchar *xdg_dir, *old_dir, *xdg_filename, *old_filename; @@ -773,14 +759,6 @@ empathy_app_constructed (GObject *object) self->gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA); - /* Setting up Connectivity */ - self->connectivity = empathy_connectivity_dup_singleton (); - use_conn_notify_cb (self->gsettings, EMPATHY_PREFS_USE_CONN, - self->connectivity); - g_signal_connect (self->gsettings, - "changed::" EMPATHY_PREFS_USE_CONN, - G_CALLBACK (use_conn_notify_cb), self->connectivity); - /* account management */ self->account_manager = tp_account_manager_dup (); tp_proxy_prepare_async (self->account_manager, NULL, |