[uim-commit] r915 - in trunk: helper xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-07-02 00:10:31 -0700 (Sat, 02 Jul 2005)
New Revision: 915

Modified:
   trunk/helper/pref-gtk.c
   trunk/xim/compose.cpp
Log:
* xim/compose.cpp (XimIM::ParseComposeStringFile) : Fix bug
  #3684.  Thanks to Phillip Vandry.

* helper/pref-gtk.c (create_pref_window) : Fix compilation.


Modified: trunk/helper/pref-gtk.c
===================================================================
--- trunk/helper/pref-gtk.c	2005-07-01 08:55:26 UTC (rev 914)
+++ trunk/helper/pref-gtk.c	2005-07-02 07:10:31 UTC (rev 915)
@@ -443,7 +443,7 @@
 
   pref_window = window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   
-  icon = gdk_pixbuf_new_from_file(UIM_DATADIR "/pixmaps/uim-icon.png", NULL);
+  icon = gdk_pixbuf_new_from_file(UIM_PIXMAPSDIR "/uim-icon.png", NULL);
   gtk_window_set_icon(GTK_WINDOW(pref_window), icon);
 
   g_signal_connect(G_OBJECT (window), "delete_event",

Modified: trunk/xim/compose.cpp
===================================================================
--- trunk/xim/compose.cpp	2005-07-01 08:55:26 UTC (rev 914)
+++ trunk/xim/compose.cpp	2005-07-02 07:10:31 UTC (rev 915)
@@ -654,15 +654,6 @@
     char* tbp;
     struct stat st;
 
-    if (mTreeTop == NULL) {
-	mTreeTop = (DefTree *)malloc(sizeof(DefTree));
-	mTreeTop->succession = NULL;
-	mTreeTop->next = NULL;
-	mTreeTop->mb = NULL;
-	mTreeTop->utf8 = NULL;
-	mTreeTop->ks = NoSymbol;
-    }
-
     if (fstat(fileno(fp), &st) != -1) {
 	unsigned long size = (unsigned long)st.st_size;
 	if (size <= sizeof tb)