[Xfce4-commits] r23209 - xarchiver/branches/xarchiver-psybsd/src

[Stephan Arts]

Author: stephan
Date: 2006-09-25 20:13:37 +0000 (Mon, 25 Sep 2006)
New Revision: 23209

Modified:
   xarchiver/branches/xarchiver-psybsd/src/main_window.c
Log:
Can navigate into empty folders too now.


Modified: xarchiver/branches/xarchiver-psybsd/src/main_window.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main_window.c	2006-09-25 20:05:48 UTC (rev 23208)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.c	2006-09-25 20:13:37 UTC (rev 23209)
@@ -833,25 +833,28 @@
 	if(!strcmp(item_filename, "..")) /* pop */
 	{
 		main_window->working_node = g_slist_delete_link(main_window->working_node, main_window->working_node);
+		items = ((LXAEntry *)main_window->working_node->data)->children;
+		xa_main_window_set_contents(main_window, main_window->lp_xa_archive, items);
 	}
 	else
 	{
-		LXAEntry *entry = lxa_entry_get_child(((LXAEntry *)main_window->working_node->data), item_filename);
-		if(entry->is_folder)
+		if(item_filename)
 		{
-			main_window->working_node = g_slist_prepend(main_window->working_node, entry);
+			LXAEntry *entry = lxa_entry_get_child(((LXAEntry *)main_window->working_node->data), item_filename);
+			if(entry->is_folder)
+			{
+				main_window->working_node = g_slist_prepend(main_window->working_node, entry);
+				items = ((LXAEntry *)main_window->working_node->data)->children;
+				xa_main_window_set_contents(main_window, main_window->lp_xa_archive, items);
+			}
+			else
+			{ 
+				GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "Viewing of file is not yet implemented");
+				gtk_dialog_run(GTK_DIALOG(dialog));
+				gtk_widget_destroy(dialog);
+			}
 		}
-		else
-		{ 
-			GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "Viewing of file is not yet implemented");
-			gtk_dialog_run(GTK_DIALOG(dialog));
-			gtk_widget_destroy(dialog);
-		
-		}
 	}
-	items = ((LXAEntry *)main_window->working_node->data)->children;
-	if(items)
-		xa_main_window_set_contents(main_window, main_window->lp_xa_archive, items);
 
 	g_value_reset(value);
 	g_free(value);