aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/mail-send-recv.c11
-rw-r--r--mail/message-list.c3
3 files changed, 21 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b3d6d10ae2..8989db9bb4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-14 Not Zed <NotZed@Ximian.com>
+
+ * mail-send-recv.c (build_dialogue): create a stock cancel button
+ with a cancel all text.
+ (build_dialogue): Create stock-like cancel buttons with no
+ accelerators. A workaround for #41043.
+
+ * message-list.c (ml_tree_value_at): if the node is the root node,
+ do nothing. etable shouldn' really be searching the root node if
+ it isn't visible ...? For #41190.
+
2003-04-14 Larry Ewing <lewing@ximian.com>
* evolution-mail.schemas: add proper defaults for the fonts
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 1c384a0270..bb0086c701 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -34,6 +34,8 @@
#include <gtk/gtkstock.h>
#include <libgnomeui/gnome-window-icon.h>
+#include "e-util/e-gtk-utils.h"
+
#include "filter/filter-filter.h"
#include "camel/camel-filter-driver.h"
#include "camel/camel-folder.h"
@@ -295,8 +297,7 @@ build_dialogue (EAccountList *accounts, CamelFolder *outbox, const char *destina
EIterator *iter;
gd = (GtkDialog *)send_recv_dialogue = gtk_dialog_new_with_buttons(_("Send & Receive Mail"), NULL, 0, NULL);
- stop = (GtkButton *)gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_button_set_label(stop, _("Cancel All"));
+ stop = (GtkButton *)e_gtk_button_new_with_icon(_("Cancel _All"), GTK_STOCK_CANCEL);
gtk_widget_show((GtkWidget *)stop);
gtk_dialog_add_action_widget(gd, (GtkWidget *)stop, GTK_RESPONSE_CANCEL);
g_object_set(gd, "resizable", FALSE, NULL);
@@ -376,7 +377,8 @@ build_dialogue (EAccountList *accounts, CamelFolder *outbox, const char *destina
bar = (GtkProgressBar *)gtk_progress_bar_new ();
- stop = (GtkButton *)gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ stop = (GtkButton *)e_gtk_button_new_with_icon(_("Cancel"), GTK_STOCK_CANCEL);
+
status_label = (GtkLabel *)gtk_label_new ((info->type == SEND_UPDATE) ? _("Updating...") :
_("Waiting..."));
@@ -432,7 +434,8 @@ build_dialogue (EAccountList *accounts, CamelFolder *outbox, const char *destina
g_free (pretty_url);
bar = (GtkProgressBar *)gtk_progress_bar_new ();
- stop = (GtkButton *)gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ stop = (GtkButton *)e_gtk_button_new_with_icon(_("Cancel"), GTK_STOCK_CANCEL);
+
status_label = (GtkLabel *)gtk_label_new (_("Waiting..."));
gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
diff --git a/mail/message-list.c b/mail/message-list.c
index 7e0135749b..631b5b5519 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -886,6 +886,9 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
MessageList *message_list = model_data;
CamelMessageInfo *msg_info;
const char *str;
+
+ if (e_tree_model_node_is_root (etm, path))
+ return NULL;
/* retrieve the message information array */
msg_info = e_tree_memory_node_get_data (E_TREE_MEMORY(etm), path);