From 9af1351da5732a0295e31c7673ec7843ef65efa8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 6 Nov 2001 00:40:19 +0000 Subject: [PATCH] Do search GTK_BINARY_VERSION -specific directory on Windows, too (#63759). 2001-11-06 Tor Lillqvist * gtk/gtkmain.c (find_module): Do search GTK_BINARY_VERSION -specific directory on Windows, too (#63759). --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmain.c | 2 -- 8 files changed, 35 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f34bfae1..32752203c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-11-06 Tor Lillqvist + + * 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 * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2f34bfae1..32752203c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-11-06 Tor Lillqvist + + * 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 * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2f34bfae1..32752203c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-11-06 Tor Lillqvist + + * 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 * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2f34bfae1..32752203c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-11-06 Tor Lillqvist + + * 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 * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2f34bfae1..32752203c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-11-06 Tor Lillqvist + + * 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 * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2f34bfae1..32752203c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-11-06 Tor Lillqvist + + * 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 * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2f34bfae1..32752203c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-11-06 Tor Lillqvist + + * 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 * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 9e84e03ac..6e6c9452c 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); -- 2.43.2