[Goodies-commits] r2198 - xfce4-mailwatch-plugin/trunk/panel-plugin

Brian Tarricone kelnos at xfce.org
Tue Dec 5 17:03:33 CET 2006


Author: kelnos
Date: 2006-12-05 16:03:33 +0000 (Tue, 05 Dec 2006)
New Revision: 2198

Modified:
   xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c
Log:
add some messaging if the config file can't be found/opened on save, set
the mailwatch core's config file name unconditionally on write.  maybe this
fixes moe's problem


Modified: xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c	2006-12-05 11:25:10 UTC (rev 2197)
+++ xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c	2006-12-05 16:03:33 UTC (rev 2198)
@@ -373,6 +373,7 @@
     DBG("entering");
     
     if(!(file = xfce_panel_plugin_lookup_rc_file(plugin))) {
+        DBG("Mailwatch: no config found; setting defaults");
         mailwatch_set_default_config(mwp);
         return;
     }
@@ -380,6 +381,7 @@
     rc = xfce_rc_simple_open(file, TRUE);
 
     if(!rc) {
+        DBG("Mailwatch: no config found in \"%s\"; setting defaults", file);
         g_free(file);
         mailwatch_set_default_config(mwp);
         return;
@@ -427,22 +429,24 @@
 static void
 mailwatch_write_config(XfcePanelPlugin *plugin, XfceMailwatchPlugin *mwp)
 {
-    const gchar *cfgfile = xfce_mailwatch_get_config_file(mwp->mailwatch);
     gchar *file;
     XfceRc *rc;
-
-    if(!(file = xfce_panel_plugin_save_location(plugin, TRUE)))
+    
+    TRACE("entering");
+    
+    if(!(file = xfce_panel_plugin_save_location(plugin, TRUE))) {
+        g_critical("Mailwatch: Unable to find save location for configuration file");
         return;
+    }
     
     rc = xfce_rc_simple_open(file, FALSE);
 
     if(!rc) {
+        g_critical("Mailwatch: Unable to open \"%s\" for writing", file);
         g_free(file);
         return;
     }
     
-    DBG("entering(%p): %s",plugin, cfgfile?cfgfile:"[nil]");
-    
     xfce_rc_set_group(rc, "mailwatch-plugin");
     
     xfce_rc_write_entry(rc, "click_command", 
@@ -458,8 +462,7 @@
     
     xfce_rc_close(rc);
     
-    if(!cfgfile)
-        xfce_mailwatch_set_config_file(mwp->mailwatch, file);
+    xfce_mailwatch_set_config_file(mwp->mailwatch, file);
     xfce_mailwatch_save_config(mwp->mailwatch);
     
     g_free(file);




More information about the Goodies-commits mailing list