callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for uninstalled operation with module suffixes other than .so and in

Browse Source 
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.
This commit is contained in:
Owen Taylor
2002-03-03 04:16:30 +00:00
committed by Owen Taylor
parent b3c0813b93
commit b47b15f6ba
16 changed files with 272 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/testdnd.c
View File

@ -555,10 +555,10 @@ source_drag_data_delete (GtkWidget *widget,
void
test_init ()
{
if (g_file_test ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so",
if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
G_FILE_TEST_EXISTS))
{
putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/");
putenv ("GTK_IM_MODULE_FILE=./gtk.immodules");
}
}

4
tests/testgtk.c
View File

@ -11592,9 +11592,9 @@ create_main_window (void)
static void
test_init ()
{
if (file_exists ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so"))
if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
{
putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf");
putenv ("GTK_IM_MODULE_FILE=../modules/input/gtk.immodules");
}
}

2
tests/testtext.c
View File

@ -2536,7 +2536,7 @@ file_exists (const char *filename)
void
test_init ()
{
if (file_exists ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so"))
if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
{
putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
putenv ("GTK_IM_MODULE_FILE=../modules/input/gtk.immodules");