diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2010-03-15 16:09:56 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2010-03-15 16:09:56 +0800 |
| commit | df53944e1ba92732760d1cfe437b8b56edda526b (patch) | |
| tree | e8613fe0deab9edc5773c339dd3e34c95145b0ac /libempathy-gtk | |
| parent | ba8f9b6182a9f85c7d081e571fae128dc6261d1d (diff) | |
| parent | c448b89bb4f18377818b7802f4cb66ba47e3fe04 (diff) | |
| download | gsoc2013-empathy-df53944e1ba92732760d1cfe437b8b56edda526b.tar gsoc2013-empathy-df53944e1ba92732760d1cfe437b8b56edda526b.tar.gz gsoc2013-empathy-df53944e1ba92732760d1cfe437b8b56edda526b.tar.bz2 gsoc2013-empathy-df53944e1ba92732760d1cfe437b8b56edda526b.tar.lz gsoc2013-empathy-df53944e1ba92732760d1cfe437b8b56edda526b.tar.xz gsoc2013-empathy-df53944e1ba92732760d1cfe437b8b56edda526b.tar.zst gsoc2013-empathy-df53944e1ba92732760d1cfe437b8b56edda526b.zip | |
Merge branch 'butterfly-networkid'
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-conf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h index 2a74c1da5..21e3b3810 100644 --- a/libempathy-gtk/empathy-conf.h +++ b/libempathy-gtk/empathy-conf.h @@ -82,6 +82,7 @@ struct _EmpathyConfClass { #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_BUTTERFLY_LOGS_MIGRATED EMPATHY_PREFS_PATH "/butterfly_logs_migrated" #define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER EMPATHY_PREFS_PATH "/file_transfer/default_folder" #define EMPATHY_PREFS_LOCATION_PUBLISH EMPATHY_PREFS_PATH "/location/publish" #define EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK EMPATHY_PREFS_PATH "/location/resource_network" |