GNOME.org
 

[gthumb/ext] Fix GTK+ single includes

commit a95aa16eb61a29383453fd5986e438ec8495dfa4
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Nov 26 00:03:46 2009 +0100

    Fix GTK+ single includes

 configure.ac                                       |   20 +++++++-------------
 copy-n-paste/Makefile.am                           |    4 ----
 extensions/bookmarks/Makefile.am                   |    2 +-
 extensions/bookmarks/actions.h                     |    2 +-
 extensions/catalogs/Makefile.am                    |    2 +-
 extensions/catalogs/actions.h                      |    2 +-
 extensions/comments/Makefile.am                    |    2 +-
 extensions/desktop_background/Makefile.am          |    2 +-
 extensions/exiv2/Makefile.am                       |    2 +-
 extensions/file_manager/Makefile.am                |    2 +-
 extensions/file_tools/Makefile.am                  |    2 +-
 extensions/file_viewer/Makefile.am                 |    2 +-
 extensions/gstreamer/Makefile.am                   |    2 +-
 extensions/image_print/Makefile.am                 |    2 +-
 extensions/image_rotation/Makefile.am              |    2 +-
 extensions/image_viewer/Makefile.am                |    2 +-
 .../image_viewer/gth-metadata-provider-image.c     |    2 +-
 extensions/jpeg_utils/Makefile.am                  |    2 +-
 extensions/list_tools/Makefile.am                  |    2 +-
 extensions/photo_importer/Makefile.am              |    2 +-
 extensions/pixbuf_savers/Makefile.am               |    2 +-
 extensions/red_eye_removal/Makefile.am             |    2 +-
 extensions/rename_series/Makefile.am               |    2 +-
 extensions/resize_images/Makefile.am               |    2 +-
 extensions/search/Makefile.am                      |    2 +-
 extensions/slideshow/Makefile.am                   |    2 +-
 gthumb/Makefile.am                                 |    2 --
 gthumb/egg-macros.h                                |    2 +-
 gthumb/gth-browser-actions-callbacks.h             |    2 +-
 gthumb/gth-cursors.c                               |    3 +--
 gthumb/gth-filterbar.h                             |    2 +-
 gthumb/gth-image-loader.c                          |    3 +--
 gthumb/gth-image-viewer.h                          |    1 -
 gthumb/gth-thumb-loader.c                          |    2 +-
 gthumb/gth-time-selector.h                         |    2 +-
 gthumb/gth-window-actions-callbacks.h              |    2 +-
 tests/Makefile.am                                  |    2 +-
 37 files changed, 40 insertions(+), 55 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c632f58..48c1b87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,10 @@ GSTREAMER_REQUIRED=0.10
 
 dnl ===========================================================================
 
+CFLAGS=""
+CFLAGS+="-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES "
+CFLAGS+="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED "
+
 AC_ARG_ENABLE(debug,
 	      AS_HELP_STRING([--enable-debug], [enable compilation of debugging messages]),
 	      [case "${enableval}" in
@@ -45,7 +49,7 @@ AC_ARG_ENABLE(debug,
 	      [ENABLE_DEBUG=no])
 if test x$ENABLE_DEBUG = xyes; then
 	AC_DEFINE(DEBUG, 1, [enable compilation of debugging messages])
-	CFLAGS="-g -O0"
+	CFLAGS+="-g -O0 "
 fi
 
 AC_ARG_ENABLE(run_in_place,
@@ -204,16 +208,6 @@ else
 fi
 AC_SUBST(EXTENSION_LIBTOOL_FLAGS)
 
-
-dnl ===========================================================================
-
-AC_ARG_ENABLE(deprecations,
-	      [AS_HELP_STRING([--enable-deprecations],[warn about deprecated usages])])
-if test "x$enable_deprecations" = "xyes"; then
-	DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-fi
-AC_SUBST(DISABLE_DEPRECATED)
-
 dnl ===========================================================================
 
 WARN_CFLAGS="-Wall -Wcast-align -Wtype-limits -Wclobbered -Wempty-body -Wignored-qualifiers"
@@ -232,8 +226,7 @@ for option in $WARN_CFLAGS; do
 	unset SAVE_CFLAGS
 done
 unset option
-AC_SUBST(WARNINGS)
-
+CFLAGS+="$WARNINGS "
 
 dnl ===========================================================================
 
@@ -363,6 +356,7 @@ Configuration:
 	Source code location : $srcdir
 	Compiler             : $CC
 	Prefix               : $prefix
+	CFLAGS		     : $CFLAGS
 	Debug                : $ENABLE_DEBUG
 	Run in place         : ${enable_run_in_place}
 	Build tests          : $ENABLE_TEST_SUITE
diff --git a/copy-n-paste/Makefile.am b/copy-n-paste/Makefile.am
index 3846c85..7f452e6 100644
--- a/copy-n-paste/Makefile.am
+++ b/copy-n-paste/Makefile.am
@@ -1,7 +1,3 @@
-INCLUDES = -DGTK_DISABLE_DEPRECATED \
-	   -DGDK_DISABLE_DEPRECATED \
-	   -DG_DISABLE_DEPRECATED 
-
 noinst_LTLIBRARIES = libeggsmclient.la
 
 libeggsmclient_la_LIBADD = $(GTK_LIBS)
diff --git a/extensions/bookmarks/Makefile.am b/extensions/bookmarks/Makefile.am
index c685c83..c844950 100644
--- a/extensions/bookmarks/Makefile.am
+++ b/extensions/bookmarks/Makefile.am
@@ -12,7 +12,7 @@ libbookmarks_la_SOURCES = 		\
 	dlg-bookmarks.h			\
 	main.c
 
-libbookmarks_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libbookmarks_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libbookmarks_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libbookmarks_la_LIBADD = $(GTHUMB_LIBS)
 libbookmarks_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/bookmarks/actions.h b/extensions/bookmarks/actions.h
index a9a947f..dc23b45 100644
--- a/extensions/bookmarks/actions.h
+++ b/extensions/bookmarks/actions.h
@@ -23,7 +23,7 @@
 #ifndef ACTIONS_H
 #define ACTIONS_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
 
diff --git a/extensions/catalogs/Makefile.am b/extensions/catalogs/Makefile.am
index 7f59a60..56c4fab 100644
--- a/extensions/catalogs/Makefile.am
+++ b/extensions/catalogs/Makefile.am
@@ -16,7 +16,7 @@ libcatalogs_la_SOURCES = 		\
 	gth-file-source-catalogs.h	\
 	main.c
 
-libcatalogs_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libcatalogs_la_CFLAGS = $(GTHUMB_CFLAGS) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libcatalogs_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libcatalogs_la_LIBADD = $(GTHUMB_LIBS)
 libcatalogs_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/catalogs/actions.h b/extensions/catalogs/actions.h
index 7f625cd..046aef2 100644
--- a/extensions/catalogs/actions.h
+++ b/extensions/catalogs/actions.h
@@ -23,7 +23,7 @@
 #ifndef ACTIONS_H
 #define ACTIONS_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
 
diff --git a/extensions/comments/Makefile.am b/extensions/comments/Makefile.am
index d6ddfe2..4e18639 100644
--- a/extensions/comments/Makefile.am
+++ b/extensions/comments/Makefile.am
@@ -14,7 +14,7 @@ libcomments_la_SOURCES = 			\
 	gth-test-category.h			\
 	main.c
 
-libcomments_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libcomments_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libcomments_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libcomments_la_LIBADD = $(GTHUMB_LIBS)
 libcomments_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/desktop_background/Makefile.am b/extensions/desktop_background/Makefile.am
index 486713b..5ed7949 100644
--- a/extensions/desktop_background/Makefile.am
+++ b/extensions/desktop_background/Makefile.am
@@ -9,7 +9,7 @@ libdesktop_background_la_SOURCES = 	\
 	callbacks.h			\
 	main.c		
 
-libdesktop_background_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libdesktop_background_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libdesktop_background_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libdesktop_background_la_LIBADD = $(GTHUMB_LIBS) 
 libdesktop_background_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/exiv2/Makefile.am b/extensions/exiv2/Makefile.am
index eb17df2..5def504 100644
--- a/extensions/exiv2/Makefile.am
+++ b/extensions/exiv2/Makefile.am
@@ -10,7 +10,7 @@ libexiv2_la_SOURCES = 			\
 	gth-metadata-provider-exiv2.h	\
 	main.c
 
-libexiv2_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(EXIV2_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libexiv2_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(EXIV2_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libexiv2_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libexiv2_la_LIBADD = $(GTHUMB_LIBS) 
 libexiv2_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/file_manager/Makefile.am b/extensions/file_manager/Makefile.am
index 3dafa84..2b3a347 100644
--- a/extensions/file_manager/Makefile.am
+++ b/extensions/file_manager/Makefile.am
@@ -16,7 +16,7 @@ libfile_manager_la_SOURCES = 		\
 	gth-reorder-task.h		\
 	main.c
 
-libfile_manager_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libfile_manager_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libfile_manager_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libfile_manager_la_LIBADD = $(GTHUMB_LIBS)
 libfile_manager_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/file_tools/Makefile.am b/extensions/file_tools/Makefile.am
index 0c9c28b..8be77c5 100644
--- a/extensions/file_tools/Makefile.am
+++ b/extensions/file_tools/Makefile.am
@@ -34,7 +34,7 @@ libfile_tools_la_SOURCES = 		\
 	gth-file-tool-undo.h		\
 	main.c
 
-libfile_tools_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libfile_tools_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libfile_tools_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libfile_tools_la_LIBADD = $(GTHUMB_LIBS)
 libfile_tools_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/file_viewer/Makefile.am b/extensions/file_viewer/Makefile.am
index dd572f9..12111f3 100644
--- a/extensions/file_viewer/Makefile.am
+++ b/extensions/file_viewer/Makefile.am
@@ -6,7 +6,7 @@ libfile_viewer_la_SOURCES = 		\
 	gth-file-viewer-page.h		\
 	main.c
 
-libfile_viewer_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libfile_viewer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libfile_viewer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libfile_viewer_la_LIBADD = $(GTHUMB_LIBS)
 libfile_viewer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/gstreamer/Makefile.am b/extensions/gstreamer/Makefile.am
index 961274f..a384cea 100644
--- a/extensions/gstreamer/Makefile.am
+++ b/extensions/gstreamer/Makefile.am
@@ -19,7 +19,7 @@ libgstreamer_la_SOURCES = 			\
 	main.c					\
 	preferences.h
 
-libgstreamer_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(GSTREAMER_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libgstreamer_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(GSTREAMER_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libgstreamer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libgstreamer_la_LIBADD = $(GTHUMB_LIBS) 
 libgstreamer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/image_print/Makefile.am b/extensions/image_print/Makefile.am
index d8d4f85..210d133 100644
--- a/extensions/image_print/Makefile.am
+++ b/extensions/image_print/Makefile.am
@@ -17,7 +17,7 @@ libimage_print_la_SOURCES = 		\
 	preferences.h			\
 	main.c
 
-libimage_print_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libimage_print_la_CPPFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libimage_print_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libimage_print_la_LIBADD = $(GTHUMB_LIBS) 
 libimage_print_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/image_rotation/Makefile.am b/extensions/image_rotation/Makefile.am
index 7370a81..042a113 100644
--- a/extensions/image_rotation/Makefile.am
+++ b/extensions/image_rotation/Makefile.am
@@ -13,7 +13,7 @@ libimage_rotation_la_SOURCES = 		\
 	rotation-utils.c		\
 	rotation-utils.h		
 
-libimage_rotation_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libimage_rotation_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libimage_rotation_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libimage_rotation_la_LIBADD = $(GTHUMB_LIBS) 
 libimage_rotation_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/image_viewer/Makefile.am b/extensions/image_viewer/Makefile.am
index 4515c01..4d12205 100644
--- a/extensions/image_viewer/Makefile.am
+++ b/extensions/image_viewer/Makefile.am
@@ -12,7 +12,7 @@ libimage_viewer_la_SOURCES = 		\
 	preferences.c			\
 	preferences.h
 
-libimage_viewer_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libimage_viewer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libimage_viewer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libimage_viewer_la_LIBADD = $(GTHUMB_LIBS)
 libimage_viewer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/image_viewer/gth-metadata-provider-image.c b/extensions/image_viewer/gth-metadata-provider-image.c
index b30d6f0..1eca591 100644
--- a/extensions/image_viewer/gth-metadata-provider-image.c
+++ b/extensions/image_viewer/gth-metadata-provider-image.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <glib.h>
-#include <gdk-pixbuf/gdk-pixbuf-io.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gthumb.h>
 #include "gth-metadata-provider-image.h"
 
diff --git a/extensions/jpeg_utils/Makefile.am b/extensions/jpeg_utils/Makefile.am
index a6a447a..720c56c 100644
--- a/extensions/jpeg_utils/Makefile.am
+++ b/extensions/jpeg_utils/Makefile.am
@@ -16,7 +16,7 @@ else
 libjpeg_utils_la_SOURCES =
 endif
 
-libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libjpeg_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libjpeg_utils_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS)
 libjpeg_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/list_tools/Makefile.am b/extensions/list_tools/Makefile.am
index e09660d..835b522 100644
--- a/extensions/list_tools/Makefile.am
+++ b/extensions/list_tools/Makefile.am
@@ -20,7 +20,7 @@ liblist_tools_la_SOURCES = 		\
 	gth-script-task.c		\
 	main.c
 
-liblist_tools_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+liblist_tools_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 liblist_tools_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 liblist_tools_la_LIBADD = $(GTHUMB_LIBS)
 liblist_tools_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/photo_importer/Makefile.am b/extensions/photo_importer/Makefile.am
index e68368d..647ac36 100644
--- a/extensions/photo_importer/Makefile.am
+++ b/extensions/photo_importer/Makefile.am
@@ -44,7 +44,7 @@ libphoto_importer_la_SOURCES = 		\
 	gth-import-task.c		\
 	main.c
 	
-libphoto_importer_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libphoto_importer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libphoto_importer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libphoto_importer_la_LIBADD = $(GTHUMB_LIBS)
 libphoto_importer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/pixbuf_savers/Makefile.am b/extensions/pixbuf_savers/Makefile.am
index fac5059..f48593c 100644
--- a/extensions/pixbuf_savers/Makefile.am
+++ b/extensions/pixbuf_savers/Makefile.am
@@ -45,7 +45,7 @@ libpixbuf_savers_la_SOURCES = 	\
 	main.c			\
 	preferences.c
 
-libpixbuf_savers_la_CFLAGS = $(GTHUMB_CFLAGS) $(CLUTTER_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libpixbuf_savers_la_CFLAGS = $(GTHUMB_CFLAGS) $(CLUTTER_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libpixbuf_savers_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libpixbuf_savers_la_LIBADD = $(GTHUMB_LIBS) $(TIFF_LIBS)
 libpixbuf_savers_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/red_eye_removal/Makefile.am b/extensions/red_eye_removal/Makefile.am
index 16bb461..637d61a 100644
--- a/extensions/red_eye_removal/Makefile.am
+++ b/extensions/red_eye_removal/Makefile.am
@@ -8,7 +8,7 @@ libred_eye_removal_la_SOURCES = 	\
 	gth-file-tool-red-eye.h		\
 	main.c
 
-libred_eye_removal_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libred_eye_removal_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libred_eye_removal_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libred_eye_removal_la_LIBADD = $(GTHUMB_LIBS)
 libred_eye_removal_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/rename_series/Makefile.am b/extensions/rename_series/Makefile.am
index 20230fe..20bbec5 100644
--- a/extensions/rename_series/Makefile.am
+++ b/extensions/rename_series/Makefile.am
@@ -14,7 +14,7 @@ librename_series_la_SOURCES = 		\
 	gth-rename-task.h		\
 	main.c
 
-librename_series_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+librename_series_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 librename_series_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 librename_series_la_LIBADD = $(GTHUMB_LIBS)
 librename_series_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/resize_images/Makefile.am b/extensions/resize_images/Makefile.am
index dff2abb..7f1a22f 100644
--- a/extensions/resize_images/Makefile.am
+++ b/extensions/resize_images/Makefile.am
@@ -12,7 +12,7 @@ libresize_images_la_SOURCES = 		\
 	dlg-resize-images.h		\
 	main.c
 
-libresize_images_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libresize_images_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libresize_images_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libresize_images_la_LIBADD = $(GTHUMB_LIBS)
 libresize_images_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/search/Makefile.am b/extensions/search/Makefile.am
index f292eaf..4f91f69 100644
--- a/extensions/search/Makefile.am
+++ b/extensions/search/Makefile.am
@@ -16,7 +16,7 @@ libsearch_la_SOURCES = 			\
 	gth-search-task.h		\
 	main.c
 
-libsearch_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libsearch_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libsearch_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libsearch_la_LIBADD = $(GTHUMB_LIBS)
 libsearch_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/slideshow/Makefile.am b/extensions/slideshow/Makefile.am
index 09e09b0..eb1aa94 100644
--- a/extensions/slideshow/Makefile.am
+++ b/extensions/slideshow/Makefile.am
@@ -18,7 +18,7 @@ libslideshow_la_SOURCES = 		\
 	preferences.c			\
 	preferences.h
 
-libslideshow_la_CFLAGS = $(GTHUMB_CFLAGS) $(CLUTTER_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libslideshow_la_CFLAGS = $(GTHUMB_CFLAGS) $(CLUTTER_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libslideshow_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libslideshow_la_LIBADD = $(GTHUMB_LIBS)
 libslideshow_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am
index 91d0b70..4c85e54 100644
--- a/gthumb/Makefile.am
+++ b/gthumb/Makefile.am
@@ -258,8 +258,6 @@ gthumb_CFLAGS =							\
 	$(GTHUMB_CFLAGS)					\
 	$(EXIV2_CFLAGS)						\
 	$(CLUTTER_CFLAGS)					\
-	$(DISABLE_DEPRECATED)                   		\
-        $(WARNINGS)                             		\
 	-I$(top_srcdir)/copy-n-paste/				\
 	-DGTHUMB_LOCALEDIR=\"$(datadir)/locale\"		\
 	-DGTHUMB_PREFIX=\"$(prefix)\"           		\
diff --git a/gthumb/egg-macros.h b/gthumb/egg-macros.h
index 2b5718e..a1dd396 100644
--- a/gthumb/egg-macros.h
+++ b/gthumb/egg-macros.h
@@ -9,7 +9,7 @@
 #ifndef _EGG_MACROS_H_
 #define _EGG_MACROS_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/gthumb/gth-browser-actions-callbacks.h b/gthumb/gth-browser-actions-callbacks.h
index f341dbe..ec99f09 100644
--- a/gthumb/gth-browser-actions-callbacks.h
+++ b/gthumb/gth-browser-actions-callbacks.h
@@ -23,7 +23,7 @@
 #ifndef GTH_BROWSER_ACTIONS_CALLBACKS_H
 #define GTH_BROWSER_ACTIONS_CALLBACKS_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
 
diff --git a/gthumb/gth-cursors.c b/gthumb/gth-cursors.c
index b6ac897..4c98cbd 100644
--- a/gthumb/gth-cursors.c
+++ b/gthumb/gth-cursors.c
@@ -26,8 +26,7 @@
  */
 
 #include <config.h>
-#include <gdk/gdkcolor.h>
-#include <gdk/gdkdrawable.h>
+#include <gdk/gdk.h>
 #include "gth-cursors.h"
 
 
diff --git a/gthumb/gth-filterbar.h b/gthumb/gth-filterbar.h
index 410a33e..4a793b2 100644
--- a/gthumb/gth-filterbar.h
+++ b/gthumb/gth-filterbar.h
@@ -23,7 +23,7 @@
 #ifndef GTH_FILTERBAR_H
 #define GTH_FILTERBAR_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "gth-test.h"
 
 G_BEGIN_DECLS
diff --git a/gthumb/gth-image-loader.c b/gthumb/gth-image-loader.c
index 61839e4..5e33cc3 100644
--- a/gthumb/gth-image-loader.c
+++ b/gthumb/gth-image-loader.c
@@ -22,8 +22,7 @@
 
 #include <config.h>
 #include <glib/gi18n.h>
-#define GDK_PIXBUF_ENABLE_BACKEND
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include "gth-file-data.h"
 #include "glib-utils.h"
diff --git a/gthumb/gth-image-viewer.h b/gthumb/gth-image-viewer.h
index 60477ec..c9dfef1 100644
--- a/gthumb/gth-image-viewer.h
+++ b/gthumb/gth-image-viewer.h
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
 #include "gth-image-loader.h"
 #include "gth-image-viewer-tool.h"
 #include "gth-file-data.h"
diff --git a/gthumb/gth-thumb-loader.c b/gthumb/gth-thumb-loader.c
index 84bc227..d2d63fb 100644
--- a/gthumb/gth-thumb-loader.c
+++ b/gthumb/gth-thumb-loader.c
@@ -28,7 +28,7 @@
 #include <signal.h>
 #define GDK_PIXBUF_ENABLE_BACKEND
 #include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gio-utils.h"
 #include "glib-utils.h"
 #define GNOME_DESKTOP_USE_UNSTABLE_API
diff --git a/gthumb/gth-time-selector.h b/gthumb/gth-time-selector.h
index fd4ffe6..a8bf541 100644
--- a/gthumb/gth-time-selector.h
+++ b/gthumb/gth-time-selector.h
@@ -23,7 +23,7 @@
 #ifndef GTH_TIME_SELECTOR_H
 #define GTH_TIME_SELECTOR_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "gth-time.h"
 
 G_BEGIN_DECLS
diff --git a/gthumb/gth-window-actions-callbacks.h b/gthumb/gth-window-actions-callbacks.h
index bb5fa8e..56f00ec 100644
--- a/gthumb/gth-window-actions-callbacks.h
+++ b/gthumb/gth-window-actions-callbacks.h
@@ -23,7 +23,7 @@
 #ifndef GTH_WINDOW_ACTIONS_CALLBACKS_H
 #define GTH_WINDOW_ACTIONS_CALLBACKS_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f4142a0..968ec0a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,5 +8,5 @@ dom_test_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir)/gthumb
 
 glib_utils_test_SOURCES = glib-utils-test.c $(top_srcdir)/gthumb/glib-utils.c
 glib_utils_test_LDADD = $(GTHUMB_LIBS) 
-glib_utils_test_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir)/gthumb
+glib_utils_test_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir)/gthumb
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]