aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-01-11 00:32:41 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-01-11 00:33:53 +0800
commit16a90e433840bfa748d961276e8ba6d802864bf0 (patch)
tree590fde91fc76177e30b8daf07cfb986ee125bdb6
parent0bd9354282840a7195aa1aa97435d1557f27765a (diff)
downloadgsoc2013-evolution-16a90e433840bfa748d961276e8ba6d802864bf0.tar
gsoc2013-evolution-16a90e433840bfa748d961276e8ba6d802864bf0.tar.gz
gsoc2013-evolution-16a90e433840bfa748d961276e8ba6d802864bf0.tar.bz2
gsoc2013-evolution-16a90e433840bfa748d961276e8ba6d802864bf0.tar.lz
gsoc2013-evolution-16a90e433840bfa748d961276e8ba6d802864bf0.tar.xz
gsoc2013-evolution-16a90e433840bfa748d961276e8ba6d802864bf0.tar.zst
gsoc2013-evolution-16a90e433840bfa748d961276e8ba6d802864bf0.zip
BugĀ 606542 - Broken paste action on to/cc/subject fields
-rw-r--r--composer/e-msg-composer.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index e9b388bc50..b09b18180e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1848,10 +1848,9 @@ msg_composer_cut_clipboard (GtkhtmlEditor *editor)
widget = gtk_window_get_focus (GTK_WINDOW (editor));
parent = gtk_widget_get_parent (widget);
- if (parent == composer->priv->header_table) {
- gtk_editable_cut_clipboard (GTK_EDITABLE (widget));
+ /* EFocusTracker handles the header widgets. */
+ if (parent == composer->priv->header_table)
return;
- }
/* Chain up to parent's cut_clipboard() method. */
GTKHTML_EDITOR_CLASS (parent_class)->cut_clipboard (editor);
@@ -1868,10 +1867,9 @@ msg_composer_copy_clipboard (GtkhtmlEditor *editor)
widget = gtk_window_get_focus (GTK_WINDOW (editor));
parent = gtk_widget_get_parent (widget);
- if (parent == composer->priv->header_table) {
- gtk_editable_copy_clipboard (GTK_EDITABLE (widget));
+ /* EFocusTracker handles the header widgets. */
+ if (parent == composer->priv->header_table)
return;
- }
/* Chain up to parent's copy_clipboard() method. */
GTKHTML_EDITOR_CLASS (parent_class)->copy_clipboard (editor);
@@ -1890,10 +1888,9 @@ msg_composer_paste_clipboard (GtkhtmlEditor *editor)
widget = gtk_window_get_focus (GTK_WINDOW (editor));
parent = gtk_widget_get_parent (widget);
- if (parent == composer->priv->header_table) {
- gtk_editable_paste_clipboard (GTK_EDITABLE (widget));
+ /* EFocusTracker handles the header widgets. */
+ if (parent == composer->priv->header_table)
return;
- }
clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
@@ -1922,12 +1919,12 @@ msg_composer_select_all (GtkhtmlEditor *editor)
widget = gtk_window_get_focus (GTK_WINDOW (editor));
parent = gtk_widget_get_parent (widget);
- if (parent == composer->priv->header_table) {
- gtk_editable_set_position (GTK_EDITABLE (widget), -1);
- gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1);
- } else
- /* Chain up to the parent's select_all() method. */
- GTKHTML_EDITOR_CLASS (parent_class)->select_all (editor);
+ /* EFocusTracker handles the header widgets. */
+ if (parent == composer->priv->header_table)
+ return;
+
+ /* Chain up to the parent's select_all() method. */
+ GTKHTML_EDITOR_CLASS (parent_class)->select_all (editor);
}
static void