aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-10-10 18:50:18 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-10-10 18:50:18 +0800
commit56a166bb42bd55216a489c0b850ddd6bca2a3cd5 (patch)
tree3f87cf07fd6098ab2700c56d71d97686c5e5bc71 /calendar/gui
parent8fd93c9042bb30e53ce88303f8a0789a6ca688eb (diff)
parent6d5db4c7cd468d424ea8628344c5a1bba6fc3d7c (diff)
downloadgsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.gz
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.bz2
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.lz
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.xz
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.zst
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.zip
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/dialogs/comp-editor.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 73bf421a65..d5eee61a87 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2113,17 +2113,14 @@ comp_editor_init (CompEditor *editor)
GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
widget = e_attachment_paned_new ();
+ e_attachment_paned_set_resize_toplevel (
+ E_ATTACHMENT_PANED (widget), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
priv->attachment_view = g_object_ref (widget);
gtk_widget_show (widget);
if (express_mode) {
- e_attachment_paned_set_expanded (
- E_ATTACHMENT_PANED (widget), TRUE);
- e_attachment_paned_set_expanded (
- E_ATTACHMENT_PANED (widget), FALSE);
-
widget = e_attachment_paned_get_view_combo (
E_ATTACHMENT_PANED (widget));
gtk_widget_hide (widget);
@@ -2196,7 +2193,8 @@ comp_editor_init (CompEditor *editor)
comp_editor_bind_settings (editor);
- e_shell_watch_window (shell, GTK_WINDOW (editor));
+ gtk_application_add_window (
+ GTK_APPLICATION (shell), GTK_WINDOW (editor));
e_shell_adapt_window_size (shell, GTK_WINDOW (editor));
}