aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/empathy.schemas.in8
-rw-r--r--libempathy-gtk/empathy-conf.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index f85c616b0..29b74730a 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -479,15 +479,15 @@
</schema>
<schema>
- <key>/schemas/apps/empathy/use_nm</key>
- <applyto>/apps/empathy/use_nm</applyto>
+ <key>/schemas/apps/empathy/use_conn</key>
+ <applyto>/apps/empathy/use_conn</applyto>
<owner>empathy</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>NetworkManager should be used</short>
+ <short>Connection managers should be used</short>
<long>
- Whether or not the network manager should be used to automatically
+ Whether or not connectivity managers should be used to automatically
disconnect/reconnect.
</long>
</locale>
diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index 2383a7edf..d8e34f6b9 100644
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -78,7 +78,7 @@ struct _EmpathyConfClass {
#define EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM EMPATHY_PREFS_PATH "/contacts/sort_criterium"
#define EMPATHY_PREFS_HINTS_CLOSE_MAIN_WINDOW EMPATHY_PREFS_PATH "/hints/close_main_window"
#define EMPATHY_PREFS_SALUT_ACCOUNT_CREATED EMPATHY_PREFS_PATH "/accounts/salut_created"
-#define EMPATHY_PREFS_USE_NM EMPATHY_PREFS_PATH "/use_nm"
+#define EMPATHY_PREFS_USE_CONN EMPATHY_PREFS_PATH "/use_conn"
#define EMPATHY_PREFS_AUTOCONNECT EMPATHY_PREFS_PATH "/autoconnect"
#define EMPATHY_PREFS_IMPORT_ASKED EMPATHY_PREFS_PATH "/import_asked"
#define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER EMPATHY_PREFS_PATH "/file_transfer/default_folder"