empathy r1620 - trunk/src

[xclaesse svn gnome org]

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

Log:
Check whether ~/.purple/accounts.xml is readable before trying to read it. (Jonny Lamb)

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

Modified:
   trunk/src/empathy-import-dialog.c

Modified: trunk/src/empathy-import-dialog.c
==============================================================================
--- trunk/src/empathy-import-dialog.c	(original)
+++ trunk/src/empathy-import-dialog.c	Fri Oct 17 12:47:15 2008
@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
@@ -284,8 +285,11 @@
   ctxt = xmlNewParserCtxt ();
   filename = g_build_filename (g_get_home_dir (), ".purple", "accounts.xml",
       NULL);
+
+  if (g_access (filename, R_OK) != 0)
+    goto FILENAME;
+
   doc = xmlCtxtReadFile (ctxt, filename, NULL, 0);
-  g_free (filename);
 
   rootnode = xmlDocGetRootElement (doc);
   if (rootnode == NULL)
@@ -408,6 +412,9 @@
   xmlFreeDoc(doc);
   xmlFreeParserCtxt (ctxt);
 
+FILENAME:
+  g_free (filename);
+
   return accounts;
 }