Commit: a3aab23af81255ec511c32758c1ea9a37b173eb7 - gimageview (git)

GImageView is a GTK+ based image viewer which supports tabbed browsing, thumbnail table views, directory tree views and drag and drop. It also support movies using the Xine library and MPlayer, and supports images in compressed archive formats.

Commit MetaInfo

• Revision: a3aab23af81255ec511c32758c1ea9a37b173eb7 (tree)
• Time: 2009-01-13 15:34:52
• Author: makeinu <makeinu@aeae...>
• Commiter: makeinu

Log Message

Remove needless lines.

git-svn-id: https://gtkmmviewer.svn.sourceforge.net/svnroot/gtkmmviewer/gimageview/trunk@1212 aeae0eed-423c-0410-9251-95fb8af3d19f

Change Summary

• modified: ChangeLog
• modified: configure.ac
• modified: plugins/image_loader/Makefile.am
• modified: plugins/image_loader/svg.c
• modified: plugins/image_loader/svg.h

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-01-13 Takuro Ashie <[e-mail]>
 
+	* configure.ac, plugins/image_loader/Makefile.am,
+	  plugins/image_loader/svg.[ch]: Removed needless code.
+
[phone] Takuro Ashie <[e-mail]>
+
 	* plugins/image_loader/svg.c: Don't use GError.
 
 2009-01-13 Takuro Ashie <[e-mail]>

--- a/configure.ac
+++ b/configure.ac
@@ -102,8 +102,6 @@ PKG_CHECK_MODULES(GTK,
     gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED
     gtk+-2.0       >= $GTK2_REQUIRED], ,
    [ AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help) ])
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
 
 
 dnl ********************
@@ -243,9 +241,6 @@ if test x"$enable_exif" = xyes; then
    AC_DEFINE(ENABLE_EXIF, 1, [Define if you want to compile EXIF features.])
 fi
 
-AC_SUBST(EXIF_CFLAGS)
-AC_SUBST(EXIF_LIBS)
-
 
 dnl ********************
 dnl Test for libmng
@@ -318,16 +313,6 @@ fi
 
 AM_CONDITIONAL(ENABLE_LIBRSVG, test x"$enable_librsvg" = xyes)
 
-if test x"$enable_librsvg" = xyes; then
-   AC_DEFINE(HAVE_LIBRSVG, 1, [Define if you have librsvg.])
-   AC_DEFINE(ENABLE_SVG, 1, [Define if you want to compile svg plugin.])
-fi
-
-AC_SUBST(XML_CFLAGS)
-AC_SUBST(XML_LIBS)
-AC_SUBST(LIBRSVG_CFLAGS) 
-AC_SUBST(LIBRSVG_LIBS)
-
 
 dnl ****************************
 dnl Check for libwmf

--- a/plugins/image_loader/Makefile.am
+++ b/plugins/image_loader/Makefile.am
@@ -53,7 +53,6 @@ INCLUDES = \
 	$(PNG_CFLAGS) \
 	$(JPEG_CFLAGS) \
 	$(MNG_CFLAGS) \
-	$(XML_CFLAGS) \
 	$(LIBRSVG_CFLAGS) \
 	$(LIBWMF_CFLAGS) \
 	$(DLLLOADER_CFLAGS) \
@@ -100,7 +99,7 @@ libgimv_spi_loader_la_SOURCES = \
 	spi.c spi.h spi-private.h \
 	spi_image_loader.c spi_image_loader.h
 
-libgimv_rsvg_loader_la_LIBADD = $(GTK_LIBS) $(XML_LIBS) $(LIBRSVG_LIBS)
+libgimv_rsvg_loader_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS)
 libgimv_rsvg_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS)
 libgimv_rsvg_loader_la_SOURCES = svg.c svg.h
 

--- a/plugins/image_loader/svg.c
+++ b/plugins/image_loader/svg.c
@@ -23,8 +23,6 @@
 
 #include "svg.h"
 
-#ifdef ENABLE_SVG
-
 #include <stdio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <librsvg/rsvg.h>
@@ -126,4 +124,3 @@ svg_load_image (GimvImageLoader *loader, gpointer data)
       return NULL;
    }
 }
-#endif /* ENABLE_SVG */

--- a/plugins/image_loader/svg.h
+++ b/plugins/image_loader/svg.h
@@ -28,14 +28,10 @@
 #  include "config.h"
 #endif
 
-#ifdef ENABLE_SVG
-
 #include "gimv_image.h"
 #include "gimv_image_loader.h"
 
 GimvImage *svg_load_image (GimvImageLoader *loader,
                            gpointer         data);
 
-#endif /* ENABLE_SVG */
-
 #endif /* __SVG_H__ */