diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-16 21:11:05 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-16 21:11:05 +0800 |
| commit | d041967019edda596ad98bd6d27e928dc2b7fd53 (patch) | |
| tree | 8155d07342114d85f46717fdcad5f24515d00645 /src | |
| parent | 7e37089963000a4dcce907f2e4e8849bd0c97a06 (diff) | |
| parent | 700d6bc82ed3e3a83788c6ae27df0124157e847e (diff) | |
| download | gsoc2013-empathy-d041967019edda596ad98bd6d27e928dc2b7fd53.tar gsoc2013-empathy-d041967019edda596ad98bd6d27e928dc2b7fd53.tar.gz gsoc2013-empathy-d041967019edda596ad98bd6d27e928dc2b7fd53.tar.bz2 gsoc2013-empathy-d041967019edda596ad98bd6d27e928dc2b7fd53.tar.lz gsoc2013-empathy-d041967019edda596ad98bd6d27e928dc2b7fd53.tar.xz gsoc2013-empathy-d041967019edda596ad98bd6d27e928dc2b7fd53.tar.zst gsoc2013-empathy-d041967019edda596ad98bd6d27e928dc2b7fd53.zip | |
Merge branch 'desktop-schema-626810'
Diffstat (limited to 'src')
| -rw-r--r-- | src/cc-empathy-accounts-panel.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/cc-empathy-accounts-panel.c b/src/cc-empathy-accounts-panel.c index d4dbf1e97..24be69121 100644 --- a/src/cc-empathy-accounts-panel.c +++ b/src/cc-empathy-accounts-panel.c @@ -29,7 +29,6 @@ #include <glib/gi18n-lib.h> #include <telepathy-glib/telepathy-glib.h> -#include <gconf/gconf-client.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-connection-managers.h> @@ -214,20 +213,12 @@ cc_empathy_accounts_panel_class_finalize (CcEmpathyAccountsPanelClass *klass) static void cc_empathy_accounts_panel_init (CcEmpathyAccountsPanel *panel) { - GConfClient *client; TpAccountManager *account_manager; panel->priv = CC_EMPATHY_ACCOUNTS_PANEL_GET_PRIVATE (panel); empathy_gtk_init (); - client = gconf_client_get_default (); - gconf_client_add_dir (client, "/desktop/gnome/peripherals/empathy_accounts", - GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - gconf_client_add_dir (client, "/desktop/gnome/interface", - GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - g_object_unref (client); - /* unref'd in final endpoint callbacks */ account_manager = tp_account_manager_dup (); |