- Add patch for RH bug #240147 (Send/Receive dialog layout).
This commit is contained in:
Matthew Barnes
parent
adf0f6baa1
commit
499936e2fb
85
evolution-2.10.1-send-recv-dialog.patch
Normal file
85
evolution-2.10.1-send-recv-dialog.patch
Normal file
@ -0,0 +1,85 @@
|
||||
--- evolution-2.10.1/mail/mail-send-recv.c.send-recv-dialog 2007-05-15 14:26:24.000000000 -0400
|
||||
+++ evolution-2.10.1/mail/mail-send-recv.c 2007-05-15 14:30:51.000000000 -0400
|
||||
@@ -312,21 +312,6 @@
|
||||
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)
|
||||
{
|
||||
@@ -385,7 +370,7 @@
|
||||
|
||||
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
|
||||
- GTK_POLICY_AUTOMATIC,
|
||||
+ GTK_POLICY_NEVER,
|
||||
GTK_POLICY_AUTOMATIC);
|
||||
|
||||
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), table);
|
||||
@@ -443,6 +428,7 @@
|
||||
recv_icon = e_icon_factory_get_image ("stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR);
|
||||
pretty_url = format_url (source->url, account->name);
|
||||
label = (GtkLabel *)gtk_label_new (NULL);
|
||||
+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
|
||||
gtk_label_set_markup (label, pretty_url);
|
||||
g_free (pretty_url);
|
||||
|
||||
@@ -457,10 +443,10 @@
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
|
||||
gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
|
||||
|
||||
- gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
+ gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, 0, 0, 0, 0);
|
||||
gtk_table_attach (table, (GtkWidget *)label, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
- gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
- gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
+ gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, 0, 0, 0, 0);
|
||||
+ gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, 0, 0, 0, 0);
|
||||
gtk_table_attach (table, (GtkWidget *)status_label, 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
|
||||
info->bar = bar;
|
||||
@@ -496,6 +482,7 @@
|
||||
send_icon = e_icon_factory_get_image ("stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
|
||||
pretty_url = format_url (destination, NULL);
|
||||
label = (GtkLabel *)gtk_label_new (NULL);
|
||||
+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
|
||||
gtk_label_set_markup (label, pretty_url);
|
||||
|
||||
g_free (pretty_url);
|
||||
@@ -508,10 +495,10 @@
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
|
||||
gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
|
||||
|
||||
- gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
+ gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, 0, 0, 0, 0);
|
||||
gtk_table_attach (table, GTK_WIDGET (label), 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
- gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
- gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
+ gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, 0, 0, 0, 0);
|
||||
+ gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, 0, 0, 0, 0);
|
||||
gtk_table_attach (table, GTK_WIDGET (status_label), 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
|
||||
info->bar = bar;
|
||||
@@ -526,7 +513,6 @@
|
||||
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);
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
|
||||
Name: evolution
|
||||
Version: 2.10.1
|
||||
Release: 15%{?dist}
|
||||
Release: 16%{?dist}
|
||||
License: GPL
|
||||
Group: Applications/Productivity
|
||||
Summary: GNOME's next-generation groupware suite
|
||||
@ -176,6 +176,9 @@ Patch52: evolution-2.10.1-e-attachment-bar.patch
|
||||
# RH bug #238155 / GNOME bug #427232
|
||||
Patch53: evolution-2.10.1-check-uri-before-strcmp.patch
|
||||
|
||||
# RH bug #240147 / GNOME bug #335241
|
||||
Patch54: evolution-2.10.1-send-recv-dialog.patch
|
||||
|
||||
## Dependencies ###
|
||||
|
||||
Requires(post): GConf2
|
||||
@ -334,6 +337,7 @@ Development files needed for building things which link against evolution.
|
||||
%patch51 -p1 -b .en_CA-attribution-format
|
||||
%patch52 -p1 -b .e-attachment-bar
|
||||
%patch53 -p1 -b .check-uri-before-strcmp
|
||||
%patch54 -p1 -b .send-recv-dialog
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
@ -755,6 +759,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/evolution/%{evo_major}/libmenus.so
|
||||
|
||||
%changelog
|
||||
* Tue May 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-16.fc7
|
||||
- Add patch for RH bug #240147 (Send/Receive dialog layout).
|
||||
|
||||
* Mon May 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-15.fc7
|
||||
- Revise patch for RH bug #236860 to match upstream's solution.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user