Change parent of IBusIMClient.

3 files changed, 16 insertions, 17 deletions

diff --git a/lib/gtk2/Makefile.am b/lib/gtk2/Makefile.am
index fa71874..bd255c9 100644
--- a/lib/gtk2/Makefile.am
+++ b/lib/gtk2/Makefile.am
@@ -36,12 +36,12 @@ libibus_gtk_la_SOURCES = \
 	ibusimclient.c \
 	$(NULL)
 libibus_gtk_la_CFLAGS = \
-	@GTK2_CFLAGS@ \
+	@GDK2_CFLAGS@ \
 	@DBUS_CFLAGS@ \
 	-DG_LOG_DOMAIN=\"IBUS\" \
 	$(NULL)
 libibus_gtk_la_LDFLAGS = \
-	@GTK2_LIBS@ \
+	@GDK2_LIBS@ \
 	@DBUS_LIBS@ \
 	$(NULL)
 
diff --git a/lib/gtk2/ibusimclient.c b/lib/gtk2/ibusimclient.c
index ee6dbce..71fce2d 100644
--- a/lib/gtk2/ibusimclient.c
+++ b/lib/gtk2/ibusimclient.c
@@ -116,7 +116,7 @@ static DBusHandlerResult
                                             void                *user_data);
 
 static GType ibus_type_im_client = 0;
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
 
 
 GType
@@ -149,14 +149,14 @@ ibus_im_client_register_type (GTypeModule *type_module)
         if (type_module) {
             ibus_type_im_client =
                 g_type_module_register_type (type_module,
-                    GTK_TYPE_OBJECT,
+                    G_TYPE_OBJECT,
                     "IBusIMClient",
                     &ibus_im_client_info,
                     (GTypeFlags)0);
         }
         else {
             ibus_type_im_client =
-                g_type_register_static (GTK_TYPE_OBJECT,
+                g_type_register_static (G_TYPE_OBJECT,
                     "IBusIMClient",
                     &ibus_im_client_info,
                     (GTypeFlags)0);
@@ -177,10 +177,9 @@ ibus_im_client_new (void)
 static void
 ibus_im_client_class_init     (IBusIMClientClass *klass)
 {
-    /* GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); */
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-    parent_class = (GtkObjectClass *) g_type_class_peek_parent (klass);
+    parent_class = (GObjectClass *) g_type_class_peek_parent (klass);
 
     g_type_class_add_private (klass, sizeof (IBusIMClientPrivate));
 
@@ -626,7 +625,7 @@ _ibus_signal_update_preedit_handler (DBusConnection *connection, DBusMessage *me
     gchar *string = NULL;
     PangoAttrList *attrs = NULL;
     int cursor = 0;
-    gboolean visible = False;
+    gboolean visible = FALSE;
 
     if (!dbus_message_iter_init (message, &iter)) {
         g_warning ("The UpdatePreedit signal does have args!");
@@ -1044,7 +1043,7 @@ error:
         dbus_pending_call_cancel (pendingcall);
     if (user_data && free_function)
         free_function (user_data);
-    return False;
+    return FALSE;
 }
 
 inline static gboolean
diff --git a/lib/gtk2/ibusimclient.h b/lib/gtk2/ibusimclient.h
index 00b3fd8..d88302e 100644
--- a/lib/gtk2/ibusimclient.h
+++ b/lib/gtk2/ibusimclient.h
@@ -20,7 +20,7 @@
 #ifndef __IBUS_IM_CLIENT_H_
 #define __IBUS_IM_CLIENT_H_
 
-#include <gtk/gtk.h>
+#include <glib-object.h>
 /*
  * Type macros.
  */
@@ -29,15 +29,15 @@
 #define IBUS_TYPE_IM_CLIENT             \
     (ibus_im_client_get_type ())
 #define IBUS_IM_CLIENT(obj)             \
-    (GTK_CHECK_CAST ((obj), IBUS_TYPE_IM_CLIENT, IBusIMClient))
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_IM_CLIENT, IBusIMClient))
 #define IBUS_IM_CLIENT_CLASS(klass)     \
-    (GTK_CHECK_CLASS_CAST ((klass), IBUS_TYPE_IM_CLIENT, IBusIMClientClass))
+    (G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_IM_CLIENT, IBusIMClientClass))
 #define IBUS_IS_IM_CLIENT(obj)          \
-    (GTK_CHECK_TYPE ((obj), IBUS_TYPE_IM_CLIENT))
+    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_IM_CLIENT))
 #define IBUS_IS_IM_CLIENT_CLASS(klass)  \
-    (GTK_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_IM_CLIENT))
+    (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_IM_CLIENT))
 #define IBUS_IM_CLIENT_GET_CLASS(obj)   \
-    (GTK_CHECK_GET_CLASS ((obj), IBUS_TYPE_IM_CLIENT, IBusIMClientClass))
+    (G_TYPE_CHECK_GET_CLASS ((obj), IBUS_TYPE_IM_CLIENT, IBusIMClientClass))
 
 #if 0
 #define DEBUG_FUNCTION_IN   g_debug("%s IN", __FUNCTION__);
@@ -59,13 +59,13 @@ typedef struct _IBusIMClientClass IBusIMClientClass;
 typedef struct _IBusIMClientPrivate IBusIMClientPrivate;
 
 struct _IBusIMClient {
-  GtkObject parent;
+  GObject parent;
   /* instance members */
   IBusIMClientPrivate *priv;
 };
 
 struct _IBusIMClientClass {
-  GtkObjectClass parent;
+  GObjectClass parent;
   /* class members */
   void (* connected)        (IBusIMClient   *client);
   void (* disconnected)     (IBusIMClient   *client);