[Xfce4-commits] r24478 - squeeze/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-01-15 14:08:26 +0000 (Mon, 15 Jan 2007)
New Revision: 24478

Modified:
   squeeze/trunk/src/main.c
   squeeze/trunk/src/notebook.c
Log:
fixed close of squeeze when new is cancelled

Modified: squeeze/trunk/src/main.c
===================================================================
--- squeeze/trunk/src/main.c	2007-01-15 12:25:19 UTC (rev 24477)
+++ squeeze/trunk/src/main.c	2007-01-15 14:08:26 UTC (rev 24478)
@@ -159,7 +159,8 @@
 		if(new_archive)
 			files = g_slist_prepend(files, new_archive);
 
-		sq_application_new_archive(sq_app, add_archive_path, files);
+		if(sq_application_new_archive(sq_app, add_archive_path, files))
+			return 1;
 	}
 
 	if(!new_archive && !add_archive_path && !extract_archive && !extract_archive_path)

Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c	2007-01-15 12:25:19 UTC (rev 24477)
+++ squeeze/trunk/src/notebook.c	2007-01-15 14:08:26 UTC (rev 24478)
@@ -482,8 +482,8 @@
 	gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
 
 	GtkTreeModel *tree_model = sq_archive_store_new(archive, notebook->props._show_icons, notebook->props._up_dir, notebook->icon_theme);
-	sq_archive_store_set_sort_folders_first(SQ_ARCHIVE_STORE(tree_model), notebook->props._sort_folders_first);
-	sq_archive_store_set_sort_case_sensitive(SQ_ARCHIVE_STORE(tree_model), notebook->props._sort_case_sensitive);
+	//sq_archive_store_set_sort_folders_first(SQ_ARCHIVE_STORE(tree_model), notebook->props._sort_folders_first);
+	//sq_archive_store_set_sort_case_sensitive(SQ_ARCHIVE_STORE(tree_model), notebook->props._sort_case_sensitive);
 	g_signal_connect(G_OBJECT(tree_model), "notify", G_CALLBACK(cb_sq_notebook_notify_proxy), notebook);
 
 	gtk_box_pack_start(GTK_BOX(lbl_hbox), archive_image, FALSE, FALSE, 3);