rpms/sylpheed/FC-5 sylpheed-2.2.5-prefs_common.patch, NONE, 1.1 sylpheed-2.2.5-smtp_timeout.patch, NONE, 1.1 sylpheed.spec, 1.28, 1.29

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27266/FC-5

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-2.2.5-prefs_common.patch 
	sylpheed-2.2.5-smtp_timeout.patch 
Log Message:
add prefs_common patch

sylpheed-2.2.5-prefs_common.patch:

--- NEW FILE sylpheed-2.2.5-prefs_common.patch ---
diff -Nur sylpheed-2.2.5-orig/libsylph/prefs_common.c sylpheed-2.2.5/libsylph/prefs_common.c
--- sylpheed-2.2.5-orig/libsylph/prefs_common.c	2006-04-12 06:03:01.000000000 +0200
+++ sylpheed-2.2.5/libsylph/prefs_common.c	2006-06-04 00:58:41.000000000 +0200
@@ -108,7 +108,7 @@
 
 	{"display_folder_unread_num", "TRUE",
 	 &prefs_common.display_folder_unread, P_BOOL},
-	{"display_folder_num_columns", "FALSE",
+	{"display_folder_num_columns", "TRUE",
 	 &prefs_common.display_folder_num_columns, P_BOOL},
 
 	{"newsgroup_abbrev_len", "16", &prefs_common.ng_abbrev_len, P_INT},

sylpheed-2.2.5-smtp_timeout.patch:

--- NEW FILE sylpheed-2.2.5-smtp_timeout.patch ---
Index: src/send_message.c
===================================================================
--- src/send_message.c	(revision 1077)
+++ src/send_message.c	(working copy)
@@ -561,6 +561,9 @@
 		(session, send_send_data_progressive, dialog);
 	session_set_send_data_notify(session, send_send_data_finished, dialog);
 
+	session_set_timeout(session,
+			    prefs_common.io_timeout_secs * 1000);
+
 	if (session_connect(session, ac_prefs->smtp_server, port) < 0) {
 		session_destroy(session);
 		send_progress_dialog_destroy(dialog);



Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-5/sylpheed.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sylpheed.spec	30 May 2006 10:15:57 -0000	1.28
+++ sylpheed.spec	3 Jun 2006 23:16:27 -0000	1.29
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
@@ -22,6 +22,8 @@
 
 Patch1: sylpheed-2.2.3-defs.h.patch
 Patch2: sylpheed-1.9.10-desktop.patch
+Patch3: sylpheed-2.2.5-smtp_timeout.patch
+Patch4: sylpheed-2.2.5-prefs_common.patch
 
 %description
 This program is an X based fast email client which has features
@@ -42,6 +44,8 @@
 %setup -q
 %patch1 -p1 -b .defs.h
 %patch2 -p1 -b .desktop
+%patch3 -b .smtp_timeout
+%patch4 -p1 -b .prefs_common
 
 %build
 %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
@@ -82,6 +86,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jun  3 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.2.5-2
+- Add smtp_timeout patch.
+- Add display_folder_num_columns patch.
+
 * Tue May 30 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.2.5-1
 - Update to 2.2.5 (includes more "bold" fixes, too).