diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-08-20 21:44:10 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-08-20 21:44:10 +0800 |
| commit | 900bb42ee52f895dd7c6ce252e7f6104968d1bf8 (patch) | |
| tree | 87089e299a4677baa6186bbb16e7367c09fbcdfb /libempathy-gtk/empathy-conf.h | |
| parent | f6b001dd6a0ef2dd1ae6bf071c3334d934c30628 (diff) | |
| parent | 3336ae452410f53254957b48b72460978f3b990a (diff) | |
| download | gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.gz gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.bz2 gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.lz gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.xz gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.zst gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.zip | |
Merge branch 'connman'
Diffstat (limited to 'libempathy-gtk/empathy-conf.h')
| -rw-r--r-- | libempathy-gtk/empathy-conf.h | 2 |
1 files changed, 1 insertions, 1 deletions
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" |