[uim commit] r5599 - in branches/1.5: helper scm uim

[codesite-noreply]

Author: ek.kato
Date: Sun Oct 19 20:43:14 2008
New Revision: 5599

Modified:
   branches/1.5/helper/toolbar-common-gtk.c
   branches/1.5/scm/pyload.scm
   branches/1.5/uim/prime.c

Log:
* Revert local modifications mis-committed in r5596.


Modified: branches/1.5/helper/toolbar-common-gtk.c
==============================================================================
--- branches/1.5/helper/toolbar-common-gtk.c    (original)
+++ branches/1.5/helper/toolbar-common-gtk.c    Sun Oct 19 20:43:14 2008
@@ -845,7 +845,6 @@
   GtkIconSet *icon_set;
   GdkPixbuf *pixbuf;
   GString *filename;
-  GError *error = NULL;

   g_return_val_if_fail(uim_factory, FALSE);

@@ -856,9 +855,8 @@
   g_string_append(filename, name);
   g_string_append(filename, ".png");

-  pixbuf = gdk_pixbuf_new_from_file(filename->str, &error);
+  pixbuf = gdk_pixbuf_new_from_file(filename->str, NULL);
   if (!pixbuf) {
-    fprintf(stderr, "error: %s\n", error->message);
     g_string_free(filename, TRUE);
     return FALSE;
   }

Modified: branches/1.5/scm/pyload.scm
==============================================================================
--- branches/1.5/scm/pyload.scm (original)
+++ branches/1.5/scm/pyload.scm Sun Oct 19 20:43:14 2008
@@ -68,16 +68,3 @@
  (N_ "Pinyin (Traditional)")
  (N_ "Pinyin input method (Traditional Chinese version)")
  pinyin-big5-init-handler)
-
-(define py-new-init-handler
-  (lambda (id im arg)
-    (require "py-new.scm")
-    (generic-context-new id im py-new-rule #f)))
-
-(generic-register-im
- 'py-new
- "zh_TW:zh_HK"
- "UTF-8"
- (N_ "Py new")
- (N_ "Py new input method")
- py-new-init-handler)

Modified: branches/1.5/uim/prime.c
==============================================================================
--- branches/1.5/uim/prime.c    (original)
+++ branches/1.5/uim/prime.c    Sun Oct 19 20:43:14 2008
@@ -63,7 +63,7 @@
 static FILE *primer, *primew;
 static pid_t prime_pid = 0;

-static char *prime_command = "/Library/PRIME/bin/prime";
+static char *prime_command = "prime";

 static char prime_ud_path[MAXPATHLEN];
 static int prime_fd = -1;