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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-10-03 18:00:59 +0300 (Wed, 03 Oct 2007)
New Revision: 14303

Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/debian/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
Log:
2007-10-03  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_response):
        - Fixed crashes when full memory. Fixes: N#64547
	* debian/changelog updated
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-plugins-settings/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-10-03 14:53:29 UTC (rev 14302)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-10-03 15:00:59 UTC (rev 14303)
@@ -1,3 +1,11 @@
+2007-10-03  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_response):
+	- Fixed crashes when full memory. Fixes: N#64547
+
 2007-09-26  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hildon-plugin-config-parser.c:

Modified: projects/haf/trunk/hildon-plugins-settings/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/changelog	2007-10-03 14:53:29 UTC (rev 14302)
+++ projects/haf/trunk/hildon-plugins-settings/debian/changelog	2007-10-03 15:00:59 UTC (rev 14303)
@@ -1,3 +1,13 @@
+hildon-plugins-settings (0.0.9-2) feisty; urgency=low
+
+  * src/hildon-plugin-config-parser.c:
+  (hildon_plugin_config_parser_save):
+  * src/hildon-plugin-settings-dialog.c:
+  (hildon_plugin_settings_dialog_response):
+  - Fixed crashes when full memory. Fixes: N#64547 
+
+ -- Moises Martinez <moises.martinez at nokia.com>  Wed,  3 Oct 2007 17:58:02 +0300
+
 hildon-plugins-settings (0.0.9-1) sardine; urgency=low
 
   * src/hildon-plugin-config-parser.c:

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-10-03 14:53:29 UTC (rev 14302)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-config-parser.c	2007-10-03 15:00:59 UTC (rev 14303)
@@ -713,7 +713,7 @@
   GtkTreeIter iter;
   gsize length;
   GError *external_error = NULL;
-
+  
   if (!parser->priv->keys)
   {
     g_set_error (error,
@@ -780,6 +780,8 @@
 
     return FALSE; 
   }	  
+  
+  external_error = NULL;
 
   g_file_set_contents (parser->priv->path_to_save,
 		       keyfile_data,

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-10-03 14:53:29 UTC (rev 14302)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-10-03 15:00:59 UTC (rev 14303)
@@ -662,20 +662,20 @@
   GList *l;	
   HildonPluginSettingsDialog *settings =
     HILDON_PLUGIN_SETTINGS_DIALOG (dialog);
-	
-  GError *error = NULL;
-	
+		
   if (response_id == GTK_RESPONSE_OK)
   {
-   
     for (l = settings->priv->tabs; l != NULL; l = g_list_next (l))
-    {	    
+    {
+      GError *error = NULL;
+	    
       hildon_plugin_config_parser_save (((HPSDTab *)l->data)->parser, &error);
 
       if (error)
       {
         g_debug ("Error saving");
         g_error_free (error);
+	error = NULL;
       }
     }
   }