gnome-control-center r9066 - in trunk: . font-viewer vfs-methods

[davyd svn gnome org]

Author: davyd
Date: Wed Oct 15 14:46:43 2008
New Revision: 9066
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9066&view=rev

Log:
2008-10-15  Davyd Madeley  <davyd madeley id au>

        * vfs-methods/: remove properly
        * font-viewer/: resurrect gnome-font-viewer and gnome-thumbnail-font
          from revision 8786 (not yet added to toplevel Makefile)


Added:
   trunk/font-viewer/
   trunk/font-viewer/Makefile.am
      - copied, changed from r8786, /trunk/vfs-methods/fontilus/Makefile.am
   trunk/font-viewer/font-thumbnailer.c
      - copied unchanged from r8786, /trunk/vfs-methods/fontilus/thumbnailer.c
   trunk/font-viewer/font-view.c
      - copied unchanged from r8786, /trunk/vfs-methods/fontilus/font-view.c
   trunk/font-viewer/fontilus.schemas.in
      - copied unchanged from r8786, /trunk/vfs-methods/fontilus/fontilus.schemas.in
   trunk/font-viewer/ftstream-vfs.c
      - copied unchanged from r8786, /trunk/vfs-methods/fontilus/ftstream-vfs.c
   trunk/font-viewer/gnome-font-viewer.desktop.in.in
      - copied unchanged from r8786, /trunk/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in
Removed:
   trunk/vfs-methods/
Modified:
   trunk/ChangeLog

Copied: trunk/font-viewer/Makefile.am (from r8786, /trunk/vfs-methods/fontilus/Makefile.am)
==============================================================================
--- /trunk/vfs-methods/fontilus/Makefile.am	(original)
+++ trunk/font-viewer/Makefile.am	Wed Oct 15 14:46:43 2008
@@ -3,35 +3,14 @@
   $(FONT_CONTEXT_MENU_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \
   -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
-vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules
-vfsmodule_LTLIBRARIES = libfont-method.la
-
 bin_PROGRAMS = gnome-thumbnail-font gnome-font-viewer
 
-libfont_method_la_LDFLAGS = -module -avoid-version -no-undefined \
-  -export-symbols-regex 'vfs_module_.*'
-libfont_method_la_LIBADD = $(FONT_METHOD_LIBS)
-libfont_method_la_SOURCES = font-method.c
-
 gnome_thumbnail_font_LDADD = $(FONT_THUMBNAILER_LIBS)
-gnome_thumbnail_font_SOURCES = ftstream-vfs.c thumbnailer.c
+gnome_thumbnail_font_SOURCES = ftstream-vfs.c font-thumbnailer.c
 
 gnome_font_viewer_LDADD = $(FONT_VIEW_LIBS)
 gnome_font_viewer_SOURCES = ftstream-vfs.c font-view.c
 
-nautilusdir = $(NAUTILUSDIR)
-nautilus_LTLIBRARIES = libnautilus-fontilus.la
-libnautilus_fontilus_la_LDFLAGS = -module -avoid-version -no-undefined \
-  -export-symbols-regex 'nautilus_module_.*'
-libnautilus_fontilus_la_LIBADD = $(FONT_CONTEXT_MENU_LIBS)
-libnautilus_fontilus_la_SOURCES = fontilus-context-menu.c
-
-vfsmoduleconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
-vfsmoduleconf_DATA = font-method.conf
-
-directorydir = $(datadir)/desktop-directories
-directory_DATA = font-method.directory
-
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)
 schemas_DATA = fontilus.schemas
 
@@ -64,7 +43,5 @@
   $(schemas_DATA) $(directory_DATA)
 
 EXTRA_DIST = \
-  font-method.conf \
-  font-method.directory.in \
   fontilus.schemas.in \
   gnome-font-viewer.desktop.in.in