2004-11-12 [paul] 0.9.12cvs146

	* src/prefs_account.c
	* src/procmime.c
	* src/procmime.h
		fix sync breakage

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a08b0e1b745031ac022a6e34aeaaaec72eb71fdd..683665ac263eac13afe5cec924eb526b3ae67de0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2004-11-12 [paul]      0.9.12cvs146
+
+       * src/prefs_account.c
+       * src/procmime.c
+       * src/procmime.h
+               fix sync breakage 
+

 2004-11-12 [paul]
 
        * src/pixmaps/complete.xpm
 2004-11-12 [paul]
 
        * src/pixmaps/complete.xpm

diff --git a/PATCHSETS b/PATCHSETS
index e2949ddb25f678769a5c05f73afc9a8bed7d6488..a93bee025c2afc6ab1d2ff077ad04c56c9ca7e81 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -128,3 +128,4 @@
 ( cvs diff -u -r 1.449 -r 1.450 src/summaryview.c; ) > 0.9.12cvs143.patchset
 ( cvs diff -u -r 1.453 -r 1.454 src/compose.c; cvs diff -u -r 1.261 -r 1.262 src/folder.c; cvs diff -u -r 1.312 -r 1.313 src/mainwindow.c; cvs diff -u -r 1.116 -r 1.118 src/prefs_account.c; cvs diff -u -r 1.53 -r 1.54 src/prefs_account.h; cvs diff -u -r 1.8 -r 1.9 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs144.patchset
 ( cvs diff -u -r 1.444 -r 1.445 ChangeLog; cvs diff -u -r 1.439 -r 1.440 ChangeLog.jp; cvs diff -u -r 1.75 -r 1.76 src/account.c; cvs diff -u -r 1.250 -r 1.251 src/folderview.c; cvs diff -u -r 1.26 -r 1.27 src/folderview.h; cvs diff -u -r 1.208 -r 1.209 src/imap.c; cvs diff -u -r 1.2 -r 1.3 src/imap_gtk.c; cvs diff -u -r 1.178 -r 1.179 src/inc.c; cvs diff -u -r 1.312 -r 1.313 src/mainwindow.c; cvs diff -u -r 1.4 -r 1.5 src/mh_gtk.c; cvs diff -u -r 1.2 -r 1.3 src/news_gtk.c; cvs diff -u -r 1.69 -r 1.70 src/pop.c; cvs diff -u -r 1.118 -r 1.119 src/prefs_account.c; cvs diff -u -r 1.54 -r 1.55 src/prefs_account.h; cvs diff -u -r 1.5 -r 1.6 src/prefs_ext_prog.c; cvs diff -u -r 1.169 -r 1.170 src/procmsg.c; cvs diff -u -r 1.71 -r 1.72 src/procmsg.h; cvs diff -u -r 1.18 -r 1.19 src/summary_search.c; cvs diff -u -r 1.450 -r 1.451 src/summaryview.c; cvs diff -u -r 1.128 -r 1.129 src/textview.c; cvs diff -u -r 1.16 -r 1.17 src/common/defs.h; cvs diff -u -r 1.57 -r 1.58 src/common/utils.c; cvs diff -u -r 1.33 -r 1.34 src/common/utils.h; cvs diff -u -r 1.10 -r 1.11 src/gtk/menu.c; cvs diff -u -r 1.8 -r 1.9 src/gtk/menu.h; ) > 0.9.12cvs145.patchset
 ( cvs diff -u -r 1.449 -r 1.450 src/summaryview.c; ) > 0.9.12cvs143.patchset
 ( cvs diff -u -r 1.453 -r 1.454 src/compose.c; cvs diff -u -r 1.261 -r 1.262 src/folder.c; cvs diff -u -r 1.312 -r 1.313 src/mainwindow.c; cvs diff -u -r 1.116 -r 1.118 src/prefs_account.c; cvs diff -u -r 1.53 -r 1.54 src/prefs_account.h; cvs diff -u -r 1.8 -r 1.9 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs144.patchset
 ( cvs diff -u -r 1.444 -r 1.445 ChangeLog; cvs diff -u -r 1.439 -r 1.440 ChangeLog.jp; cvs diff -u -r 1.75 -r 1.76 src/account.c; cvs diff -u -r 1.250 -r 1.251 src/folderview.c; cvs diff -u -r 1.26 -r 1.27 src/folderview.h; cvs diff -u -r 1.208 -r 1.209 src/imap.c; cvs diff -u -r 1.2 -r 1.3 src/imap_gtk.c; cvs diff -u -r 1.178 -r 1.179 src/inc.c; cvs diff -u -r 1.312 -r 1.313 src/mainwindow.c; cvs diff -u -r 1.4 -r 1.5 src/mh_gtk.c; cvs diff -u -r 1.2 -r 1.3 src/news_gtk.c; cvs diff -u -r 1.69 -r 1.70 src/pop.c; cvs diff -u -r 1.118 -r 1.119 src/prefs_account.c; cvs diff -u -r 1.54 -r 1.55 src/prefs_account.h; cvs diff -u -r 1.5 -r 1.6 src/prefs_ext_prog.c; cvs diff -u -r 1.169 -r 1.170 src/procmsg.c; cvs diff -u -r 1.71 -r 1.72 src/procmsg.h; cvs diff -u -r 1.18 -r 1.19 src/summary_search.c; cvs diff -u -r 1.450 -r 1.451 src/summaryview.c; cvs diff -u -r 1.128 -r 1.129 src/textview.c; cvs diff -u -r 1.16 -r 1.17 src/common/defs.h; cvs diff -u -r 1.57 -r 1.58 src/common/utils.c; cvs diff -u -r 1.33 -r 1.34 src/common/utils.h; cvs diff -u -r 1.10 -r 1.11 src/gtk/menu.c; cvs diff -u -r 1.8 -r 1.9 src/gtk/menu.h; ) > 0.9.12cvs145.patchset

+( cvs diff -u -r 1.119 -r 1.120 src/prefs_account.c; cvs diff -u -r 1.91 -r 1.92 src/procmime.c; cvs diff -u -r 1.32 -r 1.33 src/procmime.h; ) > 0.9.12cvs146.patchset

diff --git a/configure.ac b/configure.ac
index cc80e9b1c897c07cb842013f4fde6cb198e870fe..99519faf0f7076fd7ed45fdd53f0ca3ad9ec891d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=145
+EXTRA_VERSION=146

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 548d15f5794a2f546e936e6bce5e5a2b0335d6d1..1c5a2bcda657b7bea01b84d01f45a1fa78db000e 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2406,13 +2406,13 @@ static void prefs_account_set_string_from_optmenu(PrefParam *pparam)
        g_return_if_fail(*pparam->widget != NULL);
 
        menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
        g_return_if_fail(*pparam->widget != NULL);
 
        menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));

-       menuitem = gtk_menu_get_active(menu);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));

        if (menuitem == NULL)
                return;
 
        str = (gchar **) pparam->data;
         g_free(*str);
        if (menuitem == NULL)
                return;
 
        str = (gchar **) pparam->data;
         g_free(*str);

-       *str = g_strdup(gtk_object_get_user_data(menuitem));
+       *str = g_strdup(gtk_object_get_user_data(GTK_OBJECT(menuitem)));

 }
 
 static void prefs_account_set_optmenu_from_string(PrefParam *pparam)
 }
 
 static void prefs_account_set_optmenu_from_string(PrefParam *pparam)

diff --git a/src/procmime.c b/src/procmime.c
index fc365ed18d51216af7aeb7eb77add194eb43c8f2..5ac1938bca0a1a28c6662abbf6763456fe5b4f44 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -739,28 +739,24 @@ FILE *procmime_get_first_text_content(MsgInfo *msginfo)
 }
 
 gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
 }
 
 gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,

-                                  const gchar *str, gboolean case_sens)
+                                  const gchar *str, StrFindFunc find_func)

 {
        FILE *outfp;
        gchar buf[BUFFSIZE];
 {
        FILE *outfp;
        gchar buf[BUFFSIZE];

-       gchar *(* StrFindFunc) (const gchar *haystack, const gchar *needle);

 
        g_return_val_if_fail(mimeinfo != NULL, FALSE);
        g_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
        g_return_val_if_fail(str != NULL, FALSE);
 
        g_return_val_if_fail(mimeinfo != NULL, FALSE);
        g_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
        g_return_val_if_fail(str != NULL, FALSE);

+       g_return_val_if_fail(find_func != NULL, FALSE);

 
        outfp = procmime_get_text_content(mimeinfo);
 
        if (!outfp)
                return FALSE;
 
 
        outfp = procmime_get_text_content(mimeinfo);
 
        if (!outfp)
                return FALSE;
 

-       if (case_sens)
-               StrFindFunc = strstr;
-       else
-               StrFindFunc = strcasestr;
-

        while (fgets(buf, sizeof(buf), outfp) != NULL) {
        while (fgets(buf, sizeof(buf), outfp) != NULL) {

-               if (StrFindFunc(buf, str) != NULL) {
+               strretchomp(buf);
+               if (find_func(buf, str)) {

                        fclose(outfp);
                        return TRUE;
                }
                        fclose(outfp);
                        return TRUE;
                }


@@ -772,7 +768,7 @@ gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
 }
 
 gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
 }
 
 gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,

-                             gboolean case_sens)
+                             StrFindFunc find_func)

 {
        MimeInfo *mimeinfo;
        MimeInfo *partinfo;
 {
        MimeInfo *mimeinfo;
        MimeInfo *partinfo;


@@ -781,6 +777,7 @@ gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
 
        g_return_val_if_fail(msginfo != NULL, FALSE);
        g_return_val_if_fail(str != NULL, FALSE);
 
        g_return_val_if_fail(msginfo != NULL, FALSE);
        g_return_val_if_fail(str != NULL, FALSE);

+       g_return_val_if_fail(find_func != NULL, FALSE);

 
        filename = procmsg_get_message_file(msginfo);
        if (!filename) return FALSE;
 
        filename = procmsg_get_message_file(msginfo);
        if (!filename) return FALSE;


@@ -790,7 +787,7 @@ gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
             partinfo = procmime_mimeinfo_next(partinfo)) {
                if (partinfo->type == MIMETYPE_TEXT) {
                        if (procmime_find_string_part
             partinfo = procmime_mimeinfo_next(partinfo)) {
                if (partinfo->type == MIMETYPE_TEXT) {
                        if (procmime_find_string_part

-                               (partinfo, filename, str, case_sens) == TRUE) {
+                               (partinfo, filename, str, find_func) == TRUE) {

                                found = TRUE;
                                break;
                        }
                                found = TRUE;
                                break;
                        }

diff --git a/src/procmime.h b/src/procmime.h
index a22be1c4998bfcf965368f7c643aa45ade166fa5..5734d0832a2bc09544020c76fff5fa90f2046f56 100644 (file)
--- a/src/procmime.h
+++ b/src/procmime.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -27,6 +27,9 @@
 typedef struct _MimeType       MimeType;
 typedef struct _MimeInfo       MimeInfo;
 
 typedef struct _MimeType       MimeType;
 typedef struct _MimeInfo       MimeInfo;
 

+#include "procmsg.h"
+#include "utils.h"
+

 typedef enum
 {
        ENC_7BIT,
 typedef enum
 {
        ENC_7BIT,


@@ -189,10 +192,10 @@ FILE *procmime_get_first_text_content     (MsgInfo        *msginfo);
 gboolean procmime_find_string_part     (MimeInfo       *mimeinfo,
                                         const gchar    *filename,
                                         const gchar    *str,
 gboolean procmime_find_string_part     (MimeInfo       *mimeinfo,
                                         const gchar    *filename,
                                         const gchar    *str,

-                                        gboolean        case_sens);
+                                        StrFindFunc     find_func);

 gboolean procmime_find_string          (MsgInfo        *msginfo,
                                         const gchar    *str,
 gboolean procmime_find_string          (MsgInfo        *msginfo,
                                         const gchar    *str,

-                                        gboolean        case_sens);
+                                        StrFindFunc     find_func);

 
 gchar *procmime_get_tmp_file_name      (MimeInfo       *mimeinfo);
 
 
 gchar *procmime_get_tmp_file_name      (MimeInfo       *mimeinfo);