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

[Giuseppe Torelli]

Author: colossus
Date: 2006-12-01 13:14:52 +0000 (Fri, 01 Dec 2006)
New Revision: 24023

Modified:
   xarchiver/trunk/src/extract_dialog.c
   xarchiver/trunk/src/interface.c
Log:
Fixed bug #2614.
Made tabs reorderable if using gtk 2.10.
Updated Changelog.


Modified: xarchiver/trunk/src/extract_dialog.c
===================================================================
--- xarchiver/trunk/src/extract_dialog.c	2006-12-01 09:49:03 UTC (rev 24022)
+++ xarchiver/trunk/src/extract_dialog.c	2006-12-01 13:14:52 UTC (rev 24023)
@@ -162,6 +162,8 @@
 	gtk_box_pack_start (GTK_BOX (dialog_data->vbox4), dialog_data->overwrite_check, FALSE, FALSE, 0);
 
 	dialog_data->extract_full = gtk_check_button_new_with_mnemonic (_("Extract files with full path"));
+	if (archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_BZIP2 )
+		goto here;
 	if (cli && (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_DEB || archive->type == XARCHIVETYPE_TAR_BZ2) )
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog_data->extract_full), TRUE);
@@ -180,7 +182,7 @@
 		gtk_widget_show (dialog_data->touch);
 		gtk_tooltips_set_tip (dialog_data->option_tooltip,dialog_data->touch, _("When this option is used, tar leaves the data modification times of the files it extracts as the times when the files were extracted, instead of setting it to the times recorded in the archive."), NULL );
 		gtk_box_pack_start (GTK_BOX (dialog_data->vbox4), dialog_data->touch, FALSE, FALSE, 0);
-
+here:
 		dialog_data->hbox6 = gtk_hbox_new (FALSE, 2);
 		gtk_widget_show (dialog_data->hbox6);
 		gtk_box_pack_start (GTK_BOX (dialog_data->vbox4), dialog_data->hbox6, FALSE, FALSE, 0);

Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c	2006-12-01 09:49:03 UTC (rev 24022)
+++ xarchiver/trunk/src/interface.c	2006-12-01 13:14:52 UTC (rev 24023)
@@ -552,7 +552,10 @@
 	gtk_misc_set_alignment(GTK_MISC(tab_label), 0.0, 0);
 	gtk_notebook_append_page_menu (notebook, archive->scrollwindow, page_hbox, tab_label);
 	gtk_notebook_set_current_page(notebook, -1);
-
+	#if GTK_CHECK_VERSION(2, 10, 0)
+		if (gtk_check_version(2, 10, 0) == NULL)
+			gtk_notebook_set_tab_reorderable(notebook, archive->scrollwindow, TRUE);
+	#endif
 	archive->treeview = gtk_tree_view_new ();
 	gtk_container_add (GTK_CONTAINER (archive->scrollwindow), archive->treeview);
 	gtk_widget_show (archive->treeview);