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

[Jannis Pohlmann]

Author: jannis
Date: 2008-07-06 21:44:05 +0000 (Sun, 06 Jul 2008)
New Revision: 27223

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/INSTALL
   libxfce4menu/trunk/libxfce4menu/xfce-menu.c
Log:
	* libxfce4menu/xfce-menu.c: Add #if 0 around
	  xfce_menu_resolve_legacy_menus() and
	  xfce_menu_resolve_legacy_menu(). Avoids build errors on some
	  systems.

Modified: libxfce4menu/trunk/ChangeLog
===================================================================
--- libxfce4menu/trunk/ChangeLog	2008-07-06 21:42:31 UTC (rev 27222)
+++ libxfce4menu/trunk/ChangeLog	2008-07-06 21:44:05 UTC (rev 27223)
@@ -1,3 +1,10 @@
+2008-07-06	Jannis Pohlmann <jannis at xfce.org>
+
+	* libxfce4menu/xfce-menu.c: Add #if 0 around 
+	  xfce_menu_resolve_legacy_menus() and 
+	  xfce_menu_resolve_legacy_menu(). Avoids build errors on some
+	  systems.
+
 2008-02-06	Jannis Pohlmann <jannis at xfce.org>
 
 	* STATUS: Status file updated, mainly to reflect the progress made

Modified: libxfce4menu/trunk/INSTALL
===================================================================
--- libxfce4menu/trunk/INSTALL	2008-07-06 21:42:31 UTC (rev 27222)
+++ libxfce4menu/trunk/INSTALL	2008-07-06 21:44:05 UTC (rev 27223)
@@ -2,7 +2,7 @@
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu.c
===================================================================
--- libxfce4menu/trunk/libxfce4menu/xfce-menu.c	2008-07-06 21:42:31 UTC (rev 27222)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu.c	2008-07-06 21:44:05 UTC (rev 27223)
@@ -279,9 +279,11 @@
 static void               xfce_menu_add_kde_legacy_dirs                    (XfceMenu              *menu);
 static void               xfce_menu_add_default_app_dirs                   (XfceMenu              *menu);
 
+#if 0
 static void               xfce_menu_resolve_legacy_menus                   (XfceMenu              *menu);
 static void               xfce_menu_resolve_legacy_menu                    (XfceMenu              *menu,
                                                                             const gchar           *path);
+#endif
 static void               xfce_menu_remove_duplicates                      (XfceMenu              *menu);
 static void               xfce_menu_consolidate_child_menus                (XfceMenu              *menu);
 #if 0
@@ -2105,6 +2107,7 @@
 
 
 
+#if 0
 static void
 xfce_menu_resolve_legacy_menus (XfceMenu *menu)
 {
@@ -2195,6 +2198,7 @@
   /* Close directory handle */
   g_dir_close (dir);
 }
+#endif