1
Index: gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c
2
===================================================================
3
--- gtk+2.0-2.10.11.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:36.000000000 +0200
4
+++ gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:40.000000000 +0200
6
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
9
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
12
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
13
+# if defined (__i386__)
14
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.32", NULL);
16
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.64", NULL);
18
+ /* Prefer compat gdk-pixbuf.loaders file if it's usable. */
19
+ if (g_file_test(result, G_FILE_TEST_EXISTS))
23
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
28
Index: gtk+2.0-2.10.11/gtk/gtkrc.c
29
===================================================================
30
--- gtk+2.0-2.10.11.orig/gtk/gtkrc.c 2007-04-13 10:56:36.000000000 +0200
31
+++ gtk+2.0-2.10.11/gtk/gtkrc.c 2007-04-13 10:56:40.000000000 +0200
34
result = g_strdup (im_module_file);
36
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
38
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
39
+# if defined (__i386__)
40
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.32", NULL);
42
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.64", NULL);
44
+ /* Prefer compat gtk.immodules file if it's usable. */
45
+ if (g_file_test(result, G_FILE_TEST_EXISTS))
49
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
58
- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
59
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
60
+# if defined (__i386__)
61
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.32", NULL);
63
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.64", NULL);
65
+ /* Prefer compat gtkrc if it's usable. */
66
+ if (!g_file_test(str, G_FILE_TEST_EXISTS))
68
+ g_free (str), /* continue in next line */
70
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
71
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
75
gtk_rc_add_default_file (str);
78
home = g_get_home_dir ();
81
- str = g_build_filename (home, ".gtkrc-2.0", NULL);
82
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
83
+# if defined (__i386__)
84
+ str = g_build_filename (home, ".gtkrc-2.0.32", NULL);
86
+ str = g_build_filename (home, ".gtkrc-2.0.64", NULL);
88
+ /* Prefer compat .gtkrc-2.0 if it's usable. */
89
+ if (!g_file_test(str, G_FILE_TEST_EXISTS))
91
+ g_free (str), /* continue in next line */
93
+ str = g_build_filename (home, ".gtkrc-2.0", NULL);
94
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
97
gtk_rc_add_default_file (str);