[uim-commit] r160 - trunk/gtk

[tkng@freedesktop.org]

Author: tkng
Date: 2005-01-07 10:12:40 -0800 (Fri, 07 Jan 2005)
New Revision: 160

Modified:
   trunk/gtk/gtk-im-uim.c
   trunk/gtk/uim-cand-win-gtk.c
Log:
* gtk/gtk-im-uim.c:
 -(im_module_create):Removed needless calling of uim_init.
 -(im_module_init): Added calling of uim_init.
 -(im_uim_class_finalize): Removed needless calling of uim_quit.

* gtk/uim-cand-win-gtk.c:
 -(uim_cand_win_gtk_init):Removed needless calling of uim_init.



Modified: trunk/gtk/gtk-im-uim.c
===================================================================
--- trunk/gtk/gtk-im-uim.c	2005-01-07 16:00:24 UTC (rev 159)
+++ trunk/gtk/gtk-im-uim.c	2005-01-07 18:12:40 UTC (rev 160)
@@ -1,6 +1,6 @@
 /*
 
-  Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+  Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
 
   All rights reserved.
 
@@ -671,7 +671,7 @@
 static void
 im_uim_class_finalize(GtkIMContextClass *class)
 {
-  uim_quit();
+
 }
 
 static void
@@ -830,10 +830,6 @@
   obj = g_object_new(type_im_uim, NULL);
   uic = IM_UIM_CONTEXT(obj);
 
-  if(uim_init() == -1) {
-    parent_class->finalize(obj);
-    return NULL;
-  }
   im_name = uim_get_default_im_name(setlocale(LC_ALL, NULL));
   uic->uc = uim_create_context(uic, "UTF-8",
 			       NULL, im_name,
@@ -997,6 +993,10 @@
 void
 im_module_init(GTypeModule *type_module)
 {
+  if(uim_init() == -1) {
+    return;
+  }
+
   context_list.next = (IMUIMContext *)&context_list;
   context_list.prev = (IMUIMContext *)&context_list;
   type_im_uim =

Modified: trunk/gtk/uim-cand-win-gtk.c
===================================================================
--- trunk/gtk/uim-cand-win-gtk.c	2005-01-07 16:00:24 UTC (rev 159)
+++ trunk/gtk/uim-cand-win-gtk.c	2005-01-07 18:12:40 UTC (rev 160)
@@ -1,6 +1,6 @@
 /*
 
-  copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+  copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
 
   All rights reserved.
 
@@ -123,8 +123,6 @@
   GtkWidget *vbox;
   GtkTreeSelection *selection;
 
-  uim_init();
-
   /* init struct */
   cwin->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
   cwin->view = gtk_tree_view_new();
@@ -165,7 +163,7 @@
 						    "text", COLUMN_HEADING,
 						    NULL);
   gtk_tree_view_append_column(GTK_TREE_VIEW(cwin->view), column);
-  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+  //  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
   renderer = gtk_cell_renderer_text_new();
   column = gtk_tree_view_column_new_with_attributes("Text",