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).

diff --git a/ChangeLog b/ChangeLog
index 2f34bfae108d91ac403cdbdec8453a594e579ba3..32752203c355480ed8ada43d8f641fe220a6ce22 100644 (file)
--- 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 2f34bfae108d91ac403cdbdec8453a594e579ba3..32752203c355480ed8ada43d8f641fe220a6ce22 100644 (file)
--- 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 2f34bfae108d91ac403cdbdec8453a594e579ba3..32752203c355480ed8ada43d8f641fe220a6ce22 100644 (file)
--- 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 2f34bfae108d91ac403cdbdec8453a594e579ba3..32752203c355480ed8ada43d8f641fe220a6ce22 100644 (file)
--- 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 2f34bfae108d91ac403cdbdec8453a594e579ba3..32752203c355480ed8ada43d8f641fe220a6ce22 100644 (file)
--- 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 2f34bfae108d91ac403cdbdec8453a594e579ba3..32752203c355480ed8ada43d8f641fe220a6ce22 100644 (file)
--- 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 2f34bfae108d91ac403cdbdec8453a594e579ba3..32752203c355480ed8ada43d8f641fe220a6ce22 100644 (file)
--- 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 9e84e03accdcb9f013b922f7aa5b3b39e1a7cf2d..6e6c9452cc467ae4d51667cb1a7f35d0802ae45e 100644 (file)
--- 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);