Remove useless occurences of 'gconf' word

Die gconf, die!

diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index f6a723ef6e91f6e586d92c4fc422a5097ae39147..f02b7588b7b11e5c3850dda44f08b6072213ee6a 100644 (file)
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -403,7 +403,7 @@ empathy_connectivity_set_use_conn (EmpathyConnectivity *connectivity,
   if (use_conn == priv->use_conn)
     return;
 
-  DEBUG ("use_conn gconf key changed; new value = %s",
+  DEBUG ("use_conn GSetting key changed; new value = %s",
       use_conn ? "true" : "false");
 
   priv->use_conn = use_conn;

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 8192049e7afd60bb6a0c3937097be238780e4025..4460d6f857029f10f3aba78f1a0a4762cce5eb37 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -786,7 +786,7 @@ preferences_themes_setup (EmpathyPreferences *preferences)
                          G_CALLBACK (preferences_theme_changed_cb),
                          preferences);
 
-       /* Select the theme from the gconf key and track changes */
+       /* Select the theme from the GSetting key and track changes */
        preferences_theme_notify_cb (preferences->gsettings_chat,
                                     EMPATHY_PREFS_CHAT_THEME,
                                     preferences);

diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 3d6b6f6b7a8cd1b043cb2de23f01a36be800d390..b79e898d048803bc40951c9ba2eb4b32705bb296 100644 (file)
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -3,8 +3,6 @@
 #include <string.h>
 #include <glib/gstdio.h>
 
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>