summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2001-11-06 00:40:19 +0000
committerTor Lillqvist <tml@src.gnome.org>2001-11-06 00:40:19 +0000
commit9af1351da5732a0295e31c7673ec7843ef65efa8 (patch)
treeec52ca8cb596448d0559ee1480c8fd18c925b12a
parent5e362e191bcc6b78bdd8b445ae2285d9eae331bc (diff)
downloadgtk+-9af1351da5732a0295e31c7673ec7843ef65efa8.tar.gz
Do search GTK_BINARY_VERSION -specific directory on Windows, too (#63759).
2001-11-06 Tor Lillqvist <tml@iki.fi> * gtk/gtkmain.c (find_module): Do search GTK_BINARY_VERSION -specific directory on Windows, too (#63759).
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtkmain.c2
8 files changed, 35 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f34bfae10..32752203c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-06 Tor Lillqvist <tml@iki.fi>
+
+ * gtk/gtkmain.c (find_module): Do search GTK_BINARY_VERSION
+ -specific directory on Windows, too (#63759).
+
Mon Nov 5 12:46:44 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2f34bfae10..32752203c3 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-11-06 Tor Lillqvist <tml@iki.fi>
+
+ * gtk/gtkmain.c (find_module): Do search GTK_BINARY_VERSION
+ -specific directory on Windows, too (#63759).
+
Mon Nov 5 12:46:44 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2f34bfae10..32752203c3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-11-06 Tor Lillqvist <tml@iki.fi>
+
+ * gtk/gtkmain.c (find_module): Do search GTK_BINARY_VERSION
+ -specific directory on Windows, too (#63759).
+
Mon Nov 5 12:46:44 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2f34bfae10..32752203c3 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-11-06 Tor Lillqvist <tml@iki.fi>
+
+ * gtk/gtkmain.c (find_module): Do search GTK_BINARY_VERSION
+ -specific directory on Windows, too (#63759).
+
Mon Nov 5 12:46:44 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2f34bfae10..32752203c3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-11-06 Tor Lillqvist <tml@iki.fi>
+
+ * gtk/gtkmain.c (find_module): Do search GTK_BINARY_VERSION
+ -specific directory on Windows, too (#63759).
+
Mon Nov 5 12:46:44 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2f34bfae10..32752203c3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-11-06 Tor Lillqvist <tml@iki.fi>
+
+ * gtk/gtkmain.c (find_module): Do search GTK_BINARY_VERSION
+ -specific directory on Windows, too (#63759).
+
Mon Nov 5 12:46:44 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2f34bfae10..32752203c3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-11-06 Tor Lillqvist <tml@iki.fi>
+
+ * gtk/gtkmain.c (find_module): Do search GTK_BINARY_VERSION
+ -specific directory on Windows, too (#63759).
+
Mon Nov 5 12:46:44 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 9e84e03acc..6e6c9452cc 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -320,7 +320,6 @@ find_module (gchar **module_path,
{
gchar *version_directory;
-#ifndef G_OS_WIN32 /* ignoring GTK_BINARY_VERSION elsewhere too */
version_directory = g_build_filename (module_path[i], GTK_BINARY_VERSION, NULL);
module_name = g_module_build_path (version_directory, name);
g_free (version_directory);
@@ -333,7 +332,6 @@ find_module (gchar **module_path,
}
g_free (module_name);
-#endif
module_name = g_module_build_path (module_path[i], name);