|
Matthew Barnes |
499936 |
--- evolution-2.10.1/mail/mail-send-recv.c.send-recv-dialog 2007-05-15 14:26:24.000000000 -0400
|
|
Matthew Barnes |
499936 |
+++ evolution-2.10.1/mail/mail-send-recv.c 2007-05-15 14:30:51.000000000 -0400
|
|
Matthew Barnes |
499936 |
@@ -312,21 +312,6 @@
|
|
Matthew Barnes |
499936 |
return SEND_INVALID;
|
|
Matthew Barnes |
499936 |
}
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
-gboolean
|
|
Matthew Barnes |
499936 |
-dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table)
|
|
Matthew Barnes |
499936 |
-{
|
|
Matthew Barnes |
499936 |
- int h, w;
|
|
Matthew Barnes |
499936 |
-
|
|
Matthew Barnes |
499936 |
- w = table->allocation.width + 30 /* Spacing around the table */;
|
|
Matthew Barnes |
499936 |
- h = table->allocation.height + 60 /* Cancell All button and Seperator and outer spacing */;
|
|
Matthew Barnes |
499936 |
-
|
|
Matthew Barnes |
499936 |
- if (w > 750)
|
|
Matthew Barnes |
499936 |
- w = 750;
|
|
Matthew Barnes |
499936 |
- if (h > 400)
|
|
Matthew Barnes |
499936 |
- h = 400;
|
|
Matthew Barnes |
499936 |
- gtk_widget_set_usize (window, w, h);
|
|
Matthew Barnes |
499936 |
-}
|
|
Matthew Barnes |
499936 |
-
|
|
Matthew Barnes |
499936 |
static struct _send_data *
|
|
Matthew Barnes |
499936 |
build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination)
|
|
Matthew Barnes |
499936 |
{
|
|
Matthew Barnes |
499936 |
@@ -385,7 +370,7 @@
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
|
|
Matthew Barnes |
499936 |
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
|
|
Matthew Barnes |
499936 |
- GTK_POLICY_AUTOMATIC,
|
|
Matthew Barnes |
499936 |
+ GTK_POLICY_NEVER,
|
|
Matthew Barnes |
499936 |
GTK_POLICY_AUTOMATIC);
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), table);
|
|
Matthew Barnes |
499936 |
@@ -443,6 +428,7 @@
|
|
Matthew Barnes |
499936 |
recv_icon = e_icon_factory_get_image ("stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR);
|
|
Matthew Barnes |
499936 |
pretty_url = format_url (source->url, account->name);
|
|
Matthew Barnes |
499936 |
label = (GtkLabel *)gtk_label_new (NULL);
|
|
Matthew Barnes |
499936 |
+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
|
|
Matthew Barnes |
499936 |
gtk_label_set_markup (label, pretty_url);
|
|
Matthew Barnes |
499936 |
g_free (pretty_url);
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
@@ -457,10 +443,10 @@
|
|
Matthew Barnes |
499936 |
gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
|
|
Matthew Barnes |
499936 |
gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
- gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
+ gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, 0, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
gtk_table_attach (table, (GtkWidget *)label, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
- gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
- gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
+ gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, 0, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
+ gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, 0, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
gtk_table_attach (table, (GtkWidget *)status_label, 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
info->bar = bar;
|
|
Matthew Barnes |
499936 |
@@ -496,6 +482,7 @@
|
|
Matthew Barnes |
499936 |
send_icon = e_icon_factory_get_image ("stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
|
|
Matthew Barnes |
499936 |
pretty_url = format_url (destination, NULL);
|
|
Matthew Barnes |
499936 |
label = (GtkLabel *)gtk_label_new (NULL);
|
|
Matthew Barnes |
499936 |
+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
|
|
Matthew Barnes |
499936 |
gtk_label_set_markup (label, pretty_url);
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
g_free (pretty_url);
|
|
Matthew Barnes |
499936 |
@@ -508,10 +495,10 @@
|
|
Matthew Barnes |
499936 |
gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
|
|
Matthew Barnes |
499936 |
gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
- gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
+ gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, 0, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
gtk_table_attach (table, GTK_WIDGET (label), 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
- gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
- gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
+ gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, 0, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
+ gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, 0, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
gtk_table_attach (table, GTK_WIDGET (status_label), 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
info->bar = bar;
|
|
Matthew Barnes |
499936 |
@@ -526,7 +513,6 @@
|
|
Matthew Barnes |
499936 |
gtk_widget_show (GTK_WIDGET (gd));
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data);
|
|
Matthew Barnes |
499936 |
- g_signal_connect (gd, "map-event", G_CALLBACK (dialog_map), table);
|
|
Matthew Barnes |
499936 |
|
|
Matthew Barnes |
499936 |
g_object_weak_ref ((GObject *) gd, (GWeakNotify) dialog_destroy_cb, data);
|
|
Matthew Barnes |
499936 |
|