[Xfce4-commits] r24701 - in squeeze/trunk: . src

[Stephan Arts]

Author: stephan
Date: 2007-01-22 20:55:08 +0000 (Mon, 22 Jan 2007)
New Revision: 24701

Modified:
   squeeze/trunk/configure.in.in
   squeeze/trunk/src/main_window.c
Log:
fix version...

Modified: squeeze/trunk/configure.in.in
===================================================================
--- squeeze/trunk/configure.in.in	2007-01-22 20:44:40 UTC (rev 24700)
+++ squeeze/trunk/configure.in.in	2007-01-22 20:55:08 UTC (rev 24701)
@@ -14,9 +14,9 @@
 m4_define([squeeze_version_major], [0])
 m4_define([squeeze_version_minor], [0])
 m4_define([squeeze_version_micro], [1])
-m4_define([squeeze_version_nano], [svn]) # Leave empty for no nano version
+m4_define([squeeze_version_nano], []) # Leave empty for no nano version
 m4_define([squeeze_version_build], [r at REVISION@])
-m4_define([squeeze_version_tag], []) # Leave empty for releases
+m4_define([squeeze_version_tag], [svn]) # Leave empty for releases
 m4_define([squeeze_version], [ifelse(squeeze_version_branch(), [], [squeeze_version_major().squeeze_version_minor().squeeze_version_micro()ifelse(squeeze_version_nano(), [], [], [.squeeze_version_nano()])], [squeeze_version_branch()])ifelse(squeeze_version_tag(),[],[], [-ifelse(squeeze_version_tag(), [svn], [squeeze_version_tag()-squeeze_version_build()], [squeeze_version_tag()])])])
 
 dnl *******************************************

Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c	2007-01-22 20:44:40 UTC (rev 24700)
+++ squeeze/trunk/src/main_window.c	2007-01-22 20:55:08 UTC (rev 24701)
@@ -238,11 +238,6 @@
 		window->settings = NULL;
 	}
 
-	if(window->main_vbox && window->navigationbar)
-	{
-		gtk_container_remove(GTK_CONTAINER(window->main_vbox), GTK_WIDGET(window->navigationbar));
-		window->navigationbar = NULL;
-	}
 	if(window->app)
 	{
 		g_object_unref(G_OBJECT(window->app));