[groonga-commit:1691] ranguba/chupatext [master] remove needless libgsf dependencies.

[null+ranguba at clear-code.com]

Kouhei Sutou	2010-10-22 09:44:36 +0000 (Fri, 22 Oct 2010)

  New Revision: 11500c934ad27594dd0147bb9e7abf5c3f542cfb

  Log:
    remove needless libgsf dependencies.

  Modified files:
    module/Makefile.am
    module/powerpoint.c

  Modified: module/Makefile.am (+1 -5)
===================================================================
--- module/Makefile.am    2010-10-22 09:39:59 +0000 (e5f7ba3)
+++ module/Makefile.am    2010-10-22 09:44:36 +0000 (9f52d31)
@@ -35,7 +35,6 @@ endif
 text_la_SOURCES = text.c
 text_la_CPPFLAGS =				\
 	$(GLIB_CFLAGS)				\
-	$(GSF_CFLAGS)				\
 	-DG_LOG_DOMAIN=\"ChupaText-Text\"	\
 	-DCHUPA_LOG_DOMAIN=\"ChupaText-Text\"
 text_la_LIBADD = $(chupa_libs)
@@ -57,7 +56,6 @@ zip_la_LIBADD = $(chupa_libs)
 pdf_la_SOURCES = pdf.c
 pdf_la_CPPFLAGS =				\
 	$(POPPLER_GLIB_CFLAGS)			\
-	$(GSF_CFLAGS)				\
 	-DG_LOG_DOMAIN=\"ChupaText-PDF\"	\
 	-DCHUPA_LOG_DOMAIN=\"ChupaText-PDF\"
 pdf_la_LIBADD = $(chupa_libs) $(POPPLER_GLIB_LIBS)
@@ -79,7 +77,6 @@ excel_la_LIBADD = $(chupa_libs) $(GOFFICE_LIBS) -lspreadsheet
 powerpoint_la_SOURCES = powerpoint.c
 powerpoint_la_CPPFLAGS =				\
 	$(GIO_UNIX_CFLAGS)				\
-	$(GSF_CFLAGS)					\
 	-DG_LOG_DOMAIN=\"ChupaText-PowerPoint\"		\
 	-DCHUPA_LOG_DOMAIN=\"ChupaText-PowerPoint\"
 powerpoint_la_LIBADD = $(chupa_libs) $(GIO_UNIX_LIBS)
@@ -93,8 +90,7 @@ ruby_la_CPPFLAGS =					\
 	-DCHUPA_LOG_DOMAIN=\"ChupaText-Ruby\"		\
 	$(RUBY_CPPFLAGS)				\
 	$(RUBY_GLIB2_CFLAGS)				\
-	$(GLIB_CFLAGS)					\
-	$(GSF_CFLAGS)
+	$(GLIB_CFLAGS)
 ruby_la_LIBADD =				\
 	$(chupa_libs)				\
 	$(RUBY_LDFLAGS)				\

  Modified: module/powerpoint.c (+0 -8)
===================================================================
--- module/powerpoint.c    2010-10-22 09:39:59 +0000 (997896d)
+++ module/powerpoint.c    2010-10-22 09:44:36 +0000 (c2f972c)
@@ -21,14 +21,10 @@
 
 #include <chupatext/chupa_decomposer_module.h>
 #include <chupatext/external_decomposer.h>
-#include <chupatext/chupa_gsf_input_stream.h>
-#include <chupatext/chupa_data_input.h>
 #include <glib.h>
 #include <gio/gio.h>
 #include <gio/gunixinputstream.h>
 #include <gio/gunixoutputstream.h>
-#include <gsf/gsf-output-memory.h>
-#include <gsf/gsf-infile-msole.h>
 #include <glib/gstdio.h>
 #include <memory.h>
 #include <unistd.h>
@@ -75,15 +71,11 @@ feed(ChupaDecomposer *decomposer, ChupaFeeder *feeder,
     char *argv[5];
     gsize size;
     gboolean result;
-    GsfInput *base_input;
     gint ooo_status;
     struct stat st;
 
     fd_ppt = g_file_open_tmp(TMPFILE_BASE".ppt", &tmp_power_point_name, error);
     out_tmpfile = g_unix_output_stream_new(fd_ppt, TRUE);
-    base_input = chupa_data_input_new(data);
-    gsf_input_seek(base_input, 0, G_SEEK_SET);
-    g_object_unref(base_input);
     in_tmpfile = chupa_data_get_stream(data);
     size = g_output_stream_splice(out_tmpfile, in_tmpfile,
                                   G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE|