aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-06-13 15:51:03 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-06-15 19:45:47 +0800
commit368556a6bd473f1faab34b44e6dba224f88361ac (patch)
tree8520c692b15f3f4ff43031f82c8b9ca1f7bc80ce
parenta3c513e5555aaaf91b4d2a5acb56c30b725c99e0 (diff)
downloadgsoc2013-empathy-368556a6bd473f1faab34b44e6dba224f88361ac.tar
gsoc2013-empathy-368556a6bd473f1faab34b44e6dba224f88361ac.tar.gz
gsoc2013-empathy-368556a6bd473f1faab34b44e6dba224f88361ac.tar.bz2
gsoc2013-empathy-368556a6bd473f1faab34b44e6dba224f88361ac.tar.lz
gsoc2013-empathy-368556a6bd473f1faab34b44e6dba224f88361ac.tar.xz
gsoc2013-empathy-368556a6bd473f1faab34b44e6dba224f88361ac.tar.zst
gsoc2013-empathy-368556a6bd473f1faab34b44e6dba224f88361ac.zip
roster-window: remove unused gsettings_contacts
https://bugzilla.gnome.org/show_bug.cgi?id=677949
-rw-r--r--data/org.gnome.Empathy.gschema.xml1
-rw-r--r--src/empathy-roster-window.c3
2 files changed, 0 insertions, 4 deletions
diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml
index 49451979f..e7597d7f1 100644
--- a/data/org.gnome.Empathy.gschema.xml
+++ b/data/org.gnome.Empathy.gschema.xml
@@ -36,7 +36,6 @@
<description>empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually.</description>
</key>
<child name="ui" schema="org.gnome.Empathy.ui"/>
- <child name="contacts" schema="org.gnome.Empathy.contacts"/>
<child name="sounds" schema="org.gnome.Empathy.sounds"/>
<child name="notifications" schema="org.gnome.Empathy.notifications"/>
<child name="conversation" schema="org.gnome.Empathy.conversation"/>
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 2e3a9f8e1..6a791f45c 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -111,7 +111,6 @@ struct _EmpathyRosterWindowPriv {
gboolean flash_on;
GSettings *gsettings_ui;
- GSettings *gsettings_contacts;
GtkWidget *preferences;
GtkWidget *main_vbox;
@@ -995,7 +994,6 @@ empathy_roster_window_finalize (GObject *window)
g_object_unref (self->priv->chatroom_manager);
g_object_unref (self->priv->gsettings_ui);
- g_object_unref (self->priv->gsettings_contacts);
g_object_unref (self->priv->individual_manager);
g_object_unref (self->priv->menumodel);
@@ -1926,7 +1924,6 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
empathy_set_css_provider (GTK_WIDGET (self));
self->priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
- self->priv->gsettings_contacts = g_settings_new (EMPATHY_PREFS_CONTACTS_SCHEMA);
self->priv->sound_mgr = empathy_sound_manager_dup_singleton ();