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

[Giuseppe Torelli]

Author: colossus
Date: 2007-09-17 12:19:42 +0000 (Mon, 17 Sep 2007)
New Revision: 26086

Modified:
   xarchiver/trunk/src/new_dialog.c
   xarchiver/trunk/src/pref_dialog.c
Log:
Made Prefered archive option in the pref dialog to work in the new one.
Made the available archives the same in the new dialog and in the pref-dialog.


Modified: xarchiver/trunk/src/new_dialog.c
===================================================================
--- xarchiver/trunk/src/new_dialog.c	2007-09-17 09:05:23 UTC (rev 26085)
+++ xarchiver/trunk/src/new_dialog.c	2007-09-17 12:19:42 UTC (rev 26086)
@@ -26,6 +26,7 @@
 
 extern gboolean unrar;
 extern gboolean cli;
+extern Prefs_dialog_data *prefs_window;
 gchar *current_new_directory = NULL;
 gint new_combo_box = -1;
 gchar *ComboArchiveType;
@@ -88,18 +89,19 @@
 		}
 		Suffix = g_list_next ( Suffix );
 	}
-	hbox = gtk_hbox_new (FALSE, 12);
-	gtk_box_pack_start (GTK_BOX (hbox),gtk_label_new (_("Archive type:")),FALSE, FALSE, 0);
+	hbox = gtk_hbox_new (FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (hbox),gtk_label_new (_("Archive type:")),FALSE,FALSE,0);
 
 	combo_box = gtk_combo_box_new_text ();
 
 	filter_tooltip = gtk_tooltips_new();
 	gtk_tooltips_set_tip (filter_tooltip,combo_box, _("Choose the archive type to create") , NULL);
 	Name = g_list_first (ArchiveType);
+
 	while (Name)
 	{
 		if (!strcmp(Name->data, "tgz") || !strcmp(Name->data, "rpm") || (!strcmp(Name->data, "gz") && flag)
-		|| !strcmp(Name->data, "lzma") || !strcmp(Name->data, "deb") || (!strcmp(Name->data, "bz2") && flag)
+		|| (!strcmp(Name->data, "lzma") && flag) || !strcmp(Name->data, "deb") || (!strcmp(Name->data, "bz2") && flag)
 		|| (!strcmp(Name->data, "rar") && unrar) )
 			goto there;
 		else
@@ -109,7 +111,7 @@
 		Name = g_list_next ( Name );
 	}
 	if (new_combo_box == -1)
-		gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box) , 0 );
+		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box),gtk_combo_box_get_active(GTK_COMBO_BOX(prefs_window->combo_prefered_format)));
 	else
 		gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box) , new_combo_box );
 

Modified: xarchiver/trunk/src/pref_dialog.c
===================================================================
--- xarchiver/trunk/src/pref_dialog.c	2007-09-17 09:05:23 UTC (rev 26085)
+++ xarchiver/trunk/src/pref_dialog.c	2007-09-17 12:19:42 UTC (rev 26086)
@@ -108,7 +108,7 @@
 	archive_type = g_list_first ( ArchiveType );
 	while ( archive_type != NULL )
 	{
-		if (archive_type->data == "tgz" || archive_type->data == "rpm" || archive_type->data == "gz" || archive_type->data == "bz2" || (archive_type->data == "rar" && unrar) )
+		if (archive_type->data == "tgz" || archive_type->data == "rpm" || (archive_type->data == "rar" && unrar) )
 			goto next;
 		else
 			gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data );