+2004-07-09 [colin] 0.9.11cvs17.22
+
+ * src/inc.c
+ Remove folder-type check and do
+ more tests to be sure everything's
+ ok
+ * src/messageview.c
+ Punctuation update, remove useless
+ code, fix two warnings
+ * src/noticeview.c
+ Layout cleaning, reset 2nd button
+ when specifying one
+
2004-07-09 [colin] 0.9.11cvs17.21
* src/messageview.c
( cvs diff -u -r 1.56.2.7 -r 1.56.2.8 src/pop.c; ) > 0.9.11cvs17.19.patchset
( cvs diff -u -r 1.94.2.14 -r 1.94.2.15 src/messageview.c; cvs diff -u -r 1.56.2.8 -r 1.56.2.9 src/pop.c; cvs diff -u -r 1.17.2.5 -r 1.17.2.6 src/pop.h; ) > 0.9.11cvs17.20.patchset
( cvs diff -u -r 1.94.2.15 -r 1.94.2.16 src/messageview.c; cvs diff -u -r 1.56.2.9 -r 1.56.2.10 src/pop.c; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 src/pop.h; ) > 0.9.11cvs17.21.patchset
+( cvs diff -u -r 1.149.2.8 -r 1.149.2.9 src/inc.c; cvs diff -u -r 1.94.2.16 -r 1.94.2.17 src/messageview.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/noticeview.c; ) > 0.9.11cvs17.22.patchset
MICRO_VERSION=11
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=17.21
+EXTRA_VERSION=17.22
EXTRA_RELEASE=
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
return -1;
}
- if (FOLDER_TYPE(inbox->folder) != F_MH)
- update_file = FALSE;
-
/* CLAWS: claws uses a global .processing folder for the filtering. */
dropfolder = folder_get_default_processing();
unlink(file);
return -1;
}
+
if (update_file) {
gchar *path = strdup(file);
- gchar *snum = strrchr(file, G_DIR_SEPARATOR)+1;
- int num = atoi(snum);
+ gchar *snum = strrchr(file, G_DIR_SEPARATOR);
+ int num = 0;
FolderItem *item = NULL;
- *(strrchr(path, G_DIR_SEPARATOR))='\0';
- item = folder_find_item_from_phys_path(path);
+ if (snum) {
+ snum++;
+ } else {
+ g_free(path);
+ return 0; /* not a real problem */
+ }
+ num = atoi(snum);
+
+ if (strrchr(path, G_DIR_SEPARATOR))
+ *(strrchr(path, G_DIR_SEPARATOR))='\0';
+
+ item = folder_find_item_from_phys_path(path);
if (item) {
folder_item_remove_msg(item, num);
}
static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
{
- noticeview_set_text(noticeview, _("This message asks for a return receipt"));
+ noticeview_set_text(noticeview, _("This message asks for a return receipt."));
noticeview_set_button_text(noticeview, _("Send receipt"));
noticeview_set_button_press_callback(noticeview,
GTK_SIGNAL_FUNC(return_receipt_send_clicked),
break;
case POP3_PARTIAL_DLOAD_DELE:
text = g_strdup_printf(_("This message has been partially "
- "retrieved;\nit is %s. and will be deleted."),
+ "retrieved;\nit is %s and will be deleted."),
to_human_readable(
(off_t)(msginfo->total_size)));
button1 = _("Mark for download");
noticeview_set_button_press_callback(noticeview,
GTK_SIGNAL_FUNC(button1_cb), (gpointer) msginfo);
- if (button2 && button2_cb) {
- noticeview_set_2ndbutton_text(noticeview, button2);
- noticeview_set_2ndbutton_press_callback(noticeview,
- GTK_SIGNAL_FUNC(button2_cb), (gpointer) msginfo);
- } else {
- noticeview_set_2ndbutton_text(noticeview, NULL);
- }
+ noticeview_set_2ndbutton_text(noticeview, button2);
+ noticeview_set_2ndbutton_press_callback(noticeview,
+ GTK_SIGNAL_FUNC(button2_cb), (gpointer) msginfo);
noticeview_show(noticeview);
}
g_return_val_if_fail(ac_list->data != NULL, NULL);
optmenu = gtk_option_menu_new();
- menu = gtkut_account_menu_new(ac_list, select_account_cb, &account_id);
+ menu = gtkut_account_menu_new(ac_list,
+ G_CALLBACK(select_account_cb),
+ &account_id);
if (!menu)
return NULL;
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
textview = messageview_get_current_textview(msgview);
g_return_val_if_fail(textview != NULL, NULL);
- edit = GTK_EDITABLE(textview->text);
+ edit = GTK_TEXT_VIEW(textview->text);
g_return_val_if_fail(edit != NULL, NULL);
body_pos = textview->body_pos;
vbox = gtk_vbox_new(FALSE, 4);
gtk_widget_show(vbox);
hsep = gtk_hseparator_new();
- gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, TRUE, 1);
hbox = gtk_hbox_new(FALSE, 4);
gtk_widget_show(hbox);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 1);
icon = stock_pixmap_widget(noticeview->window, STOCK_PIXMAP_NOTICE_WARN);
#if 0
gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 0);
widget = gtk_button_new_with_label("");
+ gtk_widget_set_usize(widget, 120, -1);
g_signal_connect(G_OBJECT(widget), "clicked",
G_CALLBACK(noticeview_button_pressed),
(gpointer) noticeview);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 4);
widget2 = gtk_button_new_with_label("");
+ gtk_widget_set_usize(widget2, 120, -1);
g_signal_connect(G_OBJECT(widget2), "clicked",
G_CALLBACK(noticeview_2ndbutton_pressed),
(gpointer) noticeview);
- gtk_box_pack_start(GTK_BOX(hbox), widget2, FALSE, FALSE, 4);
+ gtk_box_pack_start(GTK_BOX(hbox), widget2, FALSE, FALSE, 0);
noticeview->vbox = vbox;
noticeview->hsep = hsep;
gtk_widget_show(noticeview->button);
} else
gtk_widget_hide(noticeview->button);
+
+ /* Callers defining only one button don't have to mind
+ * resetting the second one. Callers defining two have
+ * to define the second button after the first one.
+ */
+ gtk_widget_hide(noticeview->button2);
}
void noticeview_set_button_press_callback(NoticeView *noticeview,