From e2d0dbab64ff7c546a2c7883d3d8da489a82798b Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Wed, 2 Aug 2006 05:37:33 +0000 Subject: Fixes bug #335241 svn path=/trunk/; revision=32460 --- mail/ChangeLog | 7 +++++++ mail/mail-send-recv.c | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 23e03f22bc..5c22f2a96e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2006-08-02 Srinivasa Ragavan + + ** Fixes bug #335241 + + * mail-send-recv.c: (dialog_map), (build_dialog): Let the send receive + dialog grow to a fixed size, before we show the scroll bar. + 2006-07-26 Alessandro Decina ** Fix for bug #348164 diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 00d8f81fff..3fcf6a044b 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -308,6 +308,21 @@ static send_info_t get_receive_type(const char *url) return SEND_INVALID; } +gboolean +dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table) +{ + int h, w; + + w = table->allocation.width + 30 /* Spacing around the table */; + h = table->allocation.height + 60 /* Cancell All button and Seperator and outer spacing */; + + if (w > 750) + w = 750; + if (h > 400) + h = 400; + gtk_widget_set_usize (window, w, h); +} + static struct _send_data * build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination) { @@ -332,7 +347,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati gtk_widget_ensure_style ((GtkWidget *)gd); gtk_container_set_border_width ((GtkContainer *)gd->vbox, 0); - gtk_container_set_border_width ((GtkContainer *)gd->action_area, 12); + gtk_container_set_border_width ((GtkContainer *)gd->action_area, 6); stop = (GtkButton *)e_gtk_button_new_with_icon(_("Cancel _All"), GTK_STOCK_CANCEL); gtk_widget_show((GtkWidget *)stop); @@ -360,7 +375,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati g_object_unref (iter); table = (GtkTable *) gtk_table_new (num_sources, 4, FALSE); - gtk_container_set_border_width ((GtkContainer *) table, 12); + gtk_container_set_border_width ((GtkContainer *) table, 6); gtk_table_set_row_spacings (table, 6); gtk_table_set_col_spacings (table, 6); @@ -507,6 +522,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati gtk_widget_show (GTK_WIDGET (gd)); g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data); + g_signal_connect (gd, "map-event", G_CALLBACK (dialog_map), table); g_object_weak_ref ((GObject *) gd, (GWeakNotify) dialog_destroy_cb, data); -- cgit v1.2.3