[Xfce4-commits] r24434 - in squeeze/trunk: libsqueeze src

[Stephan Arts]

Author: stephan
Date: 2007-01-14 00:03:56 +0000 (Sun, 14 Jan 2007)
New Revision: 24434

Modified:
   squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
   squeeze/trunk/src/application.c
   squeeze/trunk/src/main.c
   squeeze/trunk/src/new_dialog.c
Log:
Fixed bug #2747



Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-01-13 23:09:00 UTC (rev 24433)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-01-14 00:03:56 UTC (rev 24434)
@@ -123,10 +123,12 @@
 		g_free(program_path);
 	}
 	/* Check for existence of bzip2 -- required for x-bzip-compressed-tar */
+	/*                                          and x-bzip2-compressed-tar */
 	program_path = g_find_program_in_path("bzip2");
 	if(program_path)
 	{
 		lsq_archive_support_add_mime(archive_support, "application/x-bzip-compressed-tar");
+		lsq_archive_support_add_mime(archive_support, "application/x-bzip2-compressed-tar");
 		g_free(program_path);
 	}
 	/* Check for existence of lzop -- required for x-tzo */

Modified: squeeze/trunk/src/application.c
===================================================================
--- squeeze/trunk/src/application.c	2007-01-13 23:09:00 UTC (rev 24433)
+++ squeeze/trunk/src/application.c	2007-01-14 00:03:56 UTC (rev 24434)
@@ -209,6 +209,9 @@
 	if(!archive_path)
 	{
 		dialog = sq_new_archive_dialog_new();
+		gchar **filename_components = g_strsplit(files->data, ".", 2);
+		gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), filename_components[0]);
+		g_strfreev(filename_components);
 		result = gtk_dialog_run (GTK_DIALOG (dialog) );
 		if(result == GTK_RESPONSE_CANCEL || result == GTK_RESPONSE_DELETE_EVENT)
 		{

Modified: squeeze/trunk/src/main.c
===================================================================
--- squeeze/trunk/src/main.c	2007-01-13 23:09:00 UTC (rev 24433)
+++ squeeze/trunk/src/main.c	2007-01-14 00:03:56 UTC (rev 24434)
@@ -38,7 +38,7 @@
 gboolean extract_archive  = FALSE;
 gchar *extract_archive_path = NULL;
 
-gboolean new_archive  = FALSE;
+gchar *new_archive  = NULL;
 gchar *add_archive_path = NULL;
 
 gpointer command;
@@ -59,7 +59,7 @@
 		NULL,
 		N_("[archive path] [file1] [file2] ... [fileN]")
 	},
-	{	"new", 'n', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &new_archive,
+	{	"new", 'n', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &new_archive,
 		NULL,
 		N_("[file1] [file2] ... [fileN]")
 	},
@@ -150,10 +150,15 @@
 	if(new_archive || add_archive_path)
 	{
 		GSList *files = NULL;
+
 		for(i = 1; i < argc; i++)
 		{
 			files = g_slist_prepend(files, argv[i]);
 		}
+
+		if(new_archive)
+			files = g_slist_prepend(files, new_archive);
+
 		sq_application_new_archive(sq_app, add_archive_path, files);
 	}
 

Modified: squeeze/trunk/src/new_dialog.c
===================================================================
--- squeeze/trunk/src/new_dialog.c	2007-01-13 23:09:00 UTC (rev 24433)
+++ squeeze/trunk/src/new_dialog.c	2007-01-14 00:03:56 UTC (rev 24434)
@@ -97,7 +97,12 @@
 		if(!strcmp(_supported_mime_types->data, "application/x-bzip-compressed-tar"))
 		{
 			gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->archive_types_combo), ".tbz");
+			gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->archive_types_combo), ".tar.bz");
+		}
+		if(!strcmp(_supported_mime_types->data, "application/x-bzip2-compressed-tar"))
+		{
 			gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->archive_types_combo), ".tbz2");
+			gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->archive_types_combo), ".tar.bz2");
 		}
 		if(!strcmp(_supported_mime_types->data, "application/x-tzo"))
 		{
@@ -110,12 +115,12 @@
 		gtk_file_filter_add_mime_type(file_filter, _supported_mime_types->data);
 		_supported_mime_types = g_slist_next(_supported_mime_types);
 	}
-	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->archive_types_combo), 0);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->archive_types_combo), 1);
 
 	g_slist_free(supported_mime_types);
 
 /* WHY DOESN'T THIS WORK?!*/
-/*	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(GTK_FILE_CHOOSER_DIALOG(dialog)), file_filter); */
+	//gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(GTK_FILE_CHOOSER_DIALOG(dialog)), file_filter);
 
 	gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, TRUE, 0);
 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),