aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/e-canvas-vbox.c2
-rw-r--r--widgets/misc/e-canvas.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index f42fca4a30..2d389a83e6 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -299,8 +299,6 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags )
"height", &item_height,
NULL);
- g_print ("%f\n", running_height);
-
e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
(double) 0,
(double) running_height);
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 4cb912283e..beb90a2e40 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -348,12 +348,15 @@ static gint
e_canvas_focus_out (GtkWidget *widget, GdkEventFocus *event)
{
GnomeCanvas *canvas;
+ ECanvas *ecanvas;
canvas = GNOME_CANVAS (widget);
+ ecanvas = E_CANVAS (widget);
GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
- gdk_im_end ();
+ if (ecanvas->ic)
+ gdk_im_end ();
if (canvas->focused_item)
return emit_event (canvas, (GdkEvent *) event);
@@ -410,6 +413,8 @@ e_canvas_unrealize (GtkWidget *widget)
gdk_ic_attr_destroy (ecanvas->ic_attr);
ecanvas->ic_attr = NULL;
}
+ if (GTK_WIDGET_CLASS (parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
static void