[uim-commit] r2272 - trunk/emacs

[ekato at freedesktop.org]

Author: ekato
Date: 2005-11-28 19:38:53 -0800 (Mon, 28 Nov 2005)
New Revision: 2272

Modified:
   trunk/emacs/callback.c
   trunk/emacs/context.c
   trunk/emacs/helper.c
   trunk/emacs/im.c
   trunk/emacs/preedit.h
   trunk/emacs/prop.c
Log:
2005-11-29 Konosuke Watanabe
* emacs/callback.c
* emacs/context.c
* emacs/helper.c
* emacs/im.c
* emacs/preedit.h
* emacs/prop.c
  - Remove some old comments.


Modified: trunk/emacs/callback.c
===================================================================
--- trunk/emacs/callback.c	2005-11-29 03:35:50 UTC (rev 2271)
+++ trunk/emacs/callback.c	2005-11-29 03:38:53 UTC (rev 2272)
@@ -129,21 +129,6 @@
 }
 
 
-/*
- *
- *  This function is called after key event... maybe...
- *     If it's true, "ptr" is equal to "current" and 
- *    S-expression with new prop_label should be outputted at end
- *    of key processing.
- *
- *  This function is called when IM mode has changed... maybe...
- * 
- *  To notify current IM status to other processes which are 
- *  displaying IM's status (such as uim-toolbar-gtk), 
- *  uim_helper_send_message should be called... maybe...
- *
- */
-
 void
 prop_list_update_cb(void *ptr, const char *str)
 {

Modified: trunk/emacs/context.c
===================================================================
--- trunk/emacs/context.c	2005-11-29 03:35:50 UTC (rev 2271)
+++ trunk/emacs/context.c	2005-11-29 03:38:53 UTC (rev 2272)
@@ -178,19 +178,6 @@
 
   ret->context = create_context(ret->encoding, ret);
 
-  /* 
-	 uim_get_current_im_name doesn't return IM name.
-	 It just returns copy of argument.
-	 Hmm... I just want to know IM name which is in use.
-  */
-  /*
-  if( (im = uim_get_current_im_name(ret->context)) ){
-	ret->im = strdup(im);
-  }else{
-	ret->im = NULL;
-  }
-  */
-
   if ((im = uim_get_default_im_name(setlocale(LC_ALL, NULL))))
 	ret->im = strdup(im);
   else

Modified: trunk/emacs/helper.c
===================================================================
--- trunk/emacs/helper.c	2005-11-29 03:35:50 UTC (rev 2271)
+++ trunk/emacs/helper.c	2005-11-29 03:38:53 UTC (rev 2272)
@@ -128,8 +128,6 @@
 
 	/* change default */
 	update_default_engine(engine_name);
-	  /* if (default_engine_name) free(default_engine_name);
-		 default_engine_name = strdup(engine_name); */
 
 	/* check focus state when change IM of current application */
 	if (strcmp(request, "im_change_whole_desktop") == 0 || current) {

Modified: trunk/emacs/im.c
===================================================================
--- trunk/emacs/im.c	2005-11-29 03:35:50 UTC (rev 2271)
+++ trunk/emacs/im.c	2005-11-29 03:38:53 UTC (rev 2272)
@@ -41,19 +41,7 @@
 
 int default_engine_updated = 0;
 
-/*
-int
-init_default_engine(void)
-{
-  if (default_engine_name) free(default_engine_name);
 
-  default_engine_name 
-	= strdup(uim_get_default_im_name(setlocale(LC_ALL, NULL)));
-
-  return 1;
-}
-*/
-
 void
 update_default_engine(const char *engine_name)
 {
@@ -103,14 +91,6 @@
 
   context = uim_create_context(NULL, "UTF-8", NULL, NULL, NULL, NULL);
 
-  /*
-  if (default_engine_name)
-	a_printf(" ( L \"%s\" ", default_engine_name);
-  else
-	a_printf(" ( L \"%s\" ", uim_get_default_im_name(setlocale(LC_ALL, NULL)));
-  */
-  /*a_printf(" ( L "); */
-
   a_printf(" ( L \"%s\" ", uim_get_default_im_name(setlocale(LC_ALL, NULL)));
   
   for (i = 0 ; i < uim_get_nr_im(context); i++) {

Modified: trunk/emacs/preedit.h
===================================================================
--- trunk/emacs/preedit.h	2005-11-29 03:35:50 UTC (rev 2271)
+++ trunk/emacs/preedit.h	2005-11-29 03:38:53 UTC (rev 2272)
@@ -46,7 +46,7 @@
 #include "output.h"
 #include "candidate.h"
 
-typedef struct preedit_buffer { /* -> preedit_segment */
+typedef struct preedit_buffer {
   char *str;
   int attr;
   unsigned cursor;

Modified: trunk/emacs/prop.c
===================================================================
--- trunk/emacs/prop.c	2005-11-29 03:35:50 UTC (rev 2271)
+++ trunk/emacs/prop.c	2005-11-29 03:38:53 UTC (rev 2272)
@@ -102,19 +102,7 @@
 	return;
   }
 
-  /*
-  if (im)
-	a_printf(" ( l ( \"%s\" . ", im);
-  else
-	a_printf(" ( l ( \"\" . ");
 
-
-  if (default_engine_name) 
-	a_printf("\"%s\" ) ", default_engine_name);
-  else
-	a_printf("\"%s\" ) ", uim_get_default_im_name(setlocale(LC_ALL, NULL)));
-  */
-
   if (im)
 	a_printf(" ( l \"%s\"", im);
   else