diff options
| -rw-r--r-- | widgets/misc/e-canvas.c | 2 | ||||
| -rw-r--r-- | widgets/text/e-text.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 0e374d391c..ba7015757e 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -606,7 +606,7 @@ e_canvas_item_grab_focus (GnomeCanvasItem *item, gboolean widget_too) gtk_widget_grab_focus (GTK_WIDGET (item->canvas)); } - if (focused_item) { + if (item) { ev.focus_change.type = GDK_FOCUS_CHANGE; ev.focus_change.window = GTK_LAYOUT (item->canvas)->bin_window; ev.focus_change.send_event = FALSE; diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index f8e2968dee..06ac58299e 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -153,10 +153,6 @@ struct _EText { char *ellipsis; /* The ellipsis characters. NULL = "...". */ double ellipsis_width; /* The width of the ellipsis. */ - gboolean use_ellipsis; /* Whether to use the ellipsis. */ - - gboolean editable; /* Item is editable */ - gboolean editing; /* Item is currently being edited */ int xofs_edit; /* Offset because of editing */ int yofs_edit; /* Offset because of editing */ @@ -209,6 +205,11 @@ struct _EText { guint tooltip_owner : 1; guint allow_newlines : 1; + guint use_ellipsis : 1; /* Whether to use the ellipsis. */ + + guint editable : 1; /* Item is editable */ + guint editing : 1; /* Item is currently being edited */ + EFontStyle style; gchar *break_characters; /* Characters to optionally break after */ |