[uim commit] r4640 - trunk/gtk

[codesite-noreply]

Author: ek.kato
Date: Sat Jun 30 11:56:36 2007
New Revision: 4640

Modified:
   trunk/gtk/gtk-im-uim.c
   trunk/gtk/uim-cand-win-gtk.c
   trunk/gtk/uim-eb.c

Log:
* gtk/uim-candwin-gtk.c
* gtk/uim-eb.c
* gtk/gtk-im-uim.c
  - Don't mixup free() and g_free().


Modified: trunk/gtk/gtk-im-uim.c
==============================================================================
--- trunk/gtk/gtk-im-uim.c      (original)
+++ trunk/gtk/gtk-im-uim.c      Sat Jun 30 11:56:36 2007
@@ -182,12 +182,12 @@
 get_user_defined_color(PangoColor *color, const gchar *uim_symbol)
 {
   gboolean parsed = FALSE;
-  gchar *literal = uim_scm_symbol_value_str(uim_symbol);
+  char *literal = uim_scm_symbol_value_str(uim_symbol);
 
   if (literal != NULL && literal[0] != '\0')
     parsed = pango_color_parse(color, literal);
 
-  g_free(literal);
+  free(literal);
 
   return parsed;
 }
@@ -198,6 +198,7 @@
 {
   PangoAttribute *attr;
   const gchar *segment_str = ps->str;
+  gint len;
 
   if ((ps->attr & UPreeditAttr_Separator) && !strcmp(segment_str, ""))
     segment_str = DEFAULT_SEPARATOR_STR;
@@ -259,8 +260,9 @@
     }
   }
 
-  str = (gchar *)g_realloc(str, strlen(str) + strlen(segment_str) + 1);
-  strcat(str, segment_str);
+  len = strlen(str) + strlen(segment_str) + 1;
+  str = (gchar *)g_realloc(str, len);
+  g_strlcat(str, segment_str, len);
 
   return str;
 }

Modified: trunk/gtk/uim-cand-win-gtk.c
==============================================================================
--- trunk/gtk/uim-cand-win-gtk.c        (original)
+++ trunk/gtk/uim-cand-win-gtk.c        Sat Jun 30 11:56:36 2007
@@ -393,7 +393,7 @@
          annotation = uim_eb_search_text(ueb, cand);
          uim_eb_destroy(ueb);
        }
-       g_free(book);
+       free(book);
       }
       g_free(cand);
     }

Modified: trunk/gtk/uim-eb.c
==============================================================================
--- trunk/gtk/uim-eb.c  (original)
+++ trunk/gtk/uim-eb.c  Sat Jun 30 11:56:36 2007
@@ -109,7 +109,7 @@
 }
 
 
-char *
+gchar *
 uim_eb_search_text (uim_eb *ueb, const gchar *text_utf8)
 {
   gchar *text;