sync with sylpheed 0.5.1cvs6

2001-07-29 08:29:03 +00:00 · 2001-07-29 08:29:03 +00:00 · 7ce0da9237
parent 3f29c8ad30
commit 7ce0da9237
11 changed files with 326 additions and 37 deletions
--- a/15
+++ b/15
@ -29,7 +29,7 @@ contributors (beside the above; based on Changelog)
 	Pierric Descamps
 	Ohmasa
 	Stephen Anthony
-	HIRAMATSU
+	HIRAMATSU Masami
 	Jorge Van Hemelryck
 	TAKANO
 	Masahiro Tomita
@ -38,7 +38,7 @@ contributors (beside the above; based on Changelog)
 	Marc Hoper
 	David Mehrmann
 	Setoh
-	Ninomiya
+	Yuuki NINOMIYA
 	Suzuki Mio
 	Ishihara
 	Jason McCarver
@ -65,14 +65,15 @@ contributors (beside the above; based on Changelog)
 	YAMAGUCHI
 	Tomita
 	Nishiyama
-	Hotta
+	Michihide Hotta
 	Nishika
 	shigeri
 	Tajiri
-	Wakai
-        Rodrigo Dias Arruda Senra
-        Fabio Junior Beneditto
+	Kazunao Wakai
+	Rodrigo Dias Arruda Senra
+	Fabio Junior Beneditto
 	Satoshi Nagayasu
 	Jens Oberender
 	Ricardo Mones Lastra
-	Don Quijote
+	Henrik Carlqvist
+	Don Quijote
--- a/12
+++ b/12
@ -1,3 +1,15 @@
+2001-07-28
+
+	* src/mainwindow.c: main_window_popup(): deiconize the window
+	  when popup (thanks to Henrik Carlqvist).
+	* src/procmime.c: procmime_scan_mime_type(): new.
+	  procmime_scan_content_type(): use procmime_scan_mime_type().
+	  procmime_scan_mime_header(): scan the extension of attached files
+	  and add the correct MIME type if the Content-Type is
+	  "application/octet-stream" (thanks to Don Quijote).
+	* src/compose.c: compose_toolbar_create(): added a new "Send later"
+	  icon (thanks to Leandro Pereira).
+
 2001-07-27

 	* src/prefs_common.c: date_format_create(): modified the layout of
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@ -1,3 +1,9 @@
+2001-07-29 [paul]
+
+	0.5.1claws3
+
+        * sync with Sylpheed 0.5.1cvs6
+
 2001-07-29 [paul]

 	* po/pt_BR.po
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@ -1,3 +1,14 @@
+2001-07-28
+
+	* src/mainwindow.c: main_window_popup(): ポップアップ時にウィンドウ
+	  を非アイコン化するようにした。
+	* src/procmime.c: procmime_scan_mime_type(): 新規。
+	  procmime_scan_content_type(): procmime_scan_mime_type() を使用
+	  するようにした。
+	  procmime_scan_mime_header(): Content-Type が
+	  "application/octet-stream" の場合は添付ファイルの拡張子を調べて
+	  正しい MIME タイプを付けるようにした。
+
 2001-07-27

 	* src/prefs_common.c: date_format_create(): ダイアログのレイアウト
--- a/configure.in
+++ b/configure.in
@ -8,7 +8,7 @@ MINOR_VERSION=5
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION

 dnl
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -127,6 +127,7 @@ EXTRA_DIST = \
 	pixmaps/stock_mail_receive.xpm \
 	pixmaps/stock_mail_receive_all.xpm \
 	pixmaps/stock_mail_send.xpm \
+	pixmaps/stock_mail_send_queue.xpm \
 	pixmaps/stock_mail_compose.xpm \
 	pixmaps/stock_news_compose.xpm \
 	pixmaps/stock_mail_reply.xpm \
--- a/src/compose.c
+++ b/src/compose.c
@ -3277,12 +3277,12 @@ static Compose *compose_create(PrefsAccount *account)
 }

 #include "pixmaps/stock_mail_send.xpm"
+#include "pixmaps/stock_mail_send_queue.xpm"
 #include "pixmaps/stock_mail.xpm"
 #include "pixmaps/stock_paste.xpm"
 #include "pixmaps/stock_mail_attach.xpm"
 #include "pixmaps/stock_mail_compose.xpm"
 #include "pixmaps/linewrap.xpm"
-/*#include "pixmaps/tb_mail_queue_send.xpm"*/
 #include "pixmaps/tb_address_book.xpm"

 #define CREATE_TOOLBAR_ICON(xpm_d) \
@ -3324,7 +3324,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 					   "Send",
 					   icon_wid, toolbar_send_cb, compose);

-	CREATE_TOOLBAR_ICON(stock_mail_send_xpm);
+	CREATE_TOOLBAR_ICON(stock_mail_send_queue_xpm);
 	/* CREATE_TOOLBAR_ICON(tb_mail_queue_send_xpm); */
 	sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					   _("Send later"),
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@ -1214,6 +1214,7 @@ void main_window_popup(MainWindow *mainwin)
 	y %= sy; if (y < 0) y += sy;
 	gdk_window_move(mainwin->window->window, x, y);
 	gdk_window_raise(mainwin->window->window);
+	gdk_window_show(mainwin->window->window);

 	debug_print("window position: x = %d, y = %d\n", x, y);

--- a/src/pixmaps/stock_mail_send_queue.xpm
+++ b/src/pixmaps/stock_mail_send_queue.xpm
@ -0,0 +1,244 @@
+/* XPM */
+static char * stock_mail_send_queue_xpm[] = {
+"24 24 217 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #7B7B78",
+"@ 	c #C7C7C3",
+"# 	c #F1F0EB",
+"$ 	c #BFBFBC",
+"% 	c #5F5E5E",
+"& 	c #E3E3DF",
+"* 	c #F3F3EF",
+"= 	c #F2F2EE",
+"- 	c #F1F1EC",
+"; 	c #F0EFEB",
+"> 	c #D2D2CD",
+", 	c #969592",
+"' 	c #616060",
+") 	c #B5B5B4",
+"! 	c #F8F8F6",
+"~ 	c #F7F7F5",
+"{ 	c #F6F6F3",
+"] 	c #F5F5F2",
+"^ 	c #F4F4F0",
+"/ 	c #F2F1ED",
+"( 	c #F1F0EC",
+"_ 	c #F0EFEA",
+": 	c #EFEEE9",
+"< 	c #4F4F4D",
+"[ 	c #BDBCB8",
+"} 	c #A7A6A3",
+"| 	c #C6C6C4",
+"1 	c #7C7C7B",
+"2 	c #525251",
+"3 	c #DBDBD9",
+"4 	c #F5F4F1",
+"5 	c #F4F3F0",
+"6 	c #F3F2EE",
+"7 	c #999894",
+"8 	c #62625F",
+"9 	c #BCBCB6",
+"0 	c #EBE9E3",
+"a 	c #838381",
+"b 	c #D7D6D4",
+"c 	c #A8A8A6",
+"d 	c #515150",
+"e 	c #7E7D7C",
+"f 	c #DAD9D5",
+"g 	c #EFEEE8",
+"h 	c #EEEDE7",
+"i 	c #4F4E4C",
+"j 	c #BCBBB6",
+"k 	c #EBE9E2",
+"l 	c #EAE8E1",
+"m 	c #F6F5F2",
+"n 	c #F4F3EF",
+"o 	c #B5B4B1",
+"p 	c #9B9A97",
+"q 	c #646361",
+"r 	c #92918E",
+"s 	c #EEEDE8",
+"t 	c #EDECE6",
+"u 	c #4E4E4C",
+"v 	c #797976",
+"w 	c #797874",
+"x 	c #E9E8E1",
+"y 	c #E8E7DF",
+"z 	c #B4B3AF",
+"A 	c #3F3F3F",
+"B 	c #0E0E0E",
+"C 	c #1E1E1D",
+"D 	c #6B6B69",
+"E 	c #BFBEBA",
+"F 	c #BEBDB9",
+"G 	c #7A7A77",
+"H 	c #979691",
+"I 	c #EAE9E2",
+"J 	c #959590",
+"K 	c #787773",
+"L 	c #B8B7B0",
+"M 	c #E6E4DC",
+"N 	c #101010",
+"O 	c #D5D5D5",
+"P 	c #FFFFFF",
+"Q 	c #B1B1B1",
+"R 	c #1D1D1D",
+"S 	c #626260",
+"T 	c #ECEBE4",
+"U 	c #EBEAE3",
+"V 	c #E9E7E0",
+"W 	c #E8E6DF",
+"X 	c #E7E5DD",
+"Y 	c #777671",
+"Z 	c #93918C",
+"` 	c #ECEAE4",
+" .	c #E8E6DE",
+"..	c #E6E4DB",
+"+.	c #E4E3DA",
+"@.	c #75746F",
+"#.	c #91908A",
+"$.	c #EBEBE9",
+"%.	c #B4B5B0",
+"&.	c #A0A29B",
+"*.	c #9FA099",
+"=.	c #AAACA5",
+"-.	c #C6C7C2",
+";.	c #F5F6F4",
+">.	c #E7E6DE",
+",.	c #E6E5DC",
+"'.	c #E5E4DB",
+").	c #E4E2DA",
+"!.	c #CCCBC4",
+"~.	c #A3A29D",
+"{.	c #D1D2CF",
+"].	c #979890",
+"^.	c #9FA199",
+"/.	c #A8A9A1",
+"(.	c #ADAFA6",
+"_.	c #B2B3AB",
+":.	c #B6B8B0",
+"<.	c #BABCB4",
+"[.	c #11110F",
+"}.	c #1D1D1C",
+"|.	c #CDCCC6",
+"1.	c #959490",
+"2.	c #ECECEA",
+"3.	c #989991",
+"4.	c #A1A39B",
+"5.	c #B0B1A9",
+"6.	c #BBBCB5",
+"7.	c #BFC0B8",
+"8.	c #C2C4BC",
+"9.	c #C1C2BA",
+"0.	c #D1D1D0",
+"a.	c #DEDEDE",
+"b.	c #9C9E96",
+"c.	c #C5C7BF",
+"d.	c #CBCCC5",
+"e.	c #CDCEC6",
+"f.	c #C5C7BE",
+"g.	c #DEDFDA",
+"h.	c #939393",
+"i.	c #2F2F2F",
+"j.	c #282828",
+"k.	c #6D675E",
+"l.	c #786F64",
+"m.	c #9E9F98",
+"n.	c #A1A29A",
+"o.	c #B5B7AF",
+"p.	c #CFD1C8",
+"q.	c #D0D2CA",
+"r.	c #CCCEC6",
+"s.	c #D1D3CB",
+"t.	c #736A5B",
+"u.	c #908570",
+"v.	c #928875",
+"w.	c #665C4E",
+"x.	c #9A9B93",
+"y.	c #A6A8A0",
+"z.	c #C8CAC1",
+"A.	c #D6D7D0",
+"B.	c #D5D7CF",
+"C.	c #D4D5CD",
+"D.	c #D3D5CD",
+"E.	c #8C816F",
+"F.	c #9B907F",
+"G.	c #0F0E0B",
+"H.	c #A5A69F",
+"I.	c #A8A9A2",
+"J.	c #BABBB3",
+"K.	c #C9CAC2",
+"L.	c #94958E",
+"M.	c #D6D8D0",
+"N.	c #D7D9D1",
+"O.	c #DBDCD5",
+"P.	c #AB9A87",
+"Q.	c #A8967F",
+"R.	c #BFC0BB",
+"S.	c #A8AAA2",
+"T.	c #C4C5BD",
+"U.	c #B0B2AA",
+"V.	c #D7D8D0",
+"W.	c #E6E7E2",
+"X.	c #998873",
+"Y.	c #B6A38A",
+"Z.	c #8C7C69",
+"`.	c #F2F2F1",
+" +	c #ADAEA6",
+".+	c #B1B3AB",
+"++	c #BCBDB5",
+"@+	c #C6C8C0",
+"#+	c #CFD0C9",
+"$+	c #D4D6CE",
+"%+	c #D5D6CE",
+"&+	c #D6D7CF",
+"*+	c #C8B298",
+"=+	c #E4E4E1",
+"-+	c #B3B4AC",
+";+	c #B7B8B0",
+">+	c #BCBEB6",
+",+	c #C4C6BE",
+"'+	c #C9CBC3",
+")+	c #CBCCC4",
+"!+	c #D0D1C9",
+"~+	c #D4D5D2",
+"{+	c #B7A38A",
+"]+	c #DAC2A5",
+"^+	c #B49E84",
+"/+	c #B9B9B9",
+"(+	c #F5F5F4",
+"_+	c #CFD0CB",
+":+	c #C0C2BB",
+"<+	c #C0C2BA",
+"[+	c #C8C9C2",
+"}+	c #D9DAD5",
+"|+	c #D9D9D8",
+"1+	c #D3D3D3",
+"2+	c #0D0D0D",
+"3+	c #7A7A7A",
+"4+	c #343434",
+"                                . . . .         ",
+"                      . . . . . + @ # $ .       ",
+"            . . . . . % $ & * = - ; > , .       ",
+"          . ' ) ! ~ { ] ^ * / ( _ : < [ } .     ",
+"          . | 1 2 3 4 5 6 / # _ : 7 8 9 0 .     ",
+"          . a b c d e f / # _ g h i j k l .     ",
+"            . m 4 n o p q r s t u v w x y z .   ",
+"          A B . C D ( ; E F G u H I J K L M .   ",
+"      N . O P P O Q . R S t T U l V W X Y Z .   ",
+"    . O P P P P P P O Q . ` 0 l V  .X ..+.@.#.. ",
+"  . O P $.%.&.*.=.-.;.O O . x y >.,.'.).!.~.. . ",
+"N Q P {.].^./.(._.:.<.[.O Q }.>.M |.1.. . .     ",
+". O 2.3.4.5.6.7.8.9.. . 0.O . J . . . . .       ",
+"Q a.%.b.. . c.d.e.. . f.g.O h.i.    j.k.l..     ",
+"O P m.n.o.. . p.. . q.r.s.O h.N   . t.u.v.w..   ",
+"a.P x.y.6.z.. . . A.B.C.D.O h.. . . . E.F.. G.. ",
+"O P H.I.J.K.L.. 3.M.N.N.O.O h.N     . P.Q..     ",
+"Q a.R.S.o.T.r.U.V.M.N.N.W.O h.A   . X.Y.Y.Z..   ",
+". O `. +.+++@+#+$+%+&+N.0.O .     . *+*+*+*+.   ",
+"N Q a.=+-+;+>+,+'+)+!+~+O Q N   . {+]+]+]+]+^+. ",
+"  . /+a.(+_+:+<+[+}+|+O Q .     . . . . . . . . ",
+"  1+. /+a.a.P P a.O Q h..                       ",
+"      2+. Q /+/+Q 3+. N                         ",
+"          4+2+. . A                             "};
--- a/src/procmime.c
+++ b/src/procmime.c
@ -319,28 +319,7 @@ void procmime_scan_content_type(MimeInfo *mimeinfo, const gchar *content_type)
 	if ((delim = strchr(buf, ';'))) *delim = '\0';
 	mimeinfo->content_type = cnttype = g_strdup(g_strstrip(buf));

-	if (!strncasecmp(cnttype, "text/html", 9))
-		mimeinfo->mime_type = MIME_TEXT_HTML;
-	else if (!strncasecmp(cnttype, "text/", 5))
-		mimeinfo->mime_type = MIME_TEXT;
-	else if (!strncasecmp(cnttype, "message/rfc822", 14))
-		mimeinfo->mime_type = MIME_MESSAGE_RFC822;
-	else if (!strncasecmp(cnttype, "message/", 8))
-		mimeinfo->mime_type = MIME_TEXT;
-	else if (!strncasecmp(cnttype, "application/octet-stream", 24))
-		mimeinfo->mime_type = MIME_APPLICATION_OCTET_STREAM;
-	else if (!strncasecmp(cnttype, "application/", 12))
-		mimeinfo->mime_type = MIME_APPLICATION;
-	else if (!strncasecmp(cnttype, "multipart/", 10))
-		mimeinfo->mime_type = MIME_MULTIPART;
-	else if (!strncasecmp(cnttype, "image/", 6))
-		mimeinfo->mime_type = MIME_IMAGE;
-	else if (!strncasecmp(cnttype, "audio/", 6))
-		mimeinfo->mime_type = MIME_AUDIO;
-	else if (!strcasecmp(cnttype, "text"))
-		mimeinfo->mime_type = MIME_TEXT;
-	else
-		mimeinfo->mime_type = MIME_UNKNOWN;
+	mimeinfo->mime_type = procmime_scan_mime_type(cnttype);

 	if (!delim) return;
 	p = delim + 1;
@ -487,17 +466,20 @@ MimeInfo *procmime_scan_mime_header(FILE *fp)
 		} else if (H_CONTENT_TYPE == hnum) {
 			procmime_scan_content_type
 				(mimeinfo, buf + strlen(hp->name));
-			if(mimeinfo->name && (mimeinfo->mime_type==MIME_APPLICATION_OCTET_STREAM)) {
-				const gchar *p;
-				p=procmime_get_mime_type(mimeinfo->name);
-				if(p) procmime_scan_content_type(mimeinfo,p);
-			}
 		} else if (H_CONTENT_DISPOSITION == hnum) {
 			procmime_scan_content_disposition
 				(mimeinfo, buf + strlen(hp->name));
 		}
 	}

+	if (mimeinfo->mime_type == MIME_APPLICATION_OCTET_STREAM &&
+	    mimeinfo->name) {
+		const gchar *type;
+		type = procmime_get_mime_type(mimeinfo->name);
+		if (type)
+			mimeinfo->mime_type = procmime_scan_mime_type(type);
+	}
+
 	if (!mimeinfo->content_type)
 		mimeinfo->content_type = g_strdup("text/plain");

@ -735,6 +717,36 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
 	return filename;
 }

+ContentType procmime_scan_mime_type(const gchar *mime_type)
+{
+	ContentType type;
+
+	if (!strncasecmp(mime_type, "text/html", 9))
+		type = MIME_TEXT_HTML;
+	else if (!strncasecmp(mime_type, "text/", 5))
+		type = MIME_TEXT;
+	else if (!strncasecmp(mime_type, "message/rfc822", 14))
+		type = MIME_MESSAGE_RFC822;
+	else if (!strncasecmp(mime_type, "message/", 8))
+		type = MIME_TEXT;
+	else if (!strncasecmp(mime_type, "application/octet-stream", 24))
+		type = MIME_APPLICATION_OCTET_STREAM;
+	else if (!strncasecmp(mime_type, "application/", 12))
+		type = MIME_APPLICATION;
+	else if (!strncasecmp(mime_type, "multipart/", 10))
+		type = MIME_MULTIPART;
+	else if (!strncasecmp(mime_type, "image/", 6))
+		type = MIME_IMAGE;
+	else if (!strncasecmp(mime_type, "audio/", 6))
+		type = MIME_AUDIO;
+	else if (!strcasecmp(mime_type, "text"))
+		type = MIME_TEXT;
+	else
+		type = MIME_UNKNOWN;
+
+	return type;
+}
+
 static GList *mime_type_list = NULL;

 gchar *procmime_get_mime_type(const gchar *filename)
--- a/src/procmime.h
+++ b/src/procmime.h
@ -134,6 +134,7 @@ FILE *procmime_get_text_part		(MsgInfo	*msginfo);

 gchar *procmime_get_tmp_file_name	(MimeInfo	*mimeinfo);

+ContentType procmime_scan_mime_type	(const gchar	*mime_type);
 gchar *procmime_get_mime_type		(const gchar	*filename);

 GList *procmime_get_mime_type_list	(void);