diff options
| author | Dan Vrátil <dvratil@redhat.com> | 2012-08-29 16:36:13 +0800 |
|---|---|---|
| committer | Dan Vrátil <dvratil@redhat.com> | 2012-08-29 16:36:13 +0800 |
| commit | 0d4a549502104ffd25d129a9599e97f97582741f (patch) | |
| tree | c79c6f50fde7504a699acf0e07a0720900622cb9 /mail | |
| parent | 9df8dc03e64a8f535f559a4e6df8a1a391935905 (diff) | |
| download | gsoc2013-evolution-0d4a549502104ffd25d129a9599e97f97582741f.tar gsoc2013-evolution-0d4a549502104ffd25d129a9599e97f97582741f.tar.gz gsoc2013-evolution-0d4a549502104ffd25d129a9599e97f97582741f.tar.bz2 gsoc2013-evolution-0d4a549502104ffd25d129a9599e97f97582741f.tar.lz gsoc2013-evolution-0d4a549502104ffd25d129a9599e97f97582741f.tar.xz gsoc2013-evolution-0d4a549502104ffd25d129a9599e97f97582741f.tar.zst gsoc2013-evolution-0d4a549502104ffd25d129a9599e97f97582741f.zip | |
Bug #681431 - Expanded attachment bar hides headers
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-display.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 1783600725..0e1bea5b48 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -632,7 +632,7 @@ mail_display_plugin_widget_resize (GObject *object, GtkWidget *widget; WebKitDOMElement *parent_element; gchar *dim; - gint height; + gint height, width; widget = GTK_WIDGET (object); parent_element = g_object_get_data (object, "parent_element"); @@ -644,7 +644,8 @@ mail_display_plugin_widget_resize (GObject *object, return; } - gtk_widget_get_preferred_height (widget, &height, NULL); + width = gtk_widget_get_allocated_width (widget); + gtk_widget_get_preferred_height_for_width (widget, width, &height, NULL); /* Int -> Str */ dim = g_strdup_printf ("%d", height); @@ -1524,7 +1525,6 @@ e_mail_display_init (EMailDisplay *display) g_signal_connect ( main_frame, "notify::load-status", G_CALLBACK (setup_DOM_bindings), NULL); - main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (display)); g_signal_connect ( main_frame, "notify::load-status", G_CALLBACK (mail_parts_bind_dom), NULL); @@ -1849,8 +1849,6 @@ e_mail_display_set_status (EMailDisplay *display, e_web_view_load_string (E_WEB_VIEW (display), str); g_free (str); - - gtk_widget_show_all (GTK_WIDGET (display)); } static gchar * |