X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=modules%2Finput%2Fimxim.c;h=fd8f38bb5483567ca7dfbca91dbc8e2a1547fc87;hb=9d0febc9a64a5bfb0fcfc3a88de4757f6c1ff090;hp=f37a57ae50250d5ff98a1f30359575423a03c70a;hpb=39fc3c9a3c8ff8d1192766a33a55b575f5324ca0;p=~andy%2Fgtk

diff --git a/modules/input/imxim.c b/modules/input/imxim.c
index f37a57ae5..fd8f38bb5 100644
--- a/modules/input/imxim.c
+++ b/modules/input/imxim.c
@@ -12,11 +12,10 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "gtk/gtkintl.h"
 #include "gtk/gtkimmodule.h"
 #include "gtkimcontextxim.h"
@@ -25,36 +24,39 @@
 static const GtkIMContextInfo xim_ja_info = { 
   "xim",		           /* ID */
   N_("X Input Method"),            /* Human readable name */
-  "gtk+",			   /* Translation domain */
-   GTK_LOCALEDIR,		   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
-  "ko:ja:zh"		           /* Languages for which this module is the default */
+  GETTEXT_PACKAGE,		   /* Translation domain */
+  GTK_LOCALEDIR,		   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
+  "ko:ja:th:zh"		           /* Languages for which this module is the default */
 };
 
 static const GtkIMContextInfo *info_list[] = {
   &xim_ja_info
 };
 
-void
-im_module_init (GTypeModule *type_module)
+#ifndef INCLUDE_IM_xim
+#define MODULE_ENTRY(type, function) G_MODULE_EXPORT type im_module_ ## function
+#else
+#define MODULE_ENTRY(type, function) type _gtk_immodule_xim_ ## function
+#endif
+
+MODULE_ENTRY (void, init) (GTypeModule *type_module)
 {
   gtk_im_context_xim_register_type (type_module);
 }
 
-void 
-im_module_exit (void)
+MODULE_ENTRY (void, exit) (void)
 {
+  gtk_im_context_xim_shutdown ();
 }
 
-void 
-im_module_list (const GtkIMContextInfo ***contexts,
-		int                      *n_contexts)
+MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
+			   int                      *n_contexts)
 {
   *contexts = info_list;
   *n_contexts = G_N_ELEMENTS (info_list);
 }
 
-GtkIMContext *
-im_module_create (const gchar *context_id)
+MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
 {
   if (strcmp (context_id, "xim") == 0)
     return gtk_im_context_xim_new ();