[Xfce4-commits] r27293 - in libxfce4menu/trunk: . libxfce4menu

[Jannis Pohlmann]

Author: jannis
Date: 2008-07-15 10:53:42 +0000 (Tue, 15 Jul 2008)
New Revision: 27293

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/autogen.sh
   libxfce4menu/trunk/libxfce4menu/xfce-menu.c
Log:
	* autogen.sh: Change @REVISION@ substitution for git svn
	  repositories again.

Modified: libxfce4menu/trunk/ChangeLog
===================================================================
--- libxfce4menu/trunk/ChangeLog	2008-07-15 10:25:25 UTC (rev 27292)
+++ libxfce4menu/trunk/ChangeLog	2008-07-15 10:53:42 UTC (rev 27293)
@@ -1,3 +1,8 @@
+2008-07-15	Jannis Pohlmann <jannis at xfce.org>
+
+	* autogen.sh: Change @REVISION@ substitution for git svn
+	  repositories again.
+
 2008-07-10	Jannis Pohlmann <jannis at xfce.org>
 
 	* autogen.sh: Fix @REVISION@ substitution when using git svn.

Modified: libxfce4menu/trunk/autogen.sh
===================================================================
--- libxfce4menu/trunk/autogen.sh	2008-07-15 10:25:25 UTC (rev 27292)
+++ libxfce4menu/trunk/autogen.sh	2008-07-15 10:53:42 UTC (rev 27293)
@@ -32,7 +32,10 @@
 # Substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if test -d .git/svn; then
- revision=`LC_ALL=C git svn find-rev HEAD`
+ revision=$(git svn find-rev trunk ||
+            git svn find-rev origin/trunk ||
+            git svn find-rev HEAD ||
+            git svn find-rev master)
 else
  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",
 $2}'`

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu.c
===================================================================
--- libxfce4menu/trunk/libxfce4menu/xfce-menu.c	2008-07-15 10:25:25 UTC (rev 27292)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu.c	2008-07-15 10:53:42 UTC (rev 27293)
@@ -2031,7 +2031,7 @@
 GSList*
 xfce_menu_get_menus (XfceMenu *menu)
 {
-  GSList *menus;
+  GSList *menus = NULL;
 
   g_return_val_if_fail (XFCE_IS_MENU (menu), NULL);