[Xfce4-commits] r29455 - xarchiver/trunk/src

[Giuseppe Torelli]

Author: colossus
Date: 2009-02-05 13:21:12 +0000 (Thu, 05 Feb 2009)
New Revision: 29455

Modified:
   xarchiver/trunk/src/pref_dialog.c
   xarchiver/trunk/src/rar.c
Log:
Fixed bug #4901.
Used g_file_set_contents() instead of unix function fwrite().


Modified: xarchiver/trunk/src/pref_dialog.c
===================================================================
--- xarchiver/trunk/src/pref_dialog.c	2009-02-05 13:06:46 UTC (rev 29454)
+++ xarchiver/trunk/src/pref_dialog.c	2009-02-05 13:21:12 UTC (rev 29455)
@@ -315,8 +315,7 @@
 {
 	gchar *conf;
 	gchar *value= NULL;
-	FILE *fp;
-	gint bytes_written, len;
+	gsize len;
 	GKeyFile *xa_key_file = g_key_file_new();
 	
 	g_key_file_set_integer (xa_key_file,PACKAGE,"preferred_format",gtk_combo_box_get_active (GTK_COMBO_BOX(prefs_data->combo_prefered_format)));
@@ -384,15 +383,9 @@
 	g_key_file_set_boolean (xa_key_file,PACKAGE,"recurse",   	gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (add_window->recurse)));
 	g_key_file_set_boolean (xa_key_file,PACKAGE,"solid_archive",gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (add_window->solid_archive)));
 	g_key_file_set_boolean (xa_key_file,PACKAGE,"remove_files", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (add_window->remove_files)));
-	conf = g_key_file_to_data (xa_key_file, NULL, NULL);
-	len = strlen(conf);
 
-	fp = fopen(filename, "w");
-	if (fp != NULL)
-	{
-		bytes_written = fwrite(conf, sizeof (gchar), len, fp);
-		fclose(fp);
-	}
+	conf = g_key_file_to_data(xa_key_file, &len, NULL);
+	g_file_set_contents(filename, conf, len, NULL);
 	g_free (conf);
 	g_key_file_free(xa_key_file);
 }

Modified: xarchiver/trunk/src/rar.c
===================================================================
--- xarchiver/trunk/src/rar.c	2009-02-05 13:06:46 UTC (rev 29454)
+++ xarchiver/trunk/src/rar.c	2009-02-05 13:21:12 UTC (rev 29455)
@@ -94,11 +94,9 @@
 			}
 			jump_comment = FALSE;
 		}
-		if (line[0] == '-')
-		{
+		if (strncmp(line, "-------------------------------------------------------------------------------",78) == 0)
 			jump_header = TRUE;
-			return;
-		}
+
 		return;
 	}