* Reactivate the focus vadjustment
* src/widgets/modest-window.c:
* Now escape sends a delete event to msg view and editor if
they're not fullscreen (fixes NB#58618).
pmo-trunk-r2715
priv->scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body);
gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area);
priv->scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body);
gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area);
- /*
- TODO: scroll_area was never instantiated.
- Stop building without warnings-as-errors. murrayc.
- gtk_container_set_focus_vadjustment (GTK_CONTAINER (scroll_area),
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->scroll_area),
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
priv->clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
priv->clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
case GDK_Escape:
if (modest_window_mgr_get_fullscreen_mode (mgr))
modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
case GDK_Escape:
if (modest_window_mgr_get_fullscreen_mode (mgr))
modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
+ else if (MODEST_IS_MSG_VIEW_WINDOW (self)||MODEST_IS_MSG_EDIT_WINDOW (self))
+ modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));