empathy r627 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Feb 12 10:34:49 2008
New Revision: 627
URL: http://svn.gnome.org/viewvc/empathy?rev=627&view=rev

Log:
Try to create salut account if getting the gconf key fails. If the user starts empathy just after installation it will fail because gconf didn't refresh schemas yet.


Modified:
   trunk/src/empathy.c

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Tue Feb 12 10:34:49 2008
@@ -94,7 +94,7 @@
 {
 	McProfile  *profile;
 	McProtocol *protocol;
-	gboolean    salut_created;
+	gboolean    salut_created = FALSE;
 	McAccount  *account;
 	GList      *accounts;
 	EBook      *book;
@@ -106,11 +106,9 @@
 	gchar      *jid = NULL;
 
 	/* Check if we already created a salut account */
-	if (!empathy_conf_get_bool (empathy_conf_get(),
-				    EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
-				    &salut_created)) {
-		return;
-	}
+	empathy_conf_get_bool (empathy_conf_get(),
+			       EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
+			       &salut_created);
 	if (salut_created) {
 		return;
 	}