From b47b15f6ba401c735d415e65d1fa7620e3546968 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 3 Mar 2002 04:16:30 +0000 Subject: Fixes for uninstalled operation with module suffixes other than .so and in Sat Mar 2 23:08:23 2002 Owen Taylor Fixes for uninstalled operation with module suffixes other than .so and in general for platforms like AIX where the module suffix isn't predictable. (#72185, problems reported by Miroslaw Dobrzanski-Neumann) * modules/input/Makefile.am (gtk.immodules): Query .la files rather than shared objects in .libs when creating the uninstalled gtk.immodules file. * gtk/gtkmain.c (_gtk_find_module): Look for .la files after looking for the normal soname extension to handle cases where the soname extension isn't predictable, like AIX. * gtk/gtkthemes.c (gtk_theme_engine_load): Don't call g_module_build_path... leave that to gtk_rc_find_module_in_path. * demos/gtk-demo/main.c (main) demos/pixbuf-init.c (pixbuf_init): tests/testgtk.c (test_init): tests/testtext.c (test_init) tests/testdnd.c (test_init): Point gdk-pixbuf to .la files rather than poking in .libs for .so files. * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): Remove .libs from GDK_PIXBUF_MODULEDIR. --- gtk/gtkthemes.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gtk/gtkthemes.c') diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c index 6bb3e7e636..b17668eb8a 100644 --- a/gtk/gtkthemes.c +++ b/gtk/gtkthemes.c @@ -60,23 +60,17 @@ gtk_theme_engine_load (GTypeModule *module) { GtkThemeEngine *engine = GTK_THEME_ENGINE (module); - gchar *fullname; gchar *engine_path; - fullname = g_module_build_path (NULL, engine->name); - engine_path = gtk_rc_find_module_in_path (fullname); + engine_path = gtk_rc_find_module_in_path (engine->name); if (!engine_path) { g_warning (_("Unable to locate theme engine in module_path: \"%s\","), - fullname); - - g_free (fullname); + engine->name); return FALSE; } - g_free (fullname); - /* load the lib */ GTK_NOTE (MISC, g_message ("Loading Theme %s\n", engine_path)); -- cgit v1.2.1