Use GtkBin accessors

[~andy/gtk] / modules / input / gtkimcontextxim.c

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 14dd652158bf1c06ad9dad286d361736caf0cda5..dfa17bc9b747929f508280403f5682940b2e72bc 100644 (file)
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -158,7 +158,7 @@ static GSList *status_windows = NULL;
 void
 gtk_im_context_xim_register_type (GTypeModule *type_module)
 {
-  static const GTypeInfo im_context_xim_info =
+  const GTypeInfo im_context_xim_info =
   {
     sizeof (GtkIMContextXIMClass),
     (GBaseInitFunc) NULL,
@@ -622,7 +622,7 @@ reinitialize_ic (GtkIMContextXIM *context_xim)
        {
          context_xim->preedit_length = 0;
          if (!context_xim->finalizing)
-           g_signal_emit_by_name (context_xim, "preedit_changed");
+           g_signal_emit_by_name (context_xim, "preedit-changed");
        }
     }
   /* 
@@ -846,7 +846,7 @@ gtk_im_context_xim_set_cursor_location (GtkIMContext *context,
     return;
 
   spot.x = area->x;
-  spot.y = area->y;
+  spot.y = area->y + area->height;
 
   preedit_attr = XVaCreateNestedList (0,
                                      XNSpotLocation, &spot,
@@ -930,7 +930,7 @@ gtk_im_context_xim_reset (GtkIMContext *context)
   if (context_xim->preedit_length)
     {
       context_xim->preedit_length = 0;
-      g_signal_emit_by_name (context, "preedit_changed");
+      g_signal_emit_by_name (context, "preedit-changed");
     }
 
   XFree (result);
@@ -1032,7 +1032,7 @@ preedit_start_callback (XIC      xic,
   GtkIMContextXIM *context_xim = GTK_IM_CONTEXT_XIM (context);
   
   if (!context_xim->finalizing)
-    g_signal_emit_by_name (context, "preedit_start");
+    g_signal_emit_by_name (context, "preedit-start");
 
   return -1;                   /* No length limit */
 }                   
@@ -1049,11 +1049,11 @@ preedit_done_callback (XIC      xic,
     {
       context_xim->preedit_length = 0;
       if (!context_xim->finalizing)
-       g_signal_emit_by_name (context_xim, "preedit_changed");
+       g_signal_emit_by_name (context_xim, "preedit-changed");
     }
 
   if (!context_xim->finalizing)
-    g_signal_emit_by_name (context, "preedit_end");  
+    g_signal_emit_by_name (context, "preedit-end");
 }                   
 
 static gint
@@ -1178,7 +1178,7 @@ preedit_draw_callback (XIC                           xic,
   g_free (new_text);
 
   if (!context->finalizing)
-    g_signal_emit_by_name (context, "preedit_changed");
+    g_signal_emit_by_name (context, "preedit-changed");
 }
     
 
@@ -1193,7 +1193,7 @@ preedit_caret_callback (XIC                            xic,
     {
       context->preedit_cursor = call_data->position;
       if (!context->finalizing)
-       g_signal_emit_by_name (context, "preedit_changed");
+       g_signal_emit_by_name (context, "preedit-changed");
     }
   else
     {
@@ -1547,7 +1547,7 @@ claim_status_window (GtkIMContextXIM *context_xim)
   if (!context_xim->status_window && context_xim->client_widget)
     {
       GtkWidget *toplevel = gtk_widget_get_toplevel (context_xim->client_widget);
-      if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel))
+      if (toplevel && gtk_widget_is_toplevel (toplevel))
        {
          StatusWindow *status_window = status_window_get (toplevel);
 
@@ -1581,7 +1581,7 @@ update_in_toplevel (GtkIMContextXIM *context_xim)
     {
       GtkWidget *toplevel = gtk_widget_get_toplevel (context_xim->client_widget);
       
-      context_xim->in_toplevel = (toplevel && GTK_WIDGET_TOPLEVEL (toplevel));
+      context_xim->in_toplevel = (toplevel && gtk_widget_is_toplevel (toplevel));
     }
   else
     context_xim->in_toplevel = FALSE;
@@ -1754,7 +1754,7 @@ status_window_get (GtkWidget *toplevel)
   g_signal_connect (toplevel, "destroy",
                    G_CALLBACK (on_status_toplevel_destroy),
                    status_window);
-  g_signal_connect (toplevel, "configure_event",
+  g_signal_connect (toplevel, "configure-event",
                    G_CALLBACK (on_status_toplevel_configure),
                    status_window);
   g_signal_connect (toplevel, "notify::screen",
@@ -1822,11 +1822,11 @@ status_window_make_window (StatusWindow *status_window)
   gtk_misc_set_padding (GTK_MISC (status_label), 1, 1);
   gtk_widget_show (status_label);
   
-  g_signal_connect (window, "style_set",
+  g_signal_connect (window, "style-set",
                    G_CALLBACK (on_status_window_style_set), status_label);
   gtk_container_add (GTK_CONTAINER (window), status_label);
   
-  g_signal_connect (window, "expose_event",
+  g_signal_connect (window, "expose-event",
                    G_CALLBACK (on_status_window_expose_event), NULL);
   
   gtk_window_set_screen (GTK_WINDOW (status_window->window),
@@ -1849,7 +1849,7 @@ status_window_set_text (StatusWindow *status_window,
       if (!status_window->window)
        status_window_make_window (status_window);
       
-      label = GTK_BIN (status_window->window)->child;
+      label = gtk_bin_get_child (GTK_BIN (status_window->window));
       gtk_label_set_text (GTK_LABEL (label), text);
   
       gtk_widget_show (status_window->window);