[maemo-commits] [maemo-commits] r14125 - in projects/haf/trunk/hildon-plugins-settings: . src

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-09-26 17:41:12 +0300 (Wed, 26 Sep 2007)
New Revision: 14125

Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-config-parser.c
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
Log:
2007-09-26  Moises Martinez  <moises.martinez at nokia.com>

        * src/hildon-plugin-config-parser.c:
        (hildon_plugin_config_parser_save):
        * src/hildon-plugin-settings-dialog.c:
        (hildon_plugin_settings_dialog_row_inserted_cb),
        (hildon_plugin_settings_dialog_constructor),
        (hildon_plugin_settings_dialog_response):
        - Fixed some pausible cases for crashings. Fixes: NB#64547
        * src/hildon-plugin-settings.c: (_sb_update_status):
        - Added a break when updating the status for statusbar plugins.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-plugins-settings/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-09-26 14:38:01 UTC (rev 14124)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-09-26 14:41:12 UTC (rev 14125)
@@ -1,3 +1,15 @@
+2007-09-26  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hildon-plugin-config-parser.c:
+	(hildon_plugin_config_parser_save):
+	* src/hildon-plugin-settings-dialog.c:
+	(hildon_plugin_settings_dialog_row_inserted_cb),
+	(hildon_plugin_settings_dialog_constructor),
+	(hildon_plugin_settings_dialog_response):
+	- Fixed some pausible cases for crashings. Fixes: NB#64547
+	* src/hildon-plugin-settings.c: (_sb_update_status):
+	- Added a break when updating the status for statusbar plugins.
+
 2007-09-19  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hildon-plugin-cell-renderer-button.c,
@@ -24,7 +36,7 @@
 	- g_strdup error messages.
 	* src/hildon-plugin-settings-dialog.c:
 	(hildon_plugin_settings_dialog_response):
-	- Don't the file we couldn't save.
+	- Don't show the file we couldn't save.
 	Fixes: NB#64547
 
 2007-08-31  Johan Bilien  <johan.bilien at nokia.com>

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-config-parser.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-config-parser.c	2007-09-26 14:38:01 UTC (rev 14124)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-config-parser.c	2007-09-26 14:41:12 UTC (rev 14125)
@@ -768,11 +768,16 @@
     g_set_error (error,
                  hildon_plugin_config_parser_error_quark (),
                  HILDON_PLUGIN_CONFIG_PARSER_ERROR_NOKEYS,
-                 g_strdup (external_error->message));
+                 "No keyfile");
 
     g_key_file_free (keyfile);
-    g_error_free (external_error); 
 
+    if (external_error)
+    {	    
+      g_error_free (external_error); 
+      external_error = NULL;
+    }
+
     return FALSE; 
   }	  
 
@@ -786,7 +791,7 @@
     g_set_error (error,
                  hildon_plugin_config_parser_error_quark (),
                  HILDON_PLUGIN_CONFIG_PARSER_ERROR_NOPATHTOSAVE,
-                 g_strdup (external_error->message));
+                 "I couldn't save the file");
 
     g_key_file_free (keyfile);
     g_error_free (external_error);

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-09-26 14:38:01 UTC (rev 14124)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-09-26 14:41:12 UTC (rev 14125)
@@ -260,8 +260,9 @@
   GtkTreeSelection *selection;
 
   selection = gtk_tree_view_get_selection (tw);
-	
+  
   gtk_tree_selection_select_path (selection, path);
+  
   gtk_tree_view_set_cursor (tw, path, NULL, FALSE);
 }
 
@@ -507,7 +508,7 @@
 
       if (error_comparing)
       {
-        g_warning ("I couldn't compare files: %s %s", path_to_save, error_comparing->message);	      
+        g_debug ("I couldn't compare files: %s %s", path_to_save, error_comparing->message);	      
 	g_error_free (error_comparing);
       }
     }
@@ -673,7 +674,7 @@
 
       if (error)
       {
-        g_warning ("Error saving... the file");
+        g_debug ("Error saving");
         g_error_free (error);
       }
     }

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-09-26 14:38:01 UTC (rev 14124)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-09-26 14:41:12 UTC (rev 14125)
@@ -172,7 +172,6 @@
 			HP_COL_FLAG, &old_status,
 			HP_COL_CATEGORY, &iter_category,
 			-1);
-
     if (!iter_name && !iter_category)
       continue;	    
 
@@ -182,6 +181,7 @@
         gtk_list_store_set (GTK_LIST_STORE (tm), &iter,
 	  		    HP_COL_FLAG, status,
 		 	    -1);		   
+      break;
     }		        
 
     g_free (iter_name);