gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sync with sylpheed 0.6.5cvs18

Browse source
This commit is contained in:
Paul Mangan 2001-11-27 07:46:42 +00:00
parent b28e5799c6
commit 56ce7b2de2
6 changed files with 60 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,9 +1,17 @@
2001-11-27
* src/textview.c: textview_show_part(): use first found
message/rfc822 header.
* src/folderview.c: added "Search messages..." to the context menu.
2001-11-26
* src/compose.c: compose_wrap_line_all(): more merging from claws.
GET_CHAR(): renamed GET_TEXT() and made it more generic.
Modified compose_wrap_line() and compose_wrap_line_all() to use
GET_CHAR().
* src/textview.c: textview_show_part(): show the header of nested
RFC822 attachment correctly.
2001-11-25

10
ChangeLog.claws
View file

@ -1,3 +1,13 @@
2001-11-27 [paul] 0.6.5claws40
* po/pt_BR.po
updated translation, submitted by Fabio Junior Beneditto
* sync with sylpheed 0.6.5cvs18
see ChangeLog entries 2001-11-26 (src/textview.c) and
2001-11-27
2001-11-26 [paul]
* po/es.po

9
ChangeLog.jp
View file

@ -1,9 +1,18 @@
2001-11-27
* src/textview.c: textview_show_part(): 最初に見つかった
message/rfc822 ヘッダを使用。
* src/folderview.c: 「メッセージを検索...」をコンテキストメニュー
に追加。
2001-11-26
* src/compose.c: compose_wrap_line_all(): claws からさらにマージ。
GET_CHAR(): GET_TEXT() を名称変更し、より一般化した。
compose_wrap_line() と compose_wrap_line_all() を GET_CHAR() を
使用するように修正。
* src/textview.c: textview_show_part(): ネストされた RFC822 の添付
のヘッダを正しく表示するようにした。
2001-11-25

2
configure.in
View file

@ -8,7 +8,7 @@ MINOR_VERSION=6
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=claws39
EXTRA_VERSION=claws40
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl

30
src/folderview.c
View file

@ -42,6 +42,7 @@
#include "mainwindow.h"
#include "folderview.h"
#include "summaryview.h"
#include "summary_search.h"
#include "inputdialog.h"
#include "grouplistdialog.h"
#include "manage_window.h"
@ -197,6 +198,10 @@ static void folderview_rm_news_server_cb(FolderView *folderview,
guint action,
GtkWidget *widget);
static void folderview_search_cb (FolderView *folderview,
guint action,
GtkWidget *widget);
static gboolean folderview_drag_motion_cb(GtkWidget *widget,
GdkDragContext *context,
gint x,
@ -241,13 +246,14 @@ static GtkItemFactoryEntry folderview_mail_popup_entries[] =
{N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Update folder tree"), NULL, folderview_update_tree_cb, 0, NULL},
{N_("/Re_scan folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
{N_("/R_escan folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Remove _mailbox"), NULL, folderview_remove_mailbox_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Search messages..."), NULL, folderview_search_cb, 0, NULL},
{N_("/_Property..."), NULL, folderview_property_cb, 0, NULL},
{N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
{N_("/_Scoring..."), NULL, folderview_scoring_cb, 0, NULL}
{N_("/S_coring..."), NULL, folderview_scoring_cb, 0, NULL}
};
static GtkItemFactoryEntry folderview_imap_popup_entries[] =
@ -257,13 +263,14 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
{N_("/_Delete folder"), NULL, folderview_rm_imap_folder_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Update folder tree"), NULL, folderview_update_tree_cb, 0, NULL},
{N_("/Re_scan folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
{N_("/R_escan folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Remove _IMAP4 account"), NULL, folderview_rm_imap_server_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Search messages..."), NULL, folderview_search_cb, 0, NULL},
{N_("/_Property..."), NULL, NULL, 0, NULL},
{N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
{N_("/_Scoring..."), NULL, folderview_scoring_cb, 0, NULL}
{N_("/S_coring..."), NULL, folderview_scoring_cb, 0, NULL}
};
static GtkItemFactoryEntry folderview_news_popup_entries[] =
@ -274,9 +281,10 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Remove _news account"), NULL, folderview_rm_news_server_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Search messages..."), NULL, folderview_search_cb, 0, NULL},
{N_("/_Property..."), NULL, NULL, 0, NULL},
{N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
{N_("/_Scoring..."), NULL, folderview_scoring_cb, 0, NULL}
{N_("/S_coring..."), NULL, folderview_scoring_cb, 0, NULL}
};
@ -1210,6 +1218,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
gboolean folder_property = FALSE;
gboolean folder_processing = FALSE;
gboolean folder_scoring = FALSE;
gboolean search_folder = FALSE;
if (!event) return;
@ -1255,6 +1264,8 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
new_folder = TRUE;
if (item->parent == NULL)
update_tree = remove_tree = TRUE;
else
search_folder = TRUE;
if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP || FOLDER_TYPE(folder) == F_MBOX) {
if (item->parent == NULL)
update_tree = rescan_tree = TRUE;
@ -1285,6 +1296,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
SET_SENS(mail_factory, "/Property...", folder_property);
SET_SENS(mail_factory, "/Processing...", folder_processing);
SET_SENS(mail_factory, "/Scoring...", folder_scoring);
SET_SENS(mail_factory, "/Search messages...", search_folder);
} else if (FOLDER_TYPE(folder) == F_IMAP) {
popup = folderview->imap_popup;
menu_set_insensitive_all(GTK_MENU_SHELL(popup));
@ -1296,12 +1308,14 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
SET_SENS(imap_factory, "/Processing...", folder_processing);
SET_SENS(imap_factory, "/Scoring...", folder_scoring);
SET_SENS(imap_factory, "/Search messages...", search_folder);
} else if (FOLDER_TYPE(folder) == F_NEWS) {
popup = folderview->news_popup;
menu_set_insensitive_all(GTK_MENU_SHELL(popup));
SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
SET_SENS(news_factory, "/Remove newsgroup", delete_folder);
SET_SENS(news_factory, "/Remove news account", remove_tree);
SET_SENS(news_factory, "/Search messages...", search_folder);
SET_SENS(news_factory, "/Processing...", folder_processing);
SET_SENS(news_factory, "/Scoring...", folder_scoring);
} else if (FOLDER_TYPE(folder) == F_MBOX) {
@ -2145,6 +2159,12 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
folder_write_list();
}
static void folderview_search_cb(FolderView *folderview, guint action,
GtkWidget *widget)
{
summary_search(folderview->summaryview);
}
static gboolean folderview_drag_motion_cb(GtkWidget *widget,
GdkDragContext *context,
gint x,

8
src/textview.c
View file

@ -299,8 +299,13 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
glong fpos;
MimeInfo *parent = mimeinfo->parent;
while (parent->parent)
while (parent->parent) {
if (parent->main &&
parent->main->mime_type ==
MIME_MESSAGE_RFC822)
break;
parent = parent->parent;
}
if ((fpos = ftell(fp)) < 0)
perror("ftell");
@ -312,6 +317,7 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
perror("fseek");
}
}
/* skip MIME part headers */
while (fgets(buf, sizeof(buf), fp) != NULL)
if (buf[0] == '\r' || buf[0] == '\n') break;
}