From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 12 Nov 2004 06:20:46 +0000 (+0000)
Subject: 2004-11-12 [paul]	0.9.12cvs146
X-Git-Tag: rel_0_9_13~46
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8f556cd6e66a15762e974a10a3cec9e23cf411ef

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 a08b0e1b7..683665ac2 100644
--- 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
diff --git a/PATCHSETS b/PATCHSETS
index e2949ddb2..a93bee025 100644
--- 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.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 cc80e9b1c..99519faf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 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
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 548d15f57..1c5a2bcda 100644
--- 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));
-	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);
-	*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)
diff --git a/src/procmime.c b/src/procmime.c
index fc365ed18..5ac1938bc 100644
--- 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,
-				   const gchar *str, gboolean case_sens)
+				   const gchar *str, StrFindFunc find_func)
 {
 	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(find_func != NULL, 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) {
-		if (StrFindFunc(buf, str) != NULL) {
+		strretchomp(buf);
+		if (find_func(buf, str)) {
 			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 case_sens)
+			      StrFindFunc find_func)
 {
 	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(find_func != NULL, 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, filename, str, case_sens) == TRUE) {
+				(partinfo, filename, str, find_func) == TRUE) {
 				found = TRUE;
 				break;
 			}
diff --git a/src/procmime.h b/src/procmime.h
index a22be1c49..5734d0832 100644
--- a/src/procmime.h
+++ b/src/procmime.h
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -27,6 +27,9 @@
 typedef struct _MimeType	MimeType;
 typedef struct _MimeInfo	MimeInfo;
 
+#include "procmsg.h"
+#include "utils.h"
+
 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	 case_sens);
+					 StrFindFunc	 find_func);
 gboolean procmime_find_string		(MsgInfo	*msginfo,
 					 const gchar	*str,
-					 gboolean	 case_sens);
+					 StrFindFunc	 find_func);
 
 gchar *procmime_get_tmp_file_name	(MimeInfo	*mimeinfo);