aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy/empathy-connectivity.c2
-rw-r--r--src/empathy-preferences.c2
-rw-r--r--tests/empathy-chatroom-manager-test.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index f6a723ef6..f02b7588b 100644
--- 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 8192049e7..4460d6f85 100644
--- 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 3d6b6f6b7..b79e898d0 100644
--- 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>