[Gpg4win-commits] r1132 - in trunk: . include packages patches patches/claws-mail-3.7.1 src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Mar 19 19:05:06 CET 2009
Author: colinleroy
Date: 2009-03-19 19:05:01 +0100 (Thu, 19 Mar 2009)
New Revision: 1132
Added:
trunk/patches/claws-mail-3.7.1/
trunk/patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch
trunk/patches/claws-mail-3.7.1/02-3.7.1cvs22.patch
trunk/src/inst-bsfilter.nsi
trunk/src/inst-bsfilter_plugin.nsi
trunk/src/uninst-bsfilter.nsi
trunk/src/uninst-bsfilter_plugin.nsi
Removed:
trunk/patches/claws-mail-3.7.1/01-bug_1810.patch
trunk/patches/claws-mail-3.7.1/02-bug_1813.patch
trunk/patches/claws-mail-3.7.1/03-bug_1814.patch
trunk/patches/claws-mail-3.7.1/04-bug_1815.patch
trunk/patches/claws-mail-3.7.1/05-bug_1816.patch
trunk/patches/claws-mail-3.7.1/06-bug_1825.patch
trunk/patches/claws-mail-3.7.1/07-bug_1865.patch
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-libiconv.nsi
trunk/src/inst-sections.nsi
trunk/src/uninst-libiconv.nsi
Log:
2009-03-19 Colin Leroy <colin at colino.net>
* patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch,
patches/claws-mail-3.7.1/02-3.7.1cvs22.patch
Bugfixes to Claws
* include/config.nsi.in, src/uninst-bsfilter.nsi, src/inst-bsfilter.nsi,
src/inst-bsfilter_plugin.nsi, src/Makefile.am, src/inst-sections.nsi,
src/uninst-bsfilter_plugin.nsi, configure.ac, packages/packages.current
Add Bsfilter and Claws Mail's bsfilter plugin
for bayesian anti-spam.
* src/inst-libiconv.nsi, src/uninst-libiconv.nsi
Move iconv.dll to pub/ so that it's in the
PATH (needed by bsfilter)
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/ChangeLog 2009-03-19 18:05:01 UTC (rev 1132)
@@ -1,3 +1,17 @@
+2009-03-19 Colin Leroy <colin at colino.net>
+
+ * patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch,
+ patches/claws-mail-3.7.1/02-3.7.1cvs22.patch
+ Bugfixes to Claws
+ * include/config.nsi.in, src/uninst-bsfilter.nsi, src/inst-bsfilter.nsi,
+ src/inst-bsfilter_plugin.nsi, src/Makefile.am, src/inst-sections.nsi,
+ src/uninst-bsfilter_plugin.nsi, configure.ac, packages/packages.current
+ Add Bsfilter and Claws Mail's bsfilter plugin
+ for bayesian anti-spam.
+ * src/inst-libiconv.nsi, src/uninst-libiconv.nsi
+ Move iconv.dll to pub/ so that it's in the
+ PATH (needed by bsfilter)
+
2009-03-19 Emanuel Schuetze <emanuel.schuetze at intevation.de>
* src/gpg4win.nsi, po/ar.po, po/fr.po, po/es.po, po/ru.po
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/configure.ac 2009-03-19 18:05:01 UTC (rev 1132)
@@ -189,6 +189,7 @@
GPG4WIN_BPKG_GNUWIN32([regex])
GPG4WIN_BPKG_GNUWIN32([libpng], [pkgconfig])
GPG4WIN_BPKG_GNUWIN32([jpeg])
+GPG4WIN_BPKG_GNUWIN32([bsfilter])
GPG4WIN_BPKG_GTK([pkgconfig])
# We build our own version of glib, because we need to apply a few patches.
@@ -232,6 +233,7 @@
GPG4WIN_SPKG([rssyl], [curl claws-mail])
GPG4WIN_SPKG([tnef_parse], [claws-mail])
GPG4WIN_SPKG([attachwarner], [claws-mail])
+GPG4WIN_SPKG([bsfilter_plugin], [claws-mail])
GPG4WIN_IPKG([compendium_de])
GPG4WIN_IPKG([man_novice_en])
#GPG4WIN_IPKG([man_advanced_en])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/include/config.nsi.in 2009-03-19 18:05:01 UTC (rev 1132)
@@ -132,6 +132,12 @@
!define gpg4win_pkg_libetpan @gpg4win_pkg_libetpan@
!define gpg4win_pkg_libetpan_version @gpg4win_pkg_libetpan_version@
+ at HAVE_PKG_BSFILTER@
+!define gpg4win_pkg_bsfilter @gpg4win_pkg_bsfilter@
+!define gpg4win_pkg_bsfilter_version @gpg4win_pkg_bsfilter_version@
+!define gpg4win_pkg_bsfilter_dev @gpg4win_pkg_bsfilter_dev@
+!define gpg4win_pkg_bsfilter_src @gpg4win_pkg_bsfilter_src@
+
@HAVE_PKG_CLAWS_MAIL@
!define gpg4win_pkg_claws_mail @gpg4win_pkg_claws_mail@
!define gpg4win_pkg_claws_mail_version @gpg4win_pkg_claws_mail_version@
@@ -160,6 +166,10 @@
!define gpg4win_pkg_attachwarner @gpg4win_pkg_attachwarner@
!define gpg4win_pkg_attachwarner_version @gpg4win_pkg_attachwarner_version@
+ at HAVE_PKG_BSFILTER_PLUGIN@
+!define gpg4win_pkg_bsfilter_plugin @gpg4win_pkg_bsfilter_plugin@
+!define gpg4win_pkg_bsfilter_plugin_version @gpg4win_pkg_bsfilter_plugin_version@
+
#@HAVE_PKG_EUDORAGPG@
#!define gpg4win_pkg_eudoragpg @gpg4win_pkg_eudoragpg@
#!define gpg4win_pkg_eudoragpg_version @gpg4win_pkg_eudoragpg_version@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/packages/packages.current 2009-03-19 18:05:01 UTC (rev 1132)
@@ -109,6 +109,19 @@
chk 750b2bcd4ee3bf8595baf97e1881f1a57b1ef363
#
+# bsfilter.exe for antispam in Claws
+#
+server http://www.claws-mail.org/win32
+file bsfilter-1.0.16-bin.tar.gz
+chk 5ed34f22ebf433d83cd3571309b5cbc52c45d6d2
+server http://www.claws-mail.org/win32
+file bsfilter-1.0.16-lib.tar.gz
+chk c7fa5ec9c70c75b7b1bc852bac8eb0a5ec9e01ea
+server http://www.claws-mail.org/win32
+file bsfilter-1.0.16-src.tar.gz
+chk fe718884dd7ca0652613a2cb5c302ac6323605d8
+
+#
# Claws
#
# (Kept on our own mirror due to Sourceforge peculiarities.)
@@ -118,29 +131,33 @@
chk 58a88e705b6f27c4f3c1f44fec9dd250e7e86bb0
server http://www.claws-mail.org/win32
-file attachwarner-0.2.14cvs3.tar.gz
-chk 4128014e985e570e6468d2e5d04781b74dec01c0
+file attachwarner-0.2.16.tar.gz
+chk 3d44c09965d8da419f2b4e6543cb2bdc61142add
server http://www.claws-mail.org/win32
-file gtkhtml2_viewer-0.21cvs6.tar.gz
-chk bb3883f177c1f4276981b925f09223b636add9d3
+file bsfilter_plugin-1.0cvs1.tar.gz
+chk c5858b797820500174b67be7ed20ccafdd785581
server http://www.claws-mail.org/win32
-file notification_plugin-0.19cvs2.tar.gz
-chk 35e73b0396ee96aa48cd95ffeb99281ce0422f88
+file gtkhtml2_viewer-0.23cvs2.tar.gz
+chk 7b5a284f0a8c52790e216b2dbef711f068fecf22
server http://www.claws-mail.org/win32
-file rssyl-0.22cvs5.tar.gz
-chk 98b8a8bdd4f945b30cdd4252923342aaaabfbeba
+file notification_plugin-0.21.tar.gz
+chk a40dc1af268e665d0c8d5ca3ee5b72b07314548e
server http://www.claws-mail.org/win32
-file tnef_parse-0.3.2cvs2.tar.gz
-chk f5b4d0868d602631cf2bbd4ffcac3c8e2cf5c343
+file rssyl-0.24.tar.gz
+chk 98924a761d0dbc11bb6b150ca8296b92d6eb7526
server http://www.claws-mail.org/win32
-file vcalendar-2.0.2cvs6.tar.gz
-chk d7f54203bffff835ba14075bea83900268ac1e25
+file tnef_parse-0.3.4.tar.gz
+chk cf6c7abc320526cc4437763f9cb71d8a349de454
+server http://www.claws-mail.org/win32
+file vcalendar-2.0.4.tar.gz
+chk 6969a9500cf995e9f0e87a29ac4245363600b256
+
#
# Pthreads for Windows.
#
Copied: trunk/patches/claws-mail-3.7.1 (from rev 1130, trunk/patches/claws-mail-3.7.0)
Property changes on: trunk/patches/claws-mail-3.7.1
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/patches/claws-mail-3.7.1/01-bug_1810.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/01-bug_1810.patch 2009-03-17 13:38:31 UTC (rev 1130)
+++ trunk/patches/claws-mail-3.7.1/01-bug_1810.patch 2009-03-19 18:05:01 UTC (rev 1132)
@@ -1,23 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
---- src/mimeview.c 6 Jan 2009 16:45:59 -0000 1.83.2.151
-+++ src/mimeview.c 8 Jan 2009 17:21:57 -0000 1.83.2.152
-@@ -1451,13 +1451,13 @@
- KEY_PRESS_EVENT_STOP();
- mimeview_launch(mimeview, NULL);
- return TRUE;
--#ifndef G_OS_WIN32
- case GDK_o:
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
-+#ifndef G_OS_WIN32
- mimeview_open_with(mimeview);
-- return TRUE;
- #endif
-+ return TRUE;
- case GDK_c:
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
-
Added: trunk/patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/01-fix-spaces-after-re.patch 2009-03-17 13:38:31 UTC (rev 1130)
+++ trunk/patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch 2009-03-19 18:05:01 UTC (rev 1132)
@@ -0,0 +1,32 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+2009-03-14 [colin] 3.7.1cvs12
+
+ * src/common/utils.c
+ Win32: fix subject prefix length
+
+Index: src/common/utils.c
+===================================================================
+RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
+retrieving revision 1.36.2.166
+retrieving revision 1.36.2.167
+diff -u -p -u -r1.36.2.166 -r1.36.2.167
+--- src/common/utils.c 23 Feb 2009 16:55:48 -0000 1.36.2.166
++++ src/common/utils.c 14 Mar 2009 08:19:21 -0000 1.36.2.167
+@@ -3773,8 +3773,12 @@ int subject_get_prefix_length(const gcha
+
+ for (n = 0; n < PREFIXES; n++) {
+ int len = strlen(prefixes[n]);
+- if (!strncasecmp(subject, prefixes[n], len))
+- return len;
++ if (!strncasecmp(subject, prefixes[n], len)) {
++ if (subject[len] == ' ')
++ return len+1;
++ else
++ return len;
++ }
+ }
+ return 0;
+ #endif
Property changes on: trunk/patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/patches/claws-mail-3.7.1/02-3.7.1cvs22.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/02-3.7.1cvs22.patch 2009-03-17 13:38:31 UTC (rev 1130)
+++ trunk/patches/claws-mail-3.7.1/02-3.7.1cvs22.patch 2009-03-19 18:05:01 UTC (rev 1132)
@@ -0,0 +1,78 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+2009-03-19 [colin] 3.7.1cvs22
+
+ * src/toolbar.c
+ Put spam button in default toolbar even if
+ bogofilter and spamassassin are not built.
+ Other anti-spam plugin could exist! :)
+ * src/common/utils.c
+ Fix exit status fetch on win32
+
+Index: src/toolbar.c
+===================================================================
+RCS file: /srv/cvs/claws-mail/claws/src/toolbar.c,v
+retrieving revision 1.43.2.107
+retrieving revision 1.43.2.108
+diff -u -p -u -r1.43.2.107 -r1.43.2.108
+--- src/toolbar.c 23 Feb 2009 16:55:46 -0000 1.43.2.107
++++ src/toolbar.c 19 Mar 2009 16:35:36 -0000 1.43.2.108
+@@ -489,10 +489,8 @@ static void toolbar_set_default_main(voi
+ { A_SEPARATOR},
+ { A_TRASH},
+ #ifndef GENERIC_UMPC
+-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
+ { A_LEARN_SPAM},
+ #endif
+-#endif
+ { A_SEPARATOR},
+ { A_GOTO_NEXT}
+ };
+@@ -593,10 +591,8 @@ static void toolbar_set_default_msgview(
+ { A_SEPARATOR},
+ { A_TRASH},
+ #ifndef GENERIC_UMPC
+-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
+ { A_LEARN_SPAM},
+ #endif
+-#endif
+ { A_GOTO_NEXT}
+ };
+
+Index: src/common/utils.c
+===================================================================
+RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
+retrieving revision 1.36.2.168
+retrieving revision 1.36.2.169
+diff -u -p -u -r1.36.2.168 -r1.36.2.169
+--- src/common/utils.c 17 Mar 2009 18:04:04 -0000 1.36.2.168
++++ src/common/utils.c 19 Mar 2009 16:35:36 -0000 1.36.2.169
+@@ -3286,18 +3286,25 @@ static gint execute_sync(gchar *const ar
+
+ cm_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+
++#ifdef G_OS_UNIX
+ if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
+ NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
+ g_warning("Couldn't execute command: %s\n", argv[0]);
+ return -1;
+ }
+
+-#ifdef G_OS_UNIX
+ if (WIFEXITED(status))
+ return WEXITSTATUS(status);
+ else
+ return -1;
+ #else
++ if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH|
++ G_SPAWN_CHILD_INHERITS_STDIN|G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
++ NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
++ g_warning("Couldn't execute command: %s\n", argv[0]);
++ return -1;
++ }
++
+ return status;
+ #endif
+ }
Property changes on: trunk/patches/claws-mail-3.7.1/02-3.7.1cvs22.patch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/patches/claws-mail-3.7.1/02-bug_1813.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/02-bug_1813.patch 2009-03-17 13:38:31 UTC (rev 1130)
+++ trunk/patches/claws-mail-3.7.1/02-bug_1813.patch 2009-03-19 18:05:01 UTC (rev 1132)
@@ -1,154 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/prefs_themes.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/prefs_themes.c,v
-retrieving revision 1.3.2.61
-retrieving revision 1.3.2.62
-diff -u -r1.3.2.61 -r1.3.2.62
---- src/prefs_themes.c 2 Jan 2009 10:51:34 -0000 1.3.2.61
-+++ src/prefs_themes.c 9 Jan 2009 08:02:05 -0000 1.3.2.62
-@@ -253,14 +253,19 @@
- static gboolean prefs_themes_is_system_theme(const gchar *dirname)
- {
- gint len;
--
-+ gchar *system_theme_dir;
-+ gboolean is_sys = FALSE;
-+
- g_return_val_if_fail(dirname != NULL, FALSE);
-
-- len = strlen(PACKAGE_DATA_DIR);
-- if (strlen(dirname) > len && 0 == strncmp(dirname, PACKAGE_DATA_DIR, len))
-- return TRUE;
-+ system_theme_dir = stock_pixmap_get_system_theme_dir_for_theme(NULL);
-+ len = strlen(system_theme_dir);
-+ if (strlen(dirname) > len && 0 == strncmp(dirname, system_theme_dir, len))
-+ is_sys = TRUE;
-
-- return FALSE;
-+ g_free(system_theme_dir);
-+
-+ return is_sys;
- }
-
- static void prefs_themes_set_themes_menu(GtkComboBox *combo, const ThemesData *tdata)
-@@ -526,9 +531,8 @@
- GTK_STOCK_NO, GTK_STOCK_YES, NULL);
- switch (val) {
- case G_ALERTALTERNATE:
-- cinfo->dest = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
-- PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S,
-- themename, NULL);
-+ cinfo->dest = stock_pixmap_get_system_theme_dir_for_theme(
-+ themename);
- break;
- case G_ALERTDEFAULT:
- break;
-Index: src/stock_pixmap.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/stock_pixmap.c,v
-retrieving revision 1.25.2.62
-retrieving revision 1.25.2.63
-diff -u -r1.25.2.62 -r1.25.2.63
---- src/stock_pixmap.c 2 Jan 2009 13:05:54 -0000 1.25.2.62
-+++ src/stock_pixmap.c 9 Jan 2009 08:02:05 -0000 1.25.2.63
-@@ -527,6 +527,19 @@
- closedir(dp);
- }
-
-+gchar *stock_pixmap_get_system_theme_dir_for_theme(const gchar *theme)
-+{
-+ const gchar *sep = NULL;
-+ if (theme && *theme)
-+ sep = G_DIR_SEPARATOR_S;
-+#ifndef G_OS_WIN32
-+ return g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
-+ PIXMAP_THEME_DIR, sep, theme, NULL);
-+#else
-+ return g_strconcat(get_themes_dir(), sep, theme, NULL);
-+#endif
-+}
-+
- GList *stock_pixmap_themes_list_new(void)
- {
- gchar *defaulttheme;
-@@ -537,11 +550,9 @@
- defaulttheme = g_strdup(DEFAULT_PIXMAP_THEME);
- userthemes = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- PIXMAP_THEME_DIR, NULL);
-- systemthemes = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
-- PIXMAP_THEME_DIR, NULL);
-+ systemthemes = stock_pixmap_get_system_theme_dir_for_theme(NULL);
-
- list = g_list_append(list, defaulttheme);
--
- stock_pixmap_find_themes_in_dir(&list, userthemes);
- stock_pixmap_find_themes_in_dir(&list, systemthemes);
-
-Index: src/stock_pixmap.h
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/stock_pixmap.h,v
-retrieving revision 1.18.2.39
-retrieving revision 1.18.2.40
-diff -u -r1.18.2.39 -r1.18.2.40
---- src/stock_pixmap.h 2 Jan 2009 13:05:54 -0000 1.18.2.39
-+++ src/stock_pixmap.h 9 Jan 2009 08:02:05 -0000 1.18.2.40
-@@ -216,5 +216,6 @@
- OverlayPosition pos,
- gint border_x,
- gint border_y);
-+gchar *stock_pixmap_get_system_theme_dir_for_theme(const gchar *theme);
-
- #endif /* __STOCK_PIXMAP_H__ */
-Index: src/common/utils.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
-retrieving revision 1.36.2.160
-retrieving revision 1.36.2.161
-diff -u -r1.36.2.160 -r1.36.2.161
---- src/common/utils.c 6 Jan 2009 09:26:48 -0000 1.36.2.160
-+++ src/common/utils.c 9 Jan 2009 08:02:05 -0000 1.36.2.161
-@@ -1996,6 +1996,21 @@
- #endif
- }
-
-+
-+#ifdef G_OS_WIN32
-+/* Return the default directory for Themes. */
-+const gchar *get_themes_dir(void)
-+{
-+ static gchar *themes_dir = NULL;
-+
-+ if (!themes_dir)
-+ themes_dir = g_strconcat(w32_get_module_dir(),
-+ "\\share\\claws-mail\\themes",
-+ NULL);
-+ return themes_dir;
-+}
-+#endif
-+
- const gchar *get_tmp_dir(void)
- {
- static gchar *tmp_dir = NULL;
-Index: src/common/utils.h
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.h,v
-retrieving revision 1.20.2.65
-retrieving revision 1.20.2.66
-diff -u -r1.20.2.65 -r1.20.2.66
---- src/common/utils.h 13 Dec 2008 21:20:39 -0000 1.20.2.65
-+++ src/common/utils.h 9 Jan 2009 08:02:05 -0000 1.20.2.66
-@@ -359,7 +359,8 @@
- gchar *get_tmp_file (void);
- const gchar *get_domain_name (void);
- #ifdef G_OS_WIN32
--const gchar *get_cert_file(void);
-+const gchar *get_themes_dir (void);
-+const gchar *get_cert_file (void);
- #endif
- /* file / directory handling */
- off_t get_file_size (const gchar *file);
-
Deleted: trunk/patches/claws-mail-3.7.1/03-bug_1814.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/03-bug_1814.patch 2009-03-17 13:38:31 UTC (rev 1130)
+++ trunk/patches/claws-mail-3.7.1/03-bug_1814.patch 2009-03-19 18:05:01 UTC (rev 1132)
@@ -1,23 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/messageview.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/messageview.c,v
-retrieving revision 1.94.2.194
-retrieving revision 1.94.2.195
-diff -u -r1.94.2.194 -r1.94.2.195
---- src/messageview.c 9 Dec 2008 16:59:36 -0000 1.94.2.194
-+++ src/messageview.c 9 Jan 2009 08:09:21 -0000 1.94.2.195
-@@ -674,6 +674,9 @@
-
- gtk_widget_set_size_request(window, prefs_common.msgwin_width,
- prefs_common.msgwin_height);
-+#ifdef G_OS_WIN32
-+ gtk_window_move(GTK_WINDOW(window), 48, 48);
-+#endif
-
- msgview = messageview_create(mainwin);
-
-
Deleted: trunk/patches/claws-mail-3.7.1/04-bug_1815.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/04-bug_1815.patch 2009-03-17 13:38:31 UTC (rev 1130)
+++ trunk/patches/claws-mail-3.7.1/04-bug_1815.patch 2009-03-19 18:05:01 UTC (rev 1132)
@@ -1,69 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/compose.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/compose.c,v
-retrieving revision 1.382.2.492
-diff -u -p -u -r1.382.2.492 compose.c
---- src/compose.c 28 Dec 2008 16:23:07 -0000 1.382.2.492
-+++ src/compose.c 9 Jan 2009 09:27:58 -0000
-@@ -10086,8 +10086,10 @@ static void compose_attach_drag_received
- Compose *compose = (Compose *)user_data;
- GList *list, *tmp;
-
-- if (gdk_atom_name(data->type) &&
-- !strcmp(gdk_atom_name(data->type), "text/uri-list")
-+ if (((gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list"))
-+#ifdef G_OS_WIN32
-+ || (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "DROPFILES_DND")))
-+#endif
- && gtk_drag_get_source_widget(context) !=
- summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
- list = uri_list_extract_filenames((const gchar *)data->data);
-@@ -10153,11 +10155,18 @@ static void compose_insert_drag_received
-
- /* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
- * does not work */
-+ debug_print("drop: %s (%s)\n", gdk_atom_name(data->type)?gdk_atom_name(data->type):"nul",
-+ data->data?data->data:"nul");
-+#ifndef G_OS_WIN32
- if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
-+#else
-+ if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "DROPFILES_DND")) {
-+#endif
- AlertValue val = G_ALERTDEFAULT;
-
- list = uri_list_extract_filenames((const gchar *)data->data);
--
-+ debug_print("list: %p (%s)\n", list,
-+ data->data?data->data:"nul");
- if (list == NULL && strstr((gchar *)(data->data), "://")) {
- /* Assume a list of no files, and data has ://, is a remote link */
- gchar *tmpdata = g_strstrip(g_strdup((const gchar *)data->data));
-Index: src/common/utils.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
-retrieving revision 1.36.2.161
-diff -u -p -u -r1.36.2.161 utils.c
---- src/common/utils.c 9 Jan 2009 08:02:05 -0000 1.36.2.161
-+++ src/common/utils.c 9 Jan 2009 09:28:01 -0000
-@@ -1396,6 +1396,7 @@ GList *uri_list_extract_filenames(const
- * g_filename_from_uri() rejects escaped/locale encoded uri
- * string which come from Nautilus.
- */
-+#ifndef G_OS_WIN32
- if (g_utf8_validate(file, -1, NULL))
- locale_file
- = conv_codeset_strdup(
-@@ -1404,6 +1405,9 @@ GList *uri_list_extract_filenames(const
- conv_get_locale_charset_str());
- if (!locale_file)
- locale_file = g_strdup(file + 5);
-+#else
-+ locale_file = g_filename_from_uri(file, NULL, NULL);
-+#endif
- result = g_list_append(result, locale_file);
- }
- }
Deleted: trunk/patches/claws-mail-3.7.1/05-bug_1816.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/05-bug_1816.patch 2009-03-17 13:38:31 UTC (rev 1130)
+++ trunk/patches/claws-mail-3.7.1/05-bug_1816.patch 2009-03-19 18:05:01 UTC (rev 1132)
@@ -1,24 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/main.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/main.c,v
-retrieving revision 1.115.2.216
-diff -u -p -u -r1.115.2.216 main.c
---- src/main.c 26 Nov 2008 11:59:57 -0000 1.115.2.216
-+++ src/main.c 9 Jan 2009 09:44:35 -0000
-@@ -2341,10 +2341,9 @@ static void lock_socket_input_cb(gpointe
- mailto = g_strdup(buf + strlen("compose_attach") + 1);
- files = g_ptr_array_new();
- while (fd_gets(sock, buf, sizeof(buf)) > 0) {
-- if (buf[0] == '.' && buf[1] == '\n') {
-- break;
-- }
- strretchomp(buf);
-+ if (!strcmp2(buf, "."))
-+ break;
- g_ptr_array_add(files, g_strdup(buf));
- }
- open_compose_new(mailto, files);
Deleted: trunk/patches/claws-mail-3.7.1/06-bug_1825.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/06-bug_1825.patch 2009-03-17 13:38:31 UTC (rev 1130)
+++ trunk/patches/claws-mail-3.7.1/06-bug_1825.patch 2009-03-19 18:05:01 UTC (rev 1132)
@@ -1,381 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/main.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/main.c,v
-retrieving revision 1.115.2.218
-retrieving revision 1.115.2.219
-diff -u -p -u -r1.115.2.218 -r1.115.2.219
---- src/main.c 9 Jan 2009 18:51:00 -0000 1.115.2.218
-+++ src/main.c 17 Jan 2009 16:24:30 -0000 1.115.2.219
-@@ -2493,7 +2493,7 @@ static void install_memory_sighandler()
- struct sigaction act;
- int flags;
-
-- mem_notify_fd = open("/dev/mem_notify", O_RDONLY|O_NONBLOCK);
-+ mem_notify_fd = g_open("/dev/mem_notify", O_RDONLY|O_NONBLOCK, 0);
- if (mem_notify_fd == -1) {
- debug_print("/dev/mem_notify not available (%s)\n",
- strerror(errno));
-Index: src/mbox.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/mbox.c,v
-retrieving revision 1.28.2.44
-retrieving revision 1.28.2.45
-diff -u -p -u -r1.28.2.44 -r1.28.2.45
---- src/mbox.c 9 Jan 2009 17:46:56 -0000 1.28.2.44
-+++ src/mbox.c 17 Jan 2009 16:24:30 -0000 1.28.2.45
-@@ -358,9 +358,9 @@ gint lock_mbox(const gchar *base, LockTy
- #endif
-
- #if HAVE_FLOCK
-- if ((lockfd = open(base, O_RDWR)) < 0) {
-+ if ((lockfd = g_open(base, O_RDWR, 0)) < 0) {
- #else
-- if ((lockfd = open(base, O_RDWR)) < 0) {
-+ if ((lockfd = g_open(base, O_RDWR, 0)) < 0) {
- #endif
- FILE_OP_ERROR(base, "open");
- return -1;
-Index: src/common/md5.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/md5.c,v
-retrieving revision 1.2.2.6
-retrieving revision 1.2.2.7
-diff -u -p -u -r1.2.2.6 -r1.2.2.7
---- src/common/md5.c 11 Nov 2008 12:48:43 -0000 1.2.2.6
-+++ src/common/md5.c 17 Jan 2009 16:24:30 -0000 1.2.2.7
-@@ -355,7 +355,7 @@ md5_hex_digest_file(char *hexdigest, con
- char *lastp = buf; /* point to the start of the buffer */
- size_t total = 0; /* total length read */
- int num_alloc = 1; /* number of blocks allocated */
-- int fd = open(file, O_RDONLY);
-+ int fd = g_open(file, O_RDONLY, 0);
-
- if (fd == -1) {
- FILE_OP_ERROR(file, "open");
-Index: src/common/ssl_certificate.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/ssl_certificate.c,v
-retrieving revision 1.4.2.35
-retrieving revision 1.4.2.36
-diff -u -p -u -r1.4.2.35 -r1.4.2.36
---- src/common/ssl_certificate.c 9 Jan 2009 17:47:12 -0000 1.4.2.35
-+++ src/common/ssl_certificate.c 17 Jan 2009 16:24:31 -0000 1.4.2.36
-@@ -537,7 +537,7 @@ static guint check_cert(gnutls_x509_crt
- FILE *fp;
-
- if (claws_ssl_get_cert_file())
-- fp = fopen(claws_ssl_get_cert_file(), "r");
-+ fp = g_fopen(claws_ssl_get_cert_file(), "r");
- else
- return (guint)-1;
-
-Index: src/common/tags.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/Attic/tags.c,v
-retrieving revision 1.1.2.9
-retrieving revision 1.1.2.10
-diff -u -p -u -r1.1.2.9 -r1.1.2.10
---- src/common/tags.c 9 Jan 2009 17:47:12 -0000 1.1.2.9
-+++ src/common/tags.c 17 Jan 2009 16:24:31 -0000 1.1.2.10
-@@ -50,7 +50,7 @@ void tags_read_tags(void)
- TAGS_RC, NULL);
- gchar tmp[255];
- gint id;
-- FILE *fp = fopen(file, "rb");
-+ FILE *fp = g_fopen(file, "rb");
-
- g_free(file);
-
-@@ -122,10 +122,10 @@ void tags_write_tags(void)
- TAGS_RC, NULL);
- TagWriteData data;
-
-- FILE *fp = fopen(file, "wb");
-+ FILE *fp = g_fopen(file, "wb");
-
- if (!fp) {
-- FILE_OP_ERROR(file, "fopen");
-+ FILE_OP_ERROR(file, "g_fopen");
- g_free(file);
- g_free(file_new);
- return;
-Index: src/common/utils.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
-retrieving revision 1.36.2.163
-retrieving revision 1.36.2.164
-diff -u -p -u -r1.36.2.163 -r1.36.2.164
---- src/common/utils.c 9 Jan 2009 18:55:52 -0000 1.36.2.163
-+++ src/common/utils.c 17 Jan 2009 16:24:31 -0000 1.36.2.164
-@@ -196,6 +196,17 @@ FILE* g_fopen(const gchar *filename, con
- return fopen(filename, mode);
- #endif
- }
-+int g_open(const gchar *filename, int flags, int mode)
-+{
-+#ifdef G_OS_WIN32
-+ char *name = g_win32_locale_filename_from_utf8(filename);
-+ int fd = open(name, flags, mode);
-+ g_free(name);
-+ return fp;
-+#else
-+ return open(filename, flags, mode);
-+#endif
-+}
- #endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
-
-
-@@ -207,7 +218,7 @@ gint mkstemp_name(gchar *template, gchar
- int tmpfd;
-
- *name_used = g_strdup_printf("%s.%ld",_mktemp(template),count++);
-- tmpfd = open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
-+ tmpfd = g_open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
- (S_IRUSR | S_IWUSR));
-
- tempfiles=g_slist_append(tempfiles, g_strdup(*name_used));
-@@ -469,11 +480,11 @@ gint file_strip_crs(const gchar *file)
- if (file == NULL)
- goto freeout;
-
-- fp = fopen(file, "rb");
-+ fp = g_fopen(file, "rb");
- if (!fp)
- goto freeout;
-
-- outfp = fopen(out, "wb");
-+ outfp = g_fopen(out, "wb");
- if (!outfp) {
- fclose(fp);
- goto freeout;
-@@ -2098,7 +2109,7 @@ off_t get_file_size_as_crlf(const gchar
- gchar buf[BUFFSIZE];
-
- if ((fp = g_fopen(file, "rb")) == NULL) {
-- FILE_OP_ERROR(file, "fopen");
-+ FILE_OP_ERROR(file, "g_fopen");
- return -1;
- }
-
-@@ -2489,12 +2500,12 @@ gint append_file(const gchar *src, const
- gboolean err = FALSE;
-
- if ((src_fp = g_fopen(src, "rb")) == NULL) {
-- FILE_OP_ERROR(src, "fopen");
-+ FILE_OP_ERROR(src, "g_fopen");
- return -1;
- }
-
- if ((dest_fp = g_fopen(dest, "ab")) == NULL) {
-- FILE_OP_ERROR(dest, "fopen");
-+ FILE_OP_ERROR(dest, "g_fopen");
- fclose(src_fp);
- return -1;
- }
-@@ -2543,7 +2554,7 @@ gint copy_file(const gchar *src, const g
- gboolean err = FALSE;
-
- if ((src_fp = g_fopen(src, "rb")) == NULL) {
-- FILE_OP_ERROR(src, "fopen");
-+ FILE_OP_ERROR(src, "g_fopen");
- return -1;
- }
- if (is_file_exist(dest)) {
-@@ -2557,7 +2568,7 @@ gint copy_file(const gchar *src, const g
- }
-
- if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
-- FILE_OP_ERROR(dest, "fopen");
-+ FILE_OP_ERROR(dest, "g_fopen");
- fclose(src_fp);
- if (dest_bak) {
- if (rename_force(dest_bak, dest) < 0)
-@@ -2678,7 +2689,7 @@ gint copy_file_part(FILE *fp, off_t offs
- gboolean err = FALSE;
-
- if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
-- FILE_OP_ERROR(dest, "fopen");
-+ FILE_OP_ERROR(dest, "g_fopen");
- return -1;
- }
-
-@@ -2749,12 +2760,12 @@ gint canonicalize_file(const gchar *src,
- gboolean last_linebreak = FALSE;
-
- if ((src_fp = g_fopen(src, "rb")) == NULL) {
-- FILE_OP_ERROR(src, "fopen");
-+ FILE_OP_ERROR(src, "g_fopen");
- return -1;
- }
-
- if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
-- FILE_OP_ERROR(dest, "fopen");
-+ FILE_OP_ERROR(dest, "g_fopen");
- fclose(src_fp);
- return -1;
- }
-@@ -3056,7 +3067,7 @@ gint str_write_to_file(const gchar *str,
- g_return_val_if_fail(file != NULL, -1);
-
- if ((fp = g_fopen(file, "wb")) == NULL) {
-- FILE_OP_ERROR(file, "fopen");
-+ FILE_OP_ERROR(file, "g_fopen");
- return -1;
- }
-
-@@ -3147,14 +3158,14 @@ static gchar *file_read_to_str_full(cons
- }
-
- #ifdef G_OS_WIN32
-- fp = fopen (file, "rb");
-+ fp = g_fopen (file, "rb");
- if (fp == NULL) {
- FILE_OP_ERROR(file, "open");
- return NULL;
- }
- #else
- /* test whether the file is readable without blocking */
-- fd = open(file, O_RDONLY | O_NONBLOCK);
-+ fd = g_open(file, O_RDONLY | O_NONBLOCK, 0);
- if (fd == -1) {
- FILE_OP_ERROR(file, "open");
- return NULL;
-@@ -4572,7 +4583,7 @@ gchar *make_http_string(const gchar *bp,
-
- static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type, const gchar *file_to_open)
- {
-- FILE *fp = fopen(path, "rb");
-+ FILE *fp = g_fopen(path, "rb");
- gchar buf[BUFFSIZE];
- gchar *result = NULL;
- if (!fp)
-@@ -4685,8 +4696,8 @@ void mailcap_update_default(const gchar
- gchar *path = NULL, *outpath = NULL;
- path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap", NULL);
- outpath = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap.new", NULL);
-- FILE *fp = fopen(path, "rb");
-- FILE *outfp = fopen(outpath, "wb");
-+ FILE *fp = g_fopen(path, "rb");
-+ FILE *outfp = g_fopen(outpath, "wb");
- gchar buf[BUFFSIZE];
- gboolean err = FALSE;
-
-Index: src/etpan/imap-thread.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/etpan/Attic/imap-thread.c,v
-retrieving revision 1.1.4.107
-retrieving revision 1.1.4.108
-diff -u -p -u -r1.1.4.107 -r1.1.4.108
---- src/etpan/imap-thread.c 9 Jan 2009 17:47:14 -0000 1.1.4.107
-+++ src/etpan/imap-thread.c 17 Jan 2009 16:24:31 -0000 1.1.4.108
-@@ -2459,7 +2459,7 @@ static void fetch_content_run(struct etp
- result->error = r;
-
- if (r == MAILIMAP_NO_ERROR) {
-- fd = open(param->filename, O_RDWR | O_CREAT, 0600);
-+ fd = g_open(param->filename, O_RDWR | O_CREAT, 0600);
- if (fd < 0) {
- result->error = MAILIMAP_ERROR_FETCH;
- goto free;
-@@ -2960,7 +2960,7 @@ static void append_run(struct etpan_thre
- }
- size = stat_buf.st_size;
-
-- fd = open(param->filename, O_RDONLY);
-+ fd = g_open(param->filename, O_RDONLY, 0);
- if (fd < 0) {
- result->error = MAILIMAP_ERROR_APPEND;
- return;
-@@ -3246,7 +3246,7 @@ static void do_exec_command(int fd, cons
- /* Detach from the controlling tty if we have one. Otherwise,
- SSH might do something stupid like trying to use it instead
- of running $SSH_ASKPASS. Doh. */
-- fd = open("/dev/tty", O_RDONLY);
-+ fd = g_open("/dev/tty", O_RDONLY, 0);
- if (fd != -1) {
- ioctl(fd, TIOCNOTTY, NULL);
- close(fd);
-Index: src/plugins/bogofilter/bogofilter.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/plugins/bogofilter/Attic/bogofilter.c,v
-retrieving revision 1.1.2.39
-retrieving revision 1.1.2.40
-diff -u -p -u -r1.1.2.39 -r1.1.2.40
---- src/plugins/bogofilter/bogofilter.c 9 Jan 2009 17:47:19 -0000 1.1.2.39
-+++ src/plugins/bogofilter/bogofilter.c 17 Jan 2009 16:24:31 -0000 1.1.2.40
-@@ -272,8 +272,8 @@ static void bogofilter_do_filter(BogoFil
- FOLDER_TYPE(msginfo->folder->folder) == F_MH &&
- config.insert_header) {
- gchar *tmpfile = get_tmp_file();
-- FILE *input = fopen(file, "r");
-- FILE *output = fopen(tmpfile, "w");
-+ FILE *input = g_fopen(file, "r");
-+ FILE *output = g_fopen(tmpfile, "w");
- if (strstr(parts[2], "\n"))
- *(strstr(parts[2], "\n")) = '\0';
- if (input && !output)
-Index: src/plugins/pgpinline/pgpinline.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/plugins/pgpinline/Attic/pgpinline.c,v
-retrieving revision 1.1.2.42
-retrieving revision 1.1.2.43
-diff -u -p -u -r1.1.2.42 -r1.1.2.43
---- src/plugins/pgpinline/pgpinline.c 9 Jan 2009 17:47:21 -0000 1.1.2.42
-+++ src/plugins/pgpinline/pgpinline.c 17 Jan 2009 16:24:31 -0000 1.1.2.43
-@@ -133,7 +133,7 @@ static gchar *get_part_as_string(MimeInf
- printf("error dumping file\n");
- return NULL;
- }
-- fp = fopen(filename,"rb");
-+ fp = g_fopen(filename,"rb");
- if (!fp) {
- printf("error reading file\n");
- return NULL;
-Index: src/plugins/smime/smime.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/plugins/smime/Attic/smime.c,v
-retrieving revision 1.1.2.3
-retrieving revision 1.1.2.4
-diff -u -p -u -r1.1.2.3 -r1.1.2.4
---- src/plugins/smime/smime.c 9 Jan 2009 17:47:22 -0000 1.1.2.3
-+++ src/plugins/smime/smime.c 17 Jan 2009 16:24:32 -0000 1.1.2.4
-@@ -430,7 +430,7 @@ static MimeInfo *smime_decrypt(MimeInfo
- get_mime_tmp_dir(), G_DIR_SEPARATOR, ++id);
-
- if ((dstfp = g_fopen(fname, "wb")) == NULL) {
-- FILE_OP_ERROR(fname, "fopen");
-+ FILE_OP_ERROR(fname, "g_fopen");
- g_free(fname);
- gpgme_data_release(plain);
- gpgme_release(ctx);
-@@ -795,7 +795,7 @@ gboolean smime_encrypt(MimeInfo *mimeinf
-
- /* write message content to temporary file */
- tmpfile = get_tmp_file();
-- fp = fopen(tmpfile, "wb");
-+ fp = g_fopen(tmpfile, "wb");
- if (fp == NULL) {
- perror("get_tmp_file");
- return FALSE;
-@@ -805,7 +805,7 @@ gboolean smime_encrypt(MimeInfo *mimeinf
- procmime_write_mimeinfo(msgcontent, fp);
- fclose(fp);
- canonicalize_file_replace(tmpfile);
-- fp = fopen(tmpfile, "rb");
-+ fp = g_fopen(tmpfile, "rb");
- if (fp == NULL) {
- perror("get_tmp_file");
- return FALSE;
-@@ -834,7 +834,7 @@ gboolean smime_encrypt(MimeInfo *mimeinf
- }
-
- tmpfile = get_tmp_file();
-- fp = fopen(tmpfile, "wb");
-+ fp = g_fopen(tmpfile, "wb");
- if (fp) {
- if (fwrite(enccontent, 1, len, fp) < len) {
- FILE_OP_ERROR(tmpfile, "fwrite");
Deleted: trunk/patches/claws-mail-3.7.1/07-bug_1865.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/07-bug_1865.patch 2009-03-17 13:38:31 UTC (rev 1130)
+++ trunk/patches/claws-mail-3.7.1/07-bug_1865.patch 2009-03-19 18:05:01 UTC (rev 1132)
@@ -1,82 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/prefs_filtering.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/prefs_filtering.c,v
-retrieving revision 1.59.2.78
-diff -u -p -u -r1.59.2.78 prefs_filtering.c
---- src/prefs_filtering.c 23 Feb 2009 16:55:43 -0000 1.59.2.78
-+++ src/prefs_filtering.c 3 Mar 2009 14:14:22 -0000
-@@ -653,9 +653,13 @@ static void rename_path(GSList * filters
- gint oldpathlen;
- GSList * action_cur;
- GSList * cur;
--
-+ const gchar *separator=G_DIR_SEPARATOR_S;
-+ gboolean matched = FALSE;
-+#ifdef G_OS_WIN32
-+again:
-+#endif
- oldpathlen = strlen(old_path);
-- old_path_with_sep = g_strconcat(old_path,G_DIR_SEPARATOR_S,NULL);
-+ old_path_with_sep = g_strconcat(old_path,separator,NULL);
-
- for (cur = filters; cur != NULL; cur = cur->next) {
- FilteringProp *filtering = (FilteringProp *)cur->data;
-@@ -685,28 +689,30 @@ static void rename_path(GSList * filters
- while (*base == G_DIR_SEPARATOR) base++;
- if (*base == '\0')
- dest_path = g_strconcat(prefix,
-- G_DIR_SEPARATOR_S,
-+ separator,
- new_path, NULL);
- else
- dest_path = g_strconcat(prefix,
-- G_DIR_SEPARATOR_S,
-+ separator,
- new_path,
-- G_DIR_SEPARATOR_S,
-+ separator,
- base, NULL);
-
- g_free(prefix);
- g_free(action->destination);
- action->destination = dest_path;
-+ matched = TRUE;
- } else { /* for non-leaf folders */
- /* compare with trailing slash */
- if (!strncmp(old_path_with_sep, action->destination, oldpathlen+1)) {
-
- suffix = action->destination + oldpathlen + 1;
- dest_path = g_strconcat(new_path,
-- G_DIR_SEPARATOR_S,
-+ separator,
- suffix, NULL);
- g_free(action->destination);
- action->destination = dest_path;
-+ matched = TRUE;
- }
- }
- } else {
-@@ -715,10 +721,19 @@ static void rename_path(GSList * filters
- dest_path = g_strdup(new_path);
- g_free(action->destination);
- action->destination = dest_path;
-+ matched = TRUE;
- }
- }
- }
- }
-+
-+ g_free(old_path_with_sep);
-+#ifdef G_OS_WIN32
-+ if (!strcmp(separator, G_DIR_SEPARATOR_S) && !matched) {
-+ separator = "/";
-+ goto again;
-+ }
-+#endif
- }
-
- static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/src/Makefile.am 2009-03-19 18:05:01 UTC (rev 1132)
@@ -38,6 +38,7 @@
inst-rssyl.nsi uninst-rssyl.nsi \
inst-tnef_parse.nsi uninst-tnef_parse.nsi \
inst-attachwarner.nsi uninst-attachwarner.nsi \
+ inst-bsfilter_plugin.nsi uninst-bsfilter_plugin.nsi \
inst-crypt.nsi uninst-crypt.nsi \
inst-dirmngr.nsi uninst-dirmngr.nsi \
inst-eudoragpg.nsi uninst-eudoragpg.nsi \
@@ -73,6 +74,7 @@
inst-w32pth.nsi uninst-w32pth.nsi \
inst-winpt.nsi uninst-winpt.nsi \
inst-zlib.nsi uninst-zlib.nsi \
+ inst-bsfilter.nsi uninst-bsfilter.nsi \
inst-qt.nsi uninst-qt.nsi \
inst-kdesupport.nsi uninst-kdesupport.nsi \
inst-oxygen-icons.nsi uninst-oxygen-icons.nsi \
@@ -91,7 +93,8 @@
gpa winpt libgsasl libtasn1 opencdk gnutls curl libxml2 \
libetpan claws-mail notification_plugin gtkhtml2_viewer \
vcalendar rssyl gnupg2 pinentry libassuan libksba libgcrypt \
- adns dirmngr w32pth scute paperkey tnef_parse attachwarner
+ adns dirmngr w32pth scute paperkey tnef_parse attachwarner \
+ bsfilter_plugin
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -268,6 +271,9 @@
gpg4win_pkg_attachwarner_configure = \
--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) LIBS=\"-L$(idir)/bin\"
+gpg4win_pkg_bsfilter_plugin_configure = \
+ --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) LIBS=\"-L$(idir)/bin\"
+
gpg4win_pkg_scute_configure = --silent \
--with-gpgme-prefix=$(idir) --with-libassuan-prefix=$(idir)
@@ -294,7 +300,7 @@
# Supported binary packages.
gpg4win_bpkgs = libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
atk gtk+ gpgee crypt regex qt kdesupport oxygen-icons kdelibs \
- kleopatra
+ kleopatra bsfilter
# libiconv needs some special magic to generate a usable import
# library.
Added: trunk/src/inst-bsfilter.nsi
===================================================================
--- trunk/src/inst-bsfilter.nsi 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/src/inst-bsfilter.nsi 2009-03-19 18:05:01 UTC (rev 1132)
@@ -0,0 +1,38 @@
+# inst-bsfilter.nsi - Installer snippet for bsfilter. -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+#
+# This file is part of GPG4Win.
+#
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/bsfilter-${gpg4win_pkg_bsfilter_version}
+
+!ifdef DEBUG
+Section "bsfilter" SEC_bsfilter
+!else
+Section "-bsfilter" SEC_bsfilter
+!endif
+ SetOutPath "$INSTDIR\pub"
+!ifdef SOURCES
+ File ${gpg4win_pkg_bsfilter_src}
+!else
+ File ${prefix}/bin/bsfilterw.exe
+ File ${prefix}/bin/bsfilter.exe
+!endif
+SectionEnd
Added: trunk/src/inst-bsfilter_plugin.nsi
===================================================================
--- trunk/src/inst-bsfilter_plugin.nsi 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/src/inst-bsfilter_plugin.nsi 2009-03-19 18:05:01 UTC (rev 1132)
@@ -0,0 +1,41 @@
+# inst-bsfilter_plugin.nsi - Installer snippet for bsfilter_plugin. -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
+#
+# This file is part of GPG4Win.
+#
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/bsfilter_plugin-${gpg4win_pkg_bsfilter_plugin_version}
+
+!ifdef DEBUG
+Section "bsfilter_plugin" SEC_bsfilter_plugin
+!else
+Section "-bsfilter_plugin" SEC_bsfilter_plugin
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File ${gpg4win_pkg_bsfilter_plugin}
+!else
+
+ SetOutPath "$INSTDIR\lib\claws-mail\plugins"
+ File ${prefix}/lib/claws-mail/plugins/bsfilter.dll
+
+ SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
+ File ${prefix}/share/locale/fr/LC_MESSAGES/bsfilter_plugin.mo
+!endif
+SectionEnd
Modified: trunk/src/inst-libiconv.nsi
===================================================================
--- trunk/src/inst-libiconv.nsi 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/src/inst-libiconv.nsi 2009-03-19 18:05:01 UTC (rev 1132)
@@ -29,7 +29,7 @@
!else
Section "-libiconv" SEC_libiconv
!endif
- SetOutPath "$INSTDIR"
+ SetOutPath "$INSTDIR\pub"
!ifdef SOURCES
File "${gpg4win_pkg_libiconv_src}"
!else
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/src/inst-sections.nsi 2009-03-19 18:05:01 UTC (rev 1132)
@@ -68,6 +68,9 @@
!ifdef HAVE_PKG_ZLIB
!include "inst-zlib.nsi"
!endif
+!ifdef HAVE_PKG_BSFILTER
+!include "inst-bsfilter.nsi"
+!endif
!ifdef HAVE_PKG_QT
!include "inst-qt.nsi"
!endif
@@ -176,6 +179,9 @@
!ifdef HAVE_PKG_ATTACHWARNER
!include "inst-attachwarner.nsi"
!endif
+!ifdef HAVE_PKG_BSFILTER_PLUGIN
+!include "inst-bsfilter_plugin.nsi"
+!endif
#!ifdef HAVE_PKG_EUDORAGPG
#!include "inst-eudoragpg.nsi"
#!endif
@@ -238,6 +244,9 @@
!ifdef HAVE_PKG_ATTACHWARNER
!include "uninst-attachwarner.nsi"
!endif
+!ifdef HAVE_PKG_BSFILTER_PLUGIN
+!include "uninst-bsfilter_plugin.nsi"
+!endif
!ifdef HAVE_PKG_PAPERKEY
!include "uninst-paperkey.nsi"
!endif
@@ -323,6 +332,9 @@
!ifdef HAVE_PKG_QT
!include "uninst-qt.nsi"
!endif
+!ifdef HAVE_PKG_BSFILTER
+!include "uninst-bsfilter.nsi"
+!endif
!ifdef HAVE_PKG_ZLIB
!include "uninst-zlib.nsi"
!endif
@@ -569,6 +581,9 @@
!ifdef HAVE_PKG_ZLIB
!insertmacro UnselectSection ${SEC_zlib}
!endif
+!ifdef HAVE_PKG_BSFILTER
+ !insertmacro UnselectSection ${SEC_bsfilter}
+!endif
!ifdef HAVE_PKG_CRYPT
!insertmacro UnselectSection ${SEC_crypt}
!endif
@@ -665,6 +680,9 @@
!ifdef HAVE_PKG_ATTACHWARNER
!insertmacro UnselectSection ${SEC_attachwarner}
!endif
+!ifdef HAVE_PKG_BSFILTER_PLUGIN
+ !insertmacro UnselectSection ${SEC_bsfilter_plugin}
+!endif
!ifdef HAVE_PKG_KDESUPPORT
!insertmacro UnselectSection ${SEC_kdesupport}
!endif
@@ -807,12 +825,14 @@
!insertmacro SelectSection ${SEC_gnutls}
# These are not build dependencies, but we always want to install
# all plugins.
+ !insertmacro SelectSection ${SEC_bsfilter}
!insertmacro SelectSection ${SEC_notification_plugin}
!insertmacro SelectSection ${SEC_gtkhtml2_viewer}
!insertmacro SelectSection ${SEC_vcalendar}
!insertmacro SelectSection ${SEC_rssyl}
!insertmacro SelectSection ${SEC_tnef_parse}
!insertmacro SelectSection ${SEC_attachwarner}
+ !insertmacro SelectSection ${SEC_bsfilter_plugin}
skip_claws_mail:
!endif
Added: trunk/src/uninst-bsfilter.nsi
===================================================================
--- trunk/src/uninst-bsfilter.nsi 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/src/uninst-bsfilter.nsi 2009-03-19 18:05:01 UTC (rev 1132)
@@ -0,0 +1,37 @@
+# uninst-bsfilter.nsi - Installer snippet for bsfilter. -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+#
+# This file is part of GPG4Win.
+#
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/bsfilter-${gpg4win_pkg_bsfilter_version}
+
+
+; Uninstaller section.
+Section "-un.bsfilter"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_bsfilter_src}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\pub\bsfilterw.exe"
+ Delete "$INSTDIR\pub\bsfilter.exe"
+ RMDir "$INSTDIR"
+!endif
+SectionEnd
Added: trunk/src/uninst-bsfilter_plugin.nsi
===================================================================
--- trunk/src/uninst-bsfilter_plugin.nsi 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/src/uninst-bsfilter_plugin.nsi 2009-03-19 18:05:01 UTC (rev 1132)
@@ -0,0 +1,44 @@
+# uninst-bsfilter_plugin.nsi - Installer snippet for bsfilter_plugin.-*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007 g10 Code GmbH
+#
+# This file is part of GPG4Win.
+#
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/bsfilter_plugin-${gpg4win_pkg_bsfilter_plugin_version}
+
+
+; Uninstaller section.
+Section "-un.bsfilter_plugin"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_bsfilter_plugin}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\lib\claws-mail\plugins\bsfilter.dll"
+ RMDir "$INSTDIR\lib\claws-mail\plugins"
+ RMDir "$INSTDIR\lib\claws-mail"
+ Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\bsfilter_plugin.mo"
+ RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\fr"
+ RMDir "$INSTDIR\share\locale"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR\lib"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
Modified: trunk/src/uninst-libiconv.nsi
===================================================================
--- trunk/src/uninst-libiconv.nsi 2009-03-19 13:45:39 UTC (rev 1131)
+++ trunk/src/uninst-libiconv.nsi 2009-03-19 18:05:01 UTC (rev 1132)
@@ -30,10 +30,10 @@
Push "${gpg4win_pkg_libiconv_src}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\iconv.dll"
+ Delete "$INSTDIR\pub\iconv.dll"
!ifdef DEBUG
- Delete "$INSTDIR\charset.dll"
- Delete "$INSTDIR\iconv.exe"
+ Delete "$INSTDIR\pub\charset.dll"
+ Delete "$INSTDIR\pub\iconv.exe"
!endif
RMDir "$INSTDIR"
!endif
More information about the Gpg4win-commits
mailing list