diff options
author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2008-10-17 20:47:31 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-10-17 20:47:31 +0800 |
commit | b42eb2502803cc0f01a901cad204e96184c1fa54 (patch) | |
tree | 10046625d3501e859a47b8869113d82886bc885f | |
parent | 9ee012a56ba76d0171bc6ae5d9cc86a8bfbf5f35 (diff) | |
download | gsoc2013-empathy-b42eb2502803cc0f01a901cad204e96184c1fa54.tar gsoc2013-empathy-b42eb2502803cc0f01a901cad204e96184c1fa54.tar.gz gsoc2013-empathy-b42eb2502803cc0f01a901cad204e96184c1fa54.tar.bz2 gsoc2013-empathy-b42eb2502803cc0f01a901cad204e96184c1fa54.tar.lz gsoc2013-empathy-b42eb2502803cc0f01a901cad204e96184c1fa54.tar.xz gsoc2013-empathy-b42eb2502803cc0f01a901cad204e96184c1fa54.tar.zst gsoc2013-empathy-b42eb2502803cc0f01a901cad204e96184c1fa54.zip |
Added GConf key EMPATHY_PREFS_IMPORT_ASKED. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1625
-rw-r--r-- | data/empathy.schemas.in | 14 | ||||
-rw-r--r-- | libempathy-gtk/empathy-conf.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in index 6a992705c..6e1b68aea 100644 --- a/data/empathy.schemas.in +++ b/data/empathy.schemas.in @@ -319,5 +319,19 @@ </locale> </schema> + <schema> + <key>/schemas/apps/empathy/import_asked</key> + <applyto>/apps/empathy/import_asked</applyto> + <owner>empathy</owner> + <type>bool</type> + <default>false</default> + <locale name="C"> + <short>Empathy has asked about importing accounts</short> + <long> + Whether or not Empathy has asked about importing accounts from other programs. + </long> + </locale> + </schema> + </schemalist> </gconfschemafile> diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h index 307e25db0..2da820bb7 100644 --- a/libempathy-gtk/empathy-conf.h +++ b/libempathy-gtk/empathy-conf.h @@ -66,6 +66,7 @@ struct _EmpathyConfClass { #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_AUTOCONNECT EMPATHY_PREFS_PATH "/autoconnect" +#define EMPATHY_PREFS_IMPORT_ASKED EMPATHY_PREFS_PATH "/import_asked" typedef void (*EmpathyConfNotifyFunc) (EmpathyConf *conf, const gchar *key, |