empathy r1625 - in trunk: data libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Oct 17 12:47:31 2008
New Revision: 1625
URL: http://svn.gnome.org/viewvc/empathy?rev=1625&view=rev

Log:
Added GConf key EMPATHY_PREFS_IMPORT_ASKED. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/data/empathy.schemas.in
   trunk/libempathy-gtk/empathy-conf.h

Modified: trunk/data/empathy.schemas.in
==============================================================================
--- trunk/data/empathy.schemas.in	(original)
+++ trunk/data/empathy.schemas.in	Fri Oct 17 12:47:31 2008
@@ -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>

Modified: trunk/libempathy-gtk/empathy-conf.h
==============================================================================
--- trunk/libempathy-gtk/empathy-conf.h	(original)
+++ trunk/libempathy-gtk/empathy-conf.h	Fri Oct 17 12:47:31 2008
@@ -66,6 +66,7 @@
 #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,