gnome-control-center r8787 - in trunk: . vfs-methods/fontilus vfs-methods/themus

[rodrigo svn gnome org]

Author: rodrigo
Date: Fri Jul 18 08:53:01 2008
New Revision: 8787
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8787&view=rev

Log:
2008-07-18  Rodrigo Moya <rodrigo gnome-db org>

	* configure.in:
	* Makefile.am:
	* vfs-methods/*: removed VFS methods code.

Removed:
   trunk/vfs-methods/fontilus/ChangeLog
   trunk/vfs-methods/fontilus/Makefile.am
   trunk/vfs-methods/fontilus/font-method.c
   trunk/vfs-methods/fontilus/font-method.conf
   trunk/vfs-methods/fontilus/font-method.directory.in
   trunk/vfs-methods/fontilus/font-view.c
   trunk/vfs-methods/fontilus/fontilus-context-menu.c
   trunk/vfs-methods/fontilus/fontilus.schemas.in
   trunk/vfs-methods/fontilus/ftstream-vfs.c
   trunk/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in
   trunk/vfs-methods/fontilus/thumbnailer.c
   trunk/vfs-methods/themus/ChangeLog
   trunk/vfs-methods/themus/Makefile.am
   trunk/vfs-methods/themus/apply-font.glade
   trunk/vfs-methods/themus/theme-method.c
   trunk/vfs-methods/themus/theme-method.conf
   trunk/vfs-methods/themus/theme-method.directory.in
   trunk/vfs-methods/themus/theme-thumbnailer.c
   trunk/vfs-methods/themus/themus-properties-main.c
   trunk/vfs-methods/themus/themus-properties-view.c
   trunk/vfs-methods/themus/themus-properties-view.h
   trunk/vfs-methods/themus/themus-theme-applier.c
   trunk/vfs-methods/themus/themus-theme-applier.desktop.in.in
   trunk/vfs-methods/themus/themus.schemas.in
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Jul 18 08:53:01 2008
@@ -1,4 +1,4 @@
-SUBDIRS = po libsounds libwindow-settings libslab capplets shell help vfs-methods $(TYPING_BREAK)
+SUBDIRS = po libsounds libwindow-settings libslab capplets shell help $(TYPING_BREAK)
 
 ACLOCAL_AMFLAGS = -I m4
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jul 18 08:53:01 2008
@@ -188,58 +188,6 @@
 AC_SUBST(LIBGNOMEKBDUI_LIBS)
 
 dnl ==============================================
-dnl fontilus dependencies
-dnl ==============================================
-
-AC_ARG_ENABLE(vfs-methods,
-  AC_HELP_STRING([--disable-vfs-methods],
-                 [do not build the fonts:/// and themes:/// uri schemes]),,
-  enable_vfs_methods=yes)
-
-if test x$enable_vfs_methods = xyes; then
-
-  PKG_CHECK_MODULES(FONT_METHOD,
-  [gnome-vfs-module-2.0 >= gnomevfs_minver dnl
-   fontconfig >= fontconfig_minver])
-  PKG_CHECK_MODULES(FONT_THUMBNAILER,
-  [gnome-vfs-2.0 >= gnomevfs_minver dnl
-   gdk-pixbuf-2.0 >= gtk_minver])
-  PKG_CHECK_MODULES(FONT_CONTEXT_MENU,
-  [glib-2.0 >= 2.8.0 dnl
-   gnome-vfs-2.0 >= gnomevfs_minver dnl
-   libnautilus-extension >= nautilus_minver])
-  PKG_CHECK_MODULES(FONT_VIEW,
-  [gnome-vfs-2.0 >= gnomevfs_minver dnl
-   xft >= xft_minver dnl
-   gtk+-2.0 >= gtk_minver dnl
-   libgnomeui-2.0 >= libgnomeui_minver])
-
-  # Add freetype flags to the thumbnailer script
-  AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-  if test "x$FREETYPE_CONFIG" = xno; then
-      AC_MSG_ERROR([Could not find freetype-config script])
-  fi
-  FONT_THUMBNAILER_CFLAGS="$FONT_THUMBNAILER_CFLAGS `$FREETYPE_CONFIG --cflags`"
-  FONT_THUMBNAILER_LIBS="$FONT_THUMBNAILER_LIBS `$FREETYPE_CONFIG --libs`"
-
-  FONTILUS=fontilus
-  AC_SUBST(FONTILUS)
-
-  # Determine the install dir for the nautilus extensions.
-  NAUTILUSDIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-  AC_SUBST(NAUTILUSDIR)
-
-  # update LIBS for $export_dynamic
-  export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-  if test -n "$export_dynamic"; then
-    FONT_VIEW_LIBS=`echo $FONT_VIEW_LIBS | sed -e "s/$export_dynamic//"`
-    FONT_CONTEXT_MENU_LIBS=`echo $FONT_CONTEXT_MENU_LIBS | sed -e "s/$export_dynamic//"`
-    FONT_THUMBNAILER_LIBS=`echo $FONT_THUMBNAILER_LIBS | sed -e "s/$export_dynamic//"`
-    FONT_METHOD_LIBS=`echo $FONT_METHOD_LIBS | sed -e "s/$export_dynamic//"`
-  fi
-fi
-
-dnl ==============================================
 dnl About-me
 dnl ==============================================
 
@@ -436,9 +384,6 @@
 shell/Makefile
 shell/gnomecc.desktop.in
 typing-break/Makefile
-vfs-methods/Makefile
-vfs-methods/fontilus/Makefile
-vfs-methods/fontilus/gnome-font-viewer.desktop.in
 ])
 
 dnl due to a bug in intltool we need to expand something from the root last control-center.spec