diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-03 04:16:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-03 04:16:30 +0000 |
| commit | b47b15f6ba401c735d415e65d1fa7620e3546968 (patch) | |
| tree | b75d276379a8b722afc17984453dee763a29ae51 /gtk/gtkthemes.c | |
| parent | b3c0813b93a2aa0f39a6b06128e2b7ad9cca9175 (diff) | |
| download | gdk-pixbuf-b47b15f6ba401c735d415e65d1fa7620e3546968.tar.gz | |
Fixes for uninstalled operation with module suffixes other than .so and in
Sat Mar 2 23:08:23 2002 Owen Taylor <otaylor@redhat.com>
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.
Diffstat (limited to 'gtk/gtkthemes.c')
| -rw-r--r-- | gtk/gtkthemes.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c index 6bb3e7e63..b17668eb8 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)); |