callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2ca2e6d5ea7095840a318db39dad52b51df5648d
gtk3/debian/patches/021_loader-files-d.patch
Josselin Mouette 2ca2e6d5ea * 020_immodules-files-d.patch, 021_loader-files-d.patch: read the 
GDK_PIXBUF_MODULE_FILE and GTK_IM_MODULE_FILE variables before the 
  Debian directories. Thanks Thadeu Lima de Souza Cascardo.
  Closes: #439004.
2007-10-11 21:26:13 +00:00

320 lines
7.8 KiB
Diff
Raw Blame History

Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-06 13:43:15.000000000 +0200
+++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:57:45.000000000 +0200
@@ -45,6 +45,9 @@
#undef STRICT
#endif
+#define LOADERFILEEXT ".loaders"
+#define LOADERFILEEXT_LEN ((int) strlen (LOADERFILEEXT))
+
static gint
format_check (GdkPixbufModule *module, guchar *buffer, int size)
{
@@ -284,87 +287,93 @@
#endif /* USE_GMODULE */
+/* FIXME this is a static copy of a public pango function which should really
+ * livein glib */
+static char *
+_ugly_copy_of_pango_trim_string (const char *str)
+{
+ int len;
+
+ g_return_val_if_fail (str != NULL, NULL);
+
+ while (*str && g_ascii_isspace (*str))
+ str++;
+
+ len = strlen (str);
+ while (len > 0 && g_ascii_isspace (str[len-1]))
+ len--;
+
+ return g_strndup (str, len);
+}
+
+/* FIXME this is a static copy of a public pango function which should really
+ * livein glib */
+char **
+_ugly_copy_of_pango_split_file_list (const char *str)
+{
+ int i = 0;
+ int j;
+ char **files;
+
+ files = g_strsplit (str, G_SEARCHPATH_SEPARATOR_S, -1);
+
+ while (files[i])
+ {
+ char *file = _ugly_copy_of_pango_trim_string (files[i]);
+
+ /* If the resulting file is empty, skip it */
+ if (file[0] == '\0')
+ {
+ g_free(file);
+ g_free (files[i]);
+
+ for (j = i + 1; files[j]; j++)
+ files[j - 1] = files[j];
+
+ files[j - 1] = NULL;
+
+ continue;
+ }
+#ifndef G_OS_WIN32
+ /* '~' is a quite normal and common character in file names on
+ * Windows, especially in the 8.3 versions of long file names, which
+ * still occur now and then. Also, few Windows user are aware of the
+ * Unix shell convention that '~' stands for the home directory,
+ * even if they happen to have a home directory.
+ */
+ if (file[0] == '~' && file[1] == G_DIR_SEPARATOR)
+ {
+ char *tmp = g_strconcat (g_get_home_dir(), file + 1, NULL);
+ g_free (file);
+ file = tmp;
+ }
+ else if (file[0] == '~' && file[1] == '\0')
+ {
+ g_free (file);
+ file = g_strdup (g_get_home_dir());
+ }
+#endif
+ g_free (files[i]);
+ files[i] = file;
+
+ i++;
+ }
+
+ return files;
+}
+
static void
-gdk_pixbuf_io_init (void)
+process_module_file (const gchar *filename, GIOChannel *channel)
{
-#ifdef USE_GMODULE
- GIOChannel *channel;
gchar *line_buf;
gsize term;
GString *tmp_buf = g_string_new (NULL);
gboolean have_error = FALSE;
GdkPixbufModule *module = NULL;
- gchar *filename = gdk_pixbuf_get_module_file ();
int flags;
int n_patterns = 0;
GdkPixbufModulePattern *pattern;
- GError *error = NULL;
-#endif
- GdkPixbufModule *builtin_module = NULL;
-
-#define load_one_builtin_module(format) \
- builtin_module = g_new0 (GdkPixbufModule, 1); \
- builtin_module->module_name = #format; \
- if (_gdk_pixbuf_load_module (builtin_module, NULL)) \
- file_formats = g_slist_prepend (file_formats, builtin_module);\
- else \
- g_free (builtin_module)
-
-#ifdef INCLUDE_ani
- load_one_builtin_module (ani);
-#endif
-#ifdef INCLUDE_png
- load_one_builtin_module (png);
-#endif
-#ifdef INCLUDE_bmp
- load_one_builtin_module (bmp);
-#endif
-#ifdef INCLUDE_wbmp
- load_one_builtin_module (wbmp);
-#endif
-#ifdef INCLUDE_gif
- load_one_builtin_module (gif);
-#endif
-#ifdef INCLUDE_ico
- load_one_builtin_module (ico);
-#endif
-#ifdef INCLUDE_jpeg
- load_one_builtin_module (jpeg);
-#endif
-#ifdef INCLUDE_pnm
- load_one_builtin_module (pnm);
-#endif
-#ifdef INCLUDE_ras
- load_one_builtin_module (ras);
-#endif
-#ifdef INCLUDE_tiff
- load_one_builtin_module (tiff);
-#endif
-#ifdef INCLUDE_xpm
- load_one_builtin_module (xpm);
-#endif
-#ifdef INCLUDE_xbm
- load_one_builtin_module (xbm);
-#endif
-#ifdef INCLUDE_tga
- load_one_builtin_module (tga);
-#endif
-#ifdef INCLUDE_pcx
- load_one_builtin_module (pcx);
-#endif
-
-#undef load_one_builtin_module
-#ifdef USE_GMODULE
- channel = g_io_channel_new_file (filename, "r", &error);
- if (!channel) {
- /* Don't bother warning if we have some built-in loaders */
- if (file_formats == NULL)
- g_warning ("Cannot open pixbuf loader module file '%s': %s",
- filename, error->message);
- return;
- }
-
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
const char *p;
@@ -497,8 +506,138 @@
g_free (line_buf);
}
g_string_free (tmp_buf, TRUE);
- g_io_channel_unref (channel);
- g_free (filename);
+}
+
+static void
+gdk_pixbuf_io_init (void)
+{
+#ifdef USE_GMODULE
+ GIOChannel *channel;
+ gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
+ /* FIXME: using an absolute path requires patching Makefile.am */
+ gchar *gdkpixbuf_module_files_d_str = g_build_filename (PIXBUF_LIBDIR,
+ "..",
+ "loader-files.d",
+ NULL);
+ gchar *list_str;
+ char **files;
+ GError *error = NULL;
+ int n;
+#endif
+ GdkPixbufModule *builtin_module = NULL;
+
+#define load_one_builtin_module(format) \
+ builtin_module = g_new0 (GdkPixbufModule, 1); \
+ builtin_module->module_name = #format; \
+ if (_gdk_pixbuf_load_module (builtin_module, NULL)) \
+ file_formats = g_slist_prepend (file_formats, builtin_module);\
+ else \
+ g_free (builtin_module)
+
+#ifdef INCLUDE_ani
+ load_one_builtin_module (ani);
+#endif
+#ifdef INCLUDE_png
+ load_one_builtin_module (png);
+#endif
+#ifdef INCLUDE_bmp
+ load_one_builtin_module (bmp);
+#endif
+#ifdef INCLUDE_wbmp
+ load_one_builtin_module (wbmp);
+#endif
+#ifdef INCLUDE_gif
+ load_one_builtin_module (gif);
+#endif
+#ifdef INCLUDE_ico
+ load_one_builtin_module (ico);
+#endif
+#ifdef INCLUDE_jpeg
+ load_one_builtin_module (jpeg);
+#endif
+#ifdef INCLUDE_pnm
+ load_one_builtin_module (pnm);
+#endif
+#ifdef INCLUDE_ras
+ load_one_builtin_module (ras);
+#endif
+#ifdef INCLUDE_tiff
+ load_one_builtin_module (tiff);
+#endif
+#ifdef INCLUDE_xpm
+ load_one_builtin_module (xpm);
+#endif
+#ifdef INCLUDE_xbm
+ load_one_builtin_module (xbm);
+#endif
+#ifdef INCLUDE_tga
+ load_one_builtin_module (tga);
+#endif
+#ifdef INCLUDE_pcx
+ load_one_builtin_module (pcx);
+#endif
+
+#undef load_one_builtin_module
+
+#ifdef USE_GMODULE
+ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
+ gdkpixbuf_module_files_d_str,
+ gdkpixbuf_module_file_str,
+ NULL);
+
+ files = _ugly_copy_of_pango_split_file_list (list_str);
+
+ n = 0;
+ while (files[n])
+ n++;
+
+ while (n-- > 0) {
+ GDir *dir = g_dir_open (files[n], 0, NULL);
+ if (dir) {
+ const char *dent;
+
+ while ((dent = g_dir_read_name (dir))) {
+ int len = strlen (dent);
+ if (len > LOADERFILEEXT_LEN && strcmp (dent + len - LOADERFILEEXT_LEN, LOADERFILEEXT) == 0) {
+ gchar *pathname = g_build_filename (files[n], dent, NULL);
+ channel = g_io_channel_new_file (pathname, "r", &error);
+ if (!channel) {
+ /* we don't care about issuing a warning
+ * g_warning ("Cannot open pixbuf loader module file '%s': %s",
+ * pathname,
+ * error->message);
+ */
+ g_error_free (error);
+ error = NULL;
+ } else {
+ process_module_file (pathname, channel);
+ g_io_channel_unref (channel);
+ }
+ g_free (pathname);
+ }
+ }
+ g_dir_close (dir);
+ } else {
+ channel = g_io_channel_new_file (files[n], "r", &error);
+ if (!channel) {
+ /* we don't care about issuing a warning
+ * g_warning ("Cannot open pixbuf loader module file '%s': %s",
+ * files[n],
+ * error->message);
+ */
+ g_error_free (error);
+ error = NULL;
+ } else {
+ process_module_file (files[n], channel);
+ g_io_channel_unref (channel);
+ }
+ }
+ }
+
+ g_strfreev (files);
+ g_free (list_str);
+ g_free (gdkpixbuf_module_files_d_str);
+ g_free (gdkpixbuf_module_file_str);
#endif
}
Reference in New Issue View Git Blame Copy Permalink