[uim-commit] r449 - trunk/helper

[tkng at freedesktop.org]

Author: tkng
Date: 2005-01-31 21:58:44 -0800 (Mon, 31 Jan 2005)
New Revision: 449

Modified:
   trunk/helper/toolbar-standalone-gtk.c
Log:
* helper/toolbar-standalone-gtk.c:
 -(main): call uim_init/quit.


Modified: trunk/helper/toolbar-standalone-gtk.c
===================================================================
--- trunk/helper/toolbar-standalone-gtk.c	2005-02-01 04:15:07 UTC (rev 448)
+++ trunk/helper/toolbar-standalone-gtk.c	2005-02-01 05:58:44 UTC (rev 449)
@@ -1,7 +1,9 @@
 /*
 
-  Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+  toolbar-standalone-gtk.c: toolbar implementation with GTK+
 
+  Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
+
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -38,6 +40,7 @@
 #include <locale.h>
 #include <uim/gettext.h>
 #include <gtk/gtk.h>
+#include "uim/uim.h"
 
 extern GtkWidget *uim_helper_toolbar_new(void);
 
@@ -45,7 +48,17 @@
 static gint window_drag_start_x = -1, window_drag_start_y = -1;
 static gint pointer_drag_start_x = -1, pointer_drag_start_y = -1;
 
+#if GLIB_CHECK_VERSION(2, 6, 0)
+
 static void
+parse_options(gint argc, gchar **argv)
+{
+
+}
+
+#endif
+
+static void
 delete_event(GtkWidget *widget, gpointer data)
 {
   gtk_main_quit ();
@@ -187,6 +200,8 @@
   textdomain( PACKAGE );
   bind_textdomain_codeset( PACKAGE, "UTF-8");
 
+  uim_init();
+
   gtk_set_locale();
   
   gtk_init(&argc, &argv);
@@ -235,7 +250,12 @@
 
   if (argc > 1) {
     if (!gtk_window_parse_geometry(GTK_WINDOW (window), argv[1])) {
+
+#if GLIB_CHECK_VERSION(2, 6, 0)
+      parse_options(argc, argv);
+#else
       g_warning(_("Unable to parse the geometry string '%s'"), argv[1]);
+#endif
     }
   } else {
     gint x, y, w, h, sc_w, sc_h;
@@ -252,6 +272,8 @@
 
   gtk_main();
 
+  uim_quit();
+
   return 0;
 }