2005-07-14 Benedikt Meurer <benny@xfce.org>

	* autogen.sh, configure.in.in: Merge framework changes from Thunar.
	* configure.in.in: Bump version to 4.3.0svn.
	* libxfsm/xfsm-util.c(xfsm_window_add_border): Apply Patch from Ori
	  Bernstein to fix the border color of the shutdown dialog, as specified
	  in bug #747.




(Old svn revision: 16225)

4 files changed, 21 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 9157b7f4..bd819da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-14	Benedikt Meurer <benny@xfce.org>
+
+	* autogen.sh, configure.in.in: Merge framework changes from Thunar.
+	* configure.in.in: Bump version to 4.3.0svn.
+	* libxfsm/xfsm-util.c(xfsm_window_add_border): Apply Patch from Ori
+	  Bernstein to fix the border color of the shutdown dialog, as specified
+	  in bug #747.
+
 2005-05-06	Jean-Francois Wauthy <pollux@xfce.org>
 
 	* configure.ac, po/bn_IN.po: add bn_IN translations.
diff --git a/autogen.sh b/autogen.sh
index 1ae36e08..904eeb51 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 # $Id$
 #
 # Copyright (c) 2002-2005
-#         The Xfce development team. All rights reserved.
+#         The Thunar development team. All rights reserved.
 #
 # Written for Xfce by Benedikt Meurer <benny@xfce.org>.
 #
@@ -18,6 +18,11 @@ EOF
   exit 1
 }
 
+# substitute revision and date
+revision=`svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+sed -e "s/@REVISION@/${revision}/g" \
+  < "configure.in.in" > "configure.in"
+
 exec xdt-autogen $@
 
 # vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac b/configure.in.in
index 70c382d0..8223fec8 100644
--- a/configure.ac
+++ b/configure.in.in
@@ -8,10 +8,11 @@ dnl
 
 dnl Version information
 m4_define([xfsm_version_major], [4])
-m4_define([xfsm_version_minor], [2])
+m4_define([xfsm_version_minor], [3])
 m4_define([xfsm_version_micro], [0])
-m4_define([xfsm_version_tag], [cvs])
-m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()xfsm_version_tag()])
+m4_define([xfsm_version_build], [@REVISION@])
+m4_define([xfsm_version_tag], [svn])
+m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_build(), [], [], [xfsm_version_tag()[-r]xfsm_version_build()])])
 
 dnl Initialize autoconf
 AC_COPYRIGHT([Copyright (c) 2003-2005
diff --git a/libxfsm/xfsm-util.c b/libxfsm/xfsm-util.c
index d5bc3c5e..fd1fd473 100644
--- a/libxfsm/xfsm-util.c
+++ b/libxfsm/xfsm-util.c
@@ -203,10 +203,12 @@ void
 xfsm_window_add_border (GtkWindow *window)
 {
   GtkWidget *box1, *box2;
+  
+  gtk_widget_realize(GTK_WIDGET(window));
 
   box1 = gtk_event_box_new ();
   gtk_widget_modify_bg (box1, GTK_STATE_NORMAL, 
-                        &(box1->style->bg [GTK_STATE_SELECTED]));
+                        &(GTK_WIDGET(window)->style->bg [GTK_STATE_SELECTED]));
   gtk_widget_show (box1);
 
   box2 = gtk_event_box_new ();