[uim-commit] r3157 - trunk/emacs

[ekato at freedesktop.org]

Author: ekato
Date: 2006-03-02 18:34:36 -0800 (Thu, 02 Mar 2006)
New Revision: 3157

Modified:
   trunk/emacs/callback.c
   trunk/emacs/helper.c
Log:
* emacs/callback.c (switch_app_global_im_cb) : Fix the behavior as
  intended.
(switch_system_global_im_cb) : Ditto.
* emacs/helper.c (helper_send_im_change_whole_desktop) : Fix
  message.


Modified: trunk/emacs/callback.c
===================================================================
--- trunk/emacs/callback.c	2006-03-02 20:15:32 UTC (rev 3156)
+++ trunk/emacs/callback.c	2006-03-03 02:34:36 UTC (rev 3157)
@@ -157,7 +157,10 @@
 void
 switch_app_global_im_cb(void *ptr, const char *name)
 {
-  helper_send_im_change_whole_desktop(name);
+  /* change default */
+  update_default_engine(name);
+
+  switch_context_im_all(name);
 }
 
 
@@ -168,5 +171,6 @@
   update_default_engine(name);
 
   switch_context_im_all(name);
+  helper_send_im_change_whole_desktop(name);
 }
 

Modified: trunk/emacs/helper.c
===================================================================
--- trunk/emacs/helper.c	2006-03-02 20:15:32 UTC (rev 3156)
+++ trunk/emacs/helper.c	2006-03-03 02:34:36 UTC (rev 3157)
@@ -110,7 +110,7 @@
   int len = 0;
   char *buf;
 
-#define HEADER_FORMAT "im_change_this_application_only\n%s\n"
+#define HEADER_FORMAT "im_change_whole_desktop\n%s\n"
 
   len += strlen(HEADER_FORMAT);
   len += name ? strlen(name) : 0;