Point -rpath to the right install location.

Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>

	* modules/input/Makefile.am (im_xim_la_LDFLAGS): Point
	-rpath to the right install location.

	* modules/input/Makefile.am (im_inuktitut_la_LDFLAGS): Remove
	-export-dynamic.

	* gtk/gtkthemes.c (gtk_theme_engine_get): Set engine->name
	properly.

9 files changed, 83 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c830e7d95..53a706eae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (im_xim_la_LDFLAGS): Point
+	-rpath to the right install location.
+
+	* modules/input/Makefile.am (im_inuktitut_la_LDFLAGS): Remove
+	-export-dynamic.
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Set engine->name
+	properly.
+
 2000-11-15  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): Apply
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c830e7d95..53a706eae 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (im_xim_la_LDFLAGS): Point
+	-rpath to the right install location.
+
+	* modules/input/Makefile.am (im_inuktitut_la_LDFLAGS): Remove
+	-export-dynamic.
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Set engine->name
+	properly.
+
 2000-11-15  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): Apply
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c830e7d95..53a706eae 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (im_xim_la_LDFLAGS): Point
+	-rpath to the right install location.
+
+	* modules/input/Makefile.am (im_inuktitut_la_LDFLAGS): Remove
+	-export-dynamic.
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Set engine->name
+	properly.
+
 2000-11-15  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): Apply
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c830e7d95..53a706eae 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (im_xim_la_LDFLAGS): Point
+	-rpath to the right install location.
+
+	* modules/input/Makefile.am (im_inuktitut_la_LDFLAGS): Remove
+	-export-dynamic.
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Set engine->name
+	properly.
+
 2000-11-15  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): Apply
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c830e7d95..53a706eae 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (im_xim_la_LDFLAGS): Point
+	-rpath to the right install location.
+
+	* modules/input/Makefile.am (im_inuktitut_la_LDFLAGS): Remove
+	-export-dynamic.
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Set engine->name
+	properly.
+
 2000-11-15  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): Apply
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c830e7d95..53a706eae 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (im_xim_la_LDFLAGS): Point
+	-rpath to the right install location.
+
+	* modules/input/Makefile.am (im_inuktitut_la_LDFLAGS): Remove
+	-export-dynamic.
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Set engine->name
+	properly.
+
 2000-11-15  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): Apply
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c830e7d95..53a706eae 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (im_xim_la_LDFLAGS): Point
+	-rpath to the right install location.
+
+	* modules/input/Makefile.am (im_inuktitut_la_LDFLAGS): Remove
+	-export-dynamic.
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Set engine->name
+	properly.
+
 2000-11-15  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): Apply
diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index af3a2cb04..09bdd3ea0 100644
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -175,6 +175,7 @@ gtk_theme_engine_get (const gchar *name)
     {
       result = GTK_THEME_ENGINE (g_object_new (GTK_TYPE_THEME_ENGINE, NULL));
       g_type_module_set_name (G_TYPE_MODULE (result), name);
+      result->name = g_strdup (name);
 
       g_hash_table_insert (engine_hash, result->name, result);
     }
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index f803cba60..44745c053 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -36,19 +36,19 @@ moduledir = $(libdir)/gtk-2.0/$(GTK_VERSION)/immodules
 module_LTLIBRARIES = im-cyrillic-translit.la im-xim.la im-viqr.la im-thai-broken.la \
                      im-inuktitut.la
 
-im_cyrillic_translit_la_LDFLAGS = -rpath $(libdir) -avoid-version -module
+im_cyrillic_translit_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
 im_cyrillic_translit_la_SOURCES = imcyrillic-translit.c
 
-im_thai_broken_la_LDFLAGS = -rpath $(libdir) -avoid-version -module
+im_thai_broken_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
 im_thai_broken_la_SOURCES = imthai-broken.c
 
-im_viqr_la_LDFLAGS = -rpath $(libdir) -avoid-version -module
+im_viqr_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
 im_viqr_la_SOURCES = imviqr.c
 
-im_inuktitut_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
+im_inuktitut_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
 im_inuktitut_la_SOURCES = iminuktitut.c
 
-im_xim_la_LDFLAGS = -rpath $(libdir) -avoid-version -module
+im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
 im_xim_la_SOURCES = 		\
 	gtkimcontextxim.c 	\
 	gtkimcontextxim.h	\