[Xfce4-commits] r24781 - in squeeze/trunk: docs/reference/libsqueeze/tmpl libsqueeze src

[Stephan Arts]

Author: stephan
Date: 2007-01-28 21:40:18 +0000 (Sun, 28 Jan 2007)
New Revision: 24781

Modified:
   squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml
   squeeze/trunk/libsqueeze/archive.h
   squeeze/trunk/src/main_window.c
Log:
fix placing of nav-bar when toolbar is disabled

Modified: squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml	2007-01-28 20:59:28 UTC (rev 24780)
+++ squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml	2007-01-28 21:40:18 UTC (rev 24781)
@@ -59,6 +59,7 @@
 @entry_property_types: 
 @entry_property_names: 
 @root_entry: 
+ at status: 
 @old_status: 
 @status_msg: 
 @progress: 

Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h	2007-01-28 20:59:28 UTC (rev 24780)
+++ squeeze/trunk/libsqueeze/archive.h	2007-01-28 21:40:18 UTC (rev 24781)
@@ -77,9 +77,6 @@
 	GType              *entry_property_types;
 	gchar             **entry_property_names;
 	LSQEntry           *root_entry;
-#ifdef G_THREADS_ENABLED
-	GStaticRWLock       rw_lock;
-#endif
 	LSQArchiveStatus    status;
 	LSQArchiveStatus    old_status;
 	gchar              *status_msg;

Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c	2007-01-28 20:59:28 UTC (rev 24780)
+++ squeeze/trunk/src/main_window.c	2007-01-28 21:40:18 UTC (rev 24781)
@@ -80,7 +80,9 @@
 static void
 sq_main_window_dispose(GObject *object);
 
+static gboolean show_toolbar = TRUE;
 
+
 static void cb_sq_main_new_archive(GtkWidget *widget, gpointer userdata);
 static void cb_sq_main_open_archive(GtkWidget *widget, gpointer userdata);
 static void cb_sq_main_extract_archive(GtkWidget *widget, gpointer userdata);
@@ -261,7 +263,6 @@
 	gboolean sort_folders = TRUE;
 	gboolean use_tabs = TRUE;
 	gboolean show_menubar = TRUE;
-	gboolean show_toolbar = TRUE;
 
 	window->accel_group = gtk_accel_group_new();
 	gtk_window_add_accel_group(GTK_WINDOW(window), window->accel_group);
@@ -1202,7 +1203,10 @@
 	if(nav_bar)
 	{
 		gtk_box_pack_start(GTK_BOX(window->main_vbox), (GtkWidget *)nav_bar, FALSE, FALSE, 0);
-		gtk_box_reorder_child(GTK_BOX(window->main_vbox), (GtkWidget *)nav_bar, 2);
+		if(show_toolbar)
+			gtk_box_reorder_child(GTK_BOX(window->main_vbox), (GtkWidget *)nav_bar, 2);
+		else
+			gtk_box_reorder_child(GTK_BOX(window->main_vbox), (GtkWidget *)nav_bar, 1);
 		gtk_widget_show_all((GtkWidget *)nav_bar);
 	}	
 }