Commit a7ba35b2 authored by Matthias Clasen's avatar Matthias Clasen

Make it compile

parent 0f637755
......@@ -6,9 +6,9 @@ test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
PROJECT=Gtk+
TEST_TYPE=-d
FILE=gdk
PROJECT=gdk-pixbuf
TEST_TYPE=-f
FILE=gdk-pixbuf/gdk-pixbuf.h
DIE=0
......
This diff is collapsed.
......@@ -22,25 +22,25 @@ gdk_pixbuf-win32-res.o : gdk_pixbuf.rc
$(WINDRES) gdk_pixbuf.rc $@
install-def-file:
$(INSTALL) $(srcdir)/gdk_pixbuf.def $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def
$(INSTALL) $(srcdir)/gdk_pixbuf.def $(DESTDIR)$(libdir)/gdk_pixbuf-$(GDK_PIXBUF_API_VERSION).def
uninstall-def-file:
-rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def
-rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GDK_PIXBUF_API_VERSION).def
else
install-def-file:
uninstall-def-file:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib
noinst_DATA = gdk_pixbuf-$(GDK_PIXBUF_API_VERSION).lib
gdk_pixbuf-$(GTK_API_VERSION).lib: libgdk_pixbuf-$(GTK_API_VERSION).la gdk_pixbuf.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@
gdk_pixbuf-$(GDK_PIXBUF_API_VERSION).lib: libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la gdk_pixbuf.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@
install-ms-lib:
$(INSTALL) gdk_pixbuf-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
$(INSTALL) gdk_pixbuf-$(GDK_PIXBUF_API_VERSION).lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).lib
-rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GDK_PIXBUF_API_VERSION).lib
else
install-ms-lib:
uninstall-ms-lib:
......@@ -61,12 +61,11 @@ if OS_LINUX
TESTS = abicheck.sh pltcheck.sh
endif
lib_LTLIBRARIES = \
libgdk_pixbuf-3.0.la
lib_LTLIBRARIES = libgdk_pixbuf-2.0.la
loaderdir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/loaders
loaderdir = $(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loaders
module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
module_libs = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
#
# The PNG loader
......@@ -502,43 +501,42 @@ noinst_LTLIBRARIES = \
builtin_objs = @INCLUDED_LOADER_OBJ@
DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
DEPS = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
INCLUDES = \
-DG_LOG_DOMAIN=\"GdkPixbuf\" \
-DGDK_PIXBUF_COMPILATION \
-I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_builddir)/gdk-pixbuf \
-DGTK_LIBDIR=\"$(libdir)\" \
-DGTK_VERSION=\"$(GTK_VERSION)\" \
-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DGTK_PREFIX=\"$(prefix)\" \
$(INCLUDED_LOADER_DEFINE) \
$(GTK_DEBUG_FLAGS) \
$(GDK_PIXBUF_DEP_CFLAGS) \
-DG_LOG_DOMAIN=\"GdkPixbuf\" \
-DGDK_PIXBUF_COMPILATION \
-I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_builddir)/gdk-pixbuf \
-DGDK_PIXBUF_LIBDIR=\"$(libdir)\" \
-DGDK_PIXBUF_BINARY_VERSION=\"$(GDK_PIXBUF_BINARY_VERSION)\" \
-DGDK_PIXBUF_PREFIX=\"$(prefix)\" \
$(INCLUDED_LOADER_DEFINE) \
$(GDK_PIXBUF_DEBUG_FLAGS) \
$(GDK_PIXBUF_DEP_CFLAGS) \
-DGDK_PIXBUF_ENABLE_BACKEND
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
LDADDS = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
noinst_PROGRAMS = test-gdk-pixbuf
test_gdk_pixbuf_LDADD = $(LDADDS)
bin_PROGRAMS = gdk-pixbuf-csource-3.0 gdk-pixbuf-query-loaders-3.0
gdk_pixbuf_csource_3_0_SOURCES = gdk-pixbuf-csource.c
gdk_pixbuf_csource_3_0_LDADD = $(LDADDS)
bin_PROGRAMS = gdk-pixbuf-csource-2.0 gdk-pixbuf-query-loaders-2.0
gdk_pixbuf_csource_2_0_SOURCES = gdk-pixbuf-csource.c
gdk_pixbuf_csource_2_0_LDADD = $(LDADDS)
gdk_pixbuf_query_loaders_3_0_DEPENDENCIES = $(DEPS)
gdk_pixbuf_query_loaders_3_0_LDADD = $(LDADDS)
gdk_pixbuf_query_loaders_2_0_DEPENDENCIES = $(DEPS)
gdk_pixbuf_query_loaders_2_0_LDADD = $(LDADDS)
gdk_pixbuf_query_loaders_3_0_SOURCES = queryloaders.c
gdk_pixbuf_query_loaders_2_0_SOURCES = queryloaders.c
#
# The GdkPixBuf library
#
libgdk_pixbufincludedir = $(includedir)/gtk-3.0/gdk-pixbuf
libgdk_pixbuf_3_0_la_SOURCES = \
libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf-2.0/gdk-pixbuf
libgdk_pixbuf_2_0_la_SOURCES = \
gdk-pixbuf-i18n.h \
gdk-pixbuf.c \
gdk-pixbuf-animation.c \
......@@ -552,7 +550,7 @@ libgdk_pixbuf_3_0_la_SOURCES = \
gdk-pixdata.c \
gdk-pixbuf-enum-types.c
libgdk_pixbuf_3_0_la_LDFLAGS = \
libgdk_pixbuf_2_0_la_LDFLAGS = \
$(gdk_pixbuf_win32_res_ldflag) \
-version-info $(LT_VERSION_INFO) \
$(LIBTOOL_EXPORT_OPTIONS) \
......@@ -560,8 +558,8 @@ libgdk_pixbuf_3_0_la_LDFLAGS = \
$(gdk_pixbuf_symbols)
libgdk_pixbuf_3_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32)
libgdk_pixbuf_3_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res)
libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32)
libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res)
gdk_pixbuf_headers = \
gdk-pixbuf.h \
......@@ -677,15 +675,15 @@ EXTRA_DIST += \
if HAVE_INTROSPECTION
GdkPixbuf-3.0.gir: libgdk_pixbuf-3.0.la Makefile
GdkPixbuf_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
GdkPixbuf_3_0_gir_INCLUDES = GModule-2.0 Gio-2.0
GdkPixbuf_3_0_gir_LIBS = libgdk_pixbuf-3.0.la
GdkPixbuf_3_0_gir_CFLAGS = $(INCLUDES)
GdkPixbuf_3_0_gir_FILES = \
GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile
GdkPixbuf_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0
GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la
GdkPixbuf_2_0_gir_CFLAGS = $(INCLUDES)
GdkPixbuf_2_0_gir_FILES = \
$(addprefix $(srcdir)/,$(libgdk_pixbufinclude_HEADERS)) \
$(addprefix $(srcdir)/,$(libgdk_pixbuf_3_0_la_SOURCES))
INTROSPECTION_GIRS += GdkPixbuf-3.0.gir
$(addprefix $(srcdir)/,$(libgdk_pixbuf_2_0_la_SOURCES))
INTROSPECTION_GIRS += GdkPixbuf-2.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
......@@ -710,19 +708,19 @@ endif
# after the libraries are installed in their final locations.
install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/loaders.cache ; \
$(mkinstalldirs) $(DESTDIR)$(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION) ; \
$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-2.0 > $(DESTDIR)$(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loaders.cache ; \
else \
echo "***" ; \
echo "*** Warning: loaders.cache not built" ; \
echo "***" ; \
echo "*** Generate this file manually on host" ; \
echo "*** system using gdk-pixbuf-query-loaders-3.0" ; \
echo "*** system using gdk-pixbuf-query-loaders-2.0" ; \
echo "***" ; \
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
rm -f $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/loaders.cache
rm -f $(DESTDIR)$(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loaders.cache
if CROSS_COMPILING
else
......@@ -730,11 +728,11 @@ all-local: loaders.cache
endif
if BUILD_DYNAMIC_MODULES
loaders.cache: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders-3.0$(EXEEXT)
loaders.cache: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders-2.0$(EXEEXT)
LOADERS=`echo libpixbufloader-*.la` ; \
if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
echo "Writing a loaders.cache file to use when running examples before installing gdk-pixbuf."; \
$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 $$LOADERS > ./loaders.cache ;\
$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-2.0 $$LOADERS > ./loaders.cache ;\
else \
echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
touch loaders.cache; \
......
#! /bin/sh
cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
nm -D -g --defined-only .libs/libgdk_pixbuf-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
nm -D -g --defined-only .libs/libgdk_pixbuf-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
......@@ -25,8 +25,6 @@
#include "config.h"
#include <errno.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-i18n.h"
#include "gdk-pixbuf-animation.h"
#include "gdk-pixbuf-alias.h"
......
......@@ -18,9 +18,6 @@
*/
#include "config.h"
#define __GTK_H_INSIDE__
#include "../gtk/gtkversion.h" /* versioning */
#undef __GTK_H_INSIDE__
#include "gdk-pixbuf.h"
#include "gdk-pixdata.h"
#include <glib/gprintf.h>
......@@ -32,7 +29,7 @@
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "Gdk-Pixbuf-CSource"
#define PRG_NAME "gdk-pixbuf-csource-3.0"
#define PKG_NAME "GTK+"
#define PKG_NAME "gdk-pixbuf"
#define PKG_HTTP_HOME "http://www.gtk.org"
......@@ -274,7 +271,7 @@ print_blurb (FILE *bout,
if (!print_help)
{
g_fprintf (bout, "%s version ", PRG_NAME);
g_fprintf (bout, "%d.%d.%d", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
g_fprintf (bout, "%s", GDK_PIXBUF_VERSION);
g_fprintf (bout, "\n");
g_fprintf (bout, "%s comes with ABSOLUTELY NO WARRANTY.\n", PRG_NAME);
g_fprintf (bout, "You may redistribute copies of %s under the terms of\n", PRG_NAME);
......
......@@ -21,12 +21,19 @@
#define __GDKPIXBUFINTL_H__
#include "config.h"
#include <glib/gi18n-lib.h>
#include <glib.h>
#ifdef ENABLE_NLS
#define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String)
#define _(String) gdk_pixbuf_gettext(String)
#define P_(String) gdk_pixbuf_gettext(String)
#define N_(String) (String)
#else
#define _(String) (String)
#define P_(String) (String)
#define N_(String) (String)
#endif
const gchar *
gdk_pixbuf_gettext (const gchar *msgid) G_GNUC_FORMAT(1);
#endif
......@@ -36,7 +36,6 @@
#include <gio/gio.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-loader.h"
#include "gdk-pixbuf-alias.h"
......@@ -268,14 +267,14 @@ get_sysconfdir (void)
return sysconfdir;
}
#undef GTK_SYSCONFDIR
#define GTK_SYSCONFDIR get_sysconfdir()
#undef GDK_PIXBUF_SYSCONFDIR
#define GDK_PIXBUF_SYSCONFDIR get_sysconfdir()
static void
correct_prefix (gchar **path)
{
if (strncmp (*path, GTK_PREFIX "/", strlen (GTK_PREFIX "/")) == 0 ||
strncmp (*path, GTK_PREFIX "\\", strlen (GTK_PREFIX "\\")) == 0)
if (strncmp (*path, GDK_PIXBUF_PREFIX "/", strlen (GDK_PIXBUF_PREFIX "/")) == 0 ||
strncmp (*path, GDK_PIXBUF_PREFIX "\\", strlen (GDK_PIXBUF_PREFIX "\\")) == 0)
{
gchar *tem = NULL;
if (strlen(*path) > 5 && strncmp (*path - 5, ".libs", 5) == 0)
......@@ -285,14 +284,14 @@ correct_prefix (gchar **path)
}
/* This is an entry put there by gdk-pixbuf-query-loaders on the
* packager's system. On Windows a prebuilt GTK+ package can be
* packager's system. On Windows a prebuilt gdk-pixbuf package can be
* installed in a random location. The gdk-pixbuf.loaders file
* distributed in such a package contains paths from the package
* builder's machine. Replace the build-time prefix with the
* installation prefix on this machine.
*/
tem = *path;
*path = g_strconcat (get_toplevel (), tem + strlen (GTK_PREFIX), NULL);
*path = g_strconcat (get_toplevel (), tem + strlen (GDK_PIXBUF_PREFIX), NULL);
g_free (tem);
}
}
......@@ -305,7 +304,7 @@ gdk_pixbuf_get_module_file (void)
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)
result = g_build_filename (GTK_LIBDIR, "gtk-3.0", GTK_BINARY_VERSION, "loaders.cache", NULL);
result = g_build_filename (GDK_PIXBUF_LIBDIR, "gdk-pixbuf-2.0", GDK_PIXBUF_BINARY_VERSION, "loaders.cache", NULL);
return result;
}
......@@ -727,7 +726,7 @@ gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
g_set_error (error,
GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_FAILED,
_("Image-loading module %s does not export the proper interface; perhaps it's from a different GTK version?"),
_("Image-loading module %s does not export the proper interface; perhaps it's from a different gdk-pixbuf version?"),
path);
return FALSE;
}
......
......@@ -30,7 +30,6 @@
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-animation.h"
#include "gdk-pixbuf-scaled-anim.h"
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-loader.h"
#include "gdk-pixbuf-marshal.h"
#include "gdk-pixbuf-alias.h"
......
......@@ -27,10 +27,14 @@
#ifndef GDK_PIXBUF_PRIVATE_H
#define GDK_PIXBUF_PRIVATE_H
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-i18n.h"
#include <stdio.h>
#include <glib-object.h>
#include "gdk-pixbuf-core.h"
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-i18n.h"
typedef struct _GdkPixbufClass GdkPixbufClass;
......
......@@ -23,6 +23,7 @@
#include "config.h"
#include <math.h>
#include <string.h>
#include "gdk-pixbuf-transform.h"
#include "gdk-pixbuf-private.h"
#include "pixops/pixops.h"
#include "gdk-pixbuf-alias.h"
......
......@@ -31,7 +31,6 @@
#define GDK_PIXBUF_C_COMPILATION
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-simple-anim.h"
#include "gdk-pixbuf-alias.h"
......
......@@ -22,9 +22,12 @@
*/
#include "config.h"
#include <string.h>
#include <libintl.h>
#include "gdk-pixbuf-transform.h"
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-alias.h"
#include <string.h>
......@@ -331,6 +334,22 @@ gdk_pixbuf_apply_embedded_orientation (GdkPixbuf *src)
return dest;
}
const gchar *
gdk_pixbuf_gettext (const gchar *msgid)
{
static gsize gettext_initialized = FALSE;
if (G_UNLIKELY (g_once_init_enter (&gettext_initialized))) {
bindtextdomain (GETTEXT_PACKAGE, GDK_PIXBUF_LOCALEDIR);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
g_once_init_leave (&gettext_initialized, TRUE);
}
return g_dgettext (GETTEXT_PACKAGE, msgid);
}
#define __GDK_PIXBUF_UTIL_C__
#include "gdk-pixbuf-aliasdef.c"
......
......@@ -24,12 +24,16 @@
*/
#include "config.h"
#include <math.h>
#include <stdlib.h>
#include <string.h>
#define GDK_PIXBUF_C_COMPILATION
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-features.h"
#include "gdk-pixbuf-enum-types.h"
/* Include the marshallers */
#include <glib-object.h>
#include "gdk-pixbuf-marshal.c"
......
......@@ -85,6 +85,12 @@ gdk_pixbuf_apply_embedded_orientation
#endif
#endif
#if IN_HEADER(__GDKPIXBUFINTL_H__)
#if IN_FILE(__GDK_PIXBUF_UTIL_C__)
gdk_pixbuf_gettext
#endif
#endif
#if IN_HEADER(GDK_PIXBUF_TRANSFORM_H)
#if IN_FILE(__GDK_PIXBUF_SCALE_C__)
gdk_pixbuf_rotate_simple
......
......@@ -609,7 +609,7 @@ save_rle_decoder (GString *gstring,
* Generates C source code suitable for compiling images directly
* into programs.
*
* GTK+ ships with a program called <command>gdk-pixbuf-csource</command>
* gdk-pixbuf ships with a program called <command>gdk-pixbuf-csource</command>
* which offers a command line interface to this function.
*
* Returns: a newly-allocated string containing the C source form
......@@ -851,7 +851,7 @@ gdk_pixdata_to_csource (GdkPixdata *pixdata,
* ship a program with images, but don't want to depend on any
* external files.
*
* GTK+ ships with a program called <command>gdk-pixbuf-csource</command>
* gdk-pixbuf ships with a program called <command>gdk-pixbuf-csource</command>
* which allows for conversion of #GdkPixbufs into such a inline representation.
* In almost all cases, you should pass the <option>--raw</option> flag to
* <command>gdk-pixbuf-csource</command>. A sample invocation would be:
......
......@@ -23,7 +23,6 @@
#include "config.h"
#include <errno.h>
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-private.h"
#include "io-ani-animation.h"
......
......@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <string.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-loader.h"
#include "io-ani-animation.h"
static int
......
......@@ -31,7 +31,6 @@
#endif
#include <string.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#define DUMPBIH 0
......
......@@ -24,6 +24,7 @@
#include "config.h"
#include <errno.h>
#include "gdk-pixbuf-transform.h"
#include "gdk-pixbuf-private.h"
#include "io-gif-animation.h"
......
......@@ -58,7 +58,6 @@
#include <string.h>
#include <errno.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include "io-gif-animation.h"
......
......@@ -27,7 +27,7 @@
#include <errno.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-loader.h"
G_MODULE_EXPORT void fill_vtable (GdkPixbufModule * module);
G_MODULE_EXPORT void fill_info (GdkPixbufFormat * info);
......
......@@ -41,9 +41,8 @@ Known bugs:
#include <unistd.h>
#endif
#include <string.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include <errno.h>
#include "gdk-pixbuf-private.h"
......
......@@ -24,7 +24,6 @@
#include <errno.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include <jasper/jasper.h>
......
......@@ -35,7 +35,6 @@
#include <jpeglib.h>
#include <jerror.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#ifndef HAVE_SIGSETJMP
#define sigjmp_buf jmp_buf
......
......@@ -25,7 +25,6 @@
#include <stdio.h>
#include <string.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#undef PCX_DEBUG
......
......@@ -28,7 +28,6 @@
#include <stdlib.h>
#include <png.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
......
......@@ -28,7 +28,6 @@
#include <string.h>
#include <setjmp.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#define PNM_BUF_SIZE 4096
......
......@@ -33,7 +33,6 @@
#include <setjmp.h>
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
/***
* Definitions
......
......@@ -38,7 +38,6 @@ Known bugs:
#endif
#include <string.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
......
......@@ -36,7 +36,6 @@
#include <string.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#undef DEBUG_TGA
......
......@@ -36,7 +36,6 @@
#include <tiffio.h>
#include <errno.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#ifdef G_OS_WIN32
#include <fcntl.h>
......
......@@ -36,7 +36,6 @@ Known bugs:
#endif
#include <string.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
......
......@@ -38,7 +38,6 @@
#include <stdio.h>
#include <errno.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include <glib/gstdio.h>
......
......@@ -33,7 +33,6 @@
#endif
#include <errno.h>
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h"
#include <glib/gstdio.h>
......
......@@ -36,7 +36,6 @@
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-private.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#ifdef USE_LA_MODULES
#define SOEXT ".la"
......@@ -219,7 +218,7 @@ gdk_pixbuf_get_module_file (void)
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)
result = g_build_filename (GTK_LIBDIR, "gtk-3.0", GTK_BINARY_VERSION, "loaders.cache", NULL);
result = g_build_filename (GDK_PIXBUF_LIBDIR, "gdk-pixbuf-2.0", GDK_PIXBUF_BINARY_VERSION, "loaders.cache", NULL);
return result;
}
......@@ -237,9 +236,9 @@ int main (int argc, char **argv)
gchar *runtime_prefix;
gchar *slash;
if (g_ascii_strncasecmp (PIXBUF_LIBDIR, GTK_PREFIX, strlen (GTK_PREFIX)) == 0 &&
G_IS_DIR_SEPARATOR (PIXBUF_LIBDIR[strlen (GTK_PREFIX)])) {
/* GTK_PREFIX is a prefix of PIXBUF_LIBDIR, as it
if (g_ascii_strncasecmp (PIXBUF_LIBDIR, GDK_PIXBUF_PREFIX, strlen (GDK_PIXBUF_PREFIX)) == 0 &&
G_IS_DIR_SEPARATOR (PIXBUF_LIBDIR[strlen (GDK_PIXBUF_PREFIX)])) {
/* GDK_PIXBUF_PREFIX is a prefix of PIXBUF_LIBDIR, as it
* normally is. Replace that prefix in PIXBUF_LIBDIR
* with the installation directory on this machine.
* We assume this invokation of
......@@ -271,7 +270,7 @@ int main (int argc, char **argv)
libdir = g_strconcat (runtime_prefix,
"/",
PIXBUF_LIBDIR + strlen (GTK_PREFIX) + 1,
PIXBUF_LIBDIR + strlen (GDK_PIXBUF_PREFIX) + 1,
NULL);
}
}
......
This diff is collapsed.
This diff is collapsed.
# Files from the Gtk distribution which have already been
# marked to allow runtime translation of messages
gdk/directfb/gdkdisplay-directfb.c
gdk/gdk.c
gdk/gdkdisplaymanager.c
gdk/gdkpango.c
gdk/gdkscreen.c
gdk/gdkwindow.c
gdk/keyname-table.h
# List of source files which contain translatable strings.
gdk-pixbuf/gdk-pixbuf-animation.c
gdk-pixbuf/gdk-pixbuf.c
gdk-pixbuf/gdk-pixbuf-data.c
......@@ -39,229 +31,3 @@ gdk-pixbuf/io-gdip-jpeg.c
gdk-pixbuf/io-gdip-png.c
gdk-pixbuf/io-gdip-utils.c
gdk-pixbuf/io-gdip-wmf.c
gdk/win32/gdkmain-win32.c
gdk/x11/gdkmain-x11.c
gdk/x11/gdkapplaunchcontext-x11.c
gtk/gtkaboutdialog.c
gtk/gtkaccelgroup.c
gtk/gtkaccellabel.c
gtk/gtkaccelmap.c
gtk/gtkaccessible.c