[Xfce4-commits] r29284 - in xfdesktop/trunk: . po

[Stephan Arts]

Author: stephan
Date: 2009-01-20 06:55:02 +0000 (Tue, 20 Jan 2009)
New Revision: 29284

Removed:
   xfdesktop/trunk/menueditor/
Modified:
   xfdesktop/trunk/Makefile.am
   xfdesktop/trunk/configure.ac.in
   xfdesktop/trunk/po/POTFILES.in
Log:
Remove the menueditor (since it's obsolete anyways)



Modified: xfdesktop/trunk/Makefile.am
===================================================================
--- xfdesktop/trunk/Makefile.am	2009-01-20 02:45:52 UTC (rev 29283)
+++ xfdesktop/trunk/Makefile.am	2009-01-20 06:55:02 UTC (rev 29284)
@@ -4,10 +4,6 @@
 panel_plugin_dir = panel-plugin
 endif
 
-if BUILD_MENUEDITOR
-menueditor_dir = menueditor
-endif
-
 SUBDIRS = \
 	backdrops \
 	common \
@@ -17,7 +13,6 @@
 	po-doc \
 	settings \
 	src \
-	$(menueditor_dir) \
 	modules \
 	pixmaps
 

Modified: xfdesktop/trunk/configure.ac.in
===================================================================
--- xfdesktop/trunk/configure.ac.in	2009-01-20 02:45:52 UTC (rev 29283)
+++ xfdesktop/trunk/configure.ac.in	2009-01-20 06:55:02 UTC (rev 29284)
@@ -8,7 +8,7 @@
 m4_define([xfdesktop_version_minor], [5])
 m4_define([xfdesktop_version_micro], [93])
 m4_define([xfdesktop_version_build], [r at REVISION@])
-m4_define([xfdesktop_version_tag],[])
+m4_define([xfdesktop_version_tag],[svn])
 m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_tag(), [svn], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])])
 
 dnl minimum required versions
@@ -142,18 +142,6 @@
     [libexo, for nifty icon effects])
 
 
-AC_ARG_ENABLE([menu-editor],
-        AC_HELP_STRING([--enable-menu-editor],
-                [Build the menu editor (default=disabled)]),
-        [ac_cv_enable_menueditor=$enableval],
-        [ac_cv_enable_menueditor=no])
-if test "x$ac_cv_enable_menueditor" != "xyes"; then
-        build_menueditor="no"
-else
-        build_menueditor="yes"
-fi
-AM_CONDITIONAL([BUILD_MENUEDITOR], [test "x$build_menueditor" = "xyes"])
-
 AC_ARG_ENABLE([desktop-menu],
         AC_HELP_STRING([--disable-desktop-menu],
                 [Do not build the desktop menu module (default=enabled)]),
@@ -268,7 +256,6 @@
 doc/fr/Makefile
 doc/fr/xfdesktop.xml
 doc/fr/images/Makefile
-menueditor/Makefile
 modules/Makefile
 modules/menu/Makefile
 modules/menu/directory-data/Makefile
@@ -284,7 +271,6 @@
 
 echo
 echo "Build Configuration:"
-echo "  Build menu editor:                            $build_menueditor"
 echo "  Build desktop menu module:                    $build_desktop_menu"
 echo "  Build desktop menu panel plugin:              $build_panel_plugin"
 echo "  Build support for desktop icons:              $enable_desktop_icons"

Modified: xfdesktop/trunk/po/POTFILES.in
===================================================================
--- xfdesktop/trunk/po/POTFILES.in	2009-01-20 02:45:52 UTC (rev 29283)
+++ xfdesktop/trunk/po/POTFILES.in	2009-01-20 06:55:02 UTC (rev 29284)
@@ -1,12 +1,6 @@
 # List of source files containing translatable strings.
 
 common/xfdesktop-common.c
-menueditor/menueditor-add-dialog.c
-menueditor/menueditor-add-external-dialog.c
-menueditor/menueditor-edit-dialog.c
-menueditor/menueditor-edit-external-dialog.c
-menueditor/menueditor-main.c
-menueditor/menueditor-main-window.c
 panel-plugin/desktop-menu-plugin.c
 panel-plugin/xfce4-menu.desktop.in.in
 src/main.c
@@ -23,7 +17,6 @@
 src/xfdesktop-volume-icon.c
 
 # files added by intltool-prepare.
-menueditor/xfce-menueditor.desktop.in
 modules/menu/directory-data/xfce-accessories.directory.in
 modules/menu/directory-data/xfce-development.directory.in
 modules/menu/directory-data/xfce-education.directory.in