[uim-commit] r1116 - in branches/r5rs: . helper uim

[tkng at freedesktop.org]

Author: tkng
Date: 2005-08-03 08:37:35 -0700 (Wed, 03 Aug 2005)
New Revision: 1116

Modified:
   branches/r5rs/
   branches/r5rs/helper/im-switcher-gtk.c
   branches/r5rs/uim/uim-util.c
Log:
 r2754 at t42 (orig r1103):  tkng | 2005-08-02 23:32:26 +0900
 * helper/im-switcher-gtk.c: Added a window icon.
 
 r2766 at t42 (orig r1115):  tkng | 2005-08-04 00:35:23 +0900
 * uim/uim-util.c:
  -(-uim_init_util_subrs): Added a void qualifier.
 



Property changes on: branches/r5rs
___________________________________________________________________
Name: svk:merge
   - fb73e508-85ea-0310-95c3-a85c473e0941:/trunk:1101
   + fb73e508-85ea-0310-95c3-a85c473e0941:/trunk:1115

Modified: branches/r5rs/helper/im-switcher-gtk.c
===================================================================
--- branches/r5rs/helper/im-switcher-gtk.c	2005-08-03 15:35:23 UTC (rev 1115)
+++ branches/r5rs/helper/im-switcher-gtk.c	2005-08-03 15:37:35 UTC (rev 1116)
@@ -316,11 +316,15 @@
   GtkWidget *setting_button_box;
   GtkWidget *button;
   GtkWidget *frame;
+  GdkPixbuf *icon;
 
   switcher_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title(GTK_WINDOW(switcher_win),
 		       _("uim input method switcher"));
 
+  icon = gdk_pixbuf_new_from_file(UIM_PIXMAPSDIR"/uim-icon.png", NULL);
+  gtk_window_set_icon(GTK_WINDOW(switcher_win), icon);
+
   g_signal_connect(G_OBJECT(switcher_win), "destroy",
 		   G_CALLBACK(gtk_main_quit), NULL);
 

Modified: branches/r5rs/uim/uim-util.c
===================================================================
--- branches/r5rs/uim/uim-util.c	2005-08-03 15:35:23 UTC (rev 1115)
+++ branches/r5rs/uim/uim-util.c	2005-08-03 15:37:35 UTC (rev 1116)
@@ -600,7 +600,7 @@
 }
 
 void
-uim_init_util_subrs()
+uim_init_util_subrs(void)
 {
   uim_scm_init_subr_0("sys-libdir", sys_libdir);
   uim_scm_init_subr_0("sys-pkglibdir", sys_pkglibdir);