Attachment 596210 Details for Bug 837329 – rspam.patch

[patch] rspam.patch

rspam.patch (text/plain), 9.71 KB, created by Milan Crha on 2012-07-04 12:44:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2012-07-04 12:44:43 UTC

Size: 9.71 KB

patch

obsolete

>diff -upr f17/evolution-rspam-0.4.0/configure.ac evolution-rspam-0.4.0/configure.ac
>--- f17/evolution-rspam-0.4.0/configure.ac	2011-11-25 22:26:00.000000000 +0100
>+++ evolution-rspam-0.4.0/configure.ac	2012-07-04 13:55:39.918596583 +0200
>@@ -28,7 +28,7 @@ LIBGTK_REQUIRED=2.4.0
> LIBGTK_VERSION=2
> LIBGNOME_REQUIRED=2.7.0
> LIBGNOMEUI_REQUIRED=2.7.0
>-EVOLUTION_REQUIRED=2.4.0
>+EVOLUTION_REQUIRED=3.4.0
> 
> AC_SUBST(LIBGTK_REQUIRED)
> AC_SUBST(LIBGNOME_REQUIRED)
>@@ -38,7 +38,7 @@ AC_SUBST(EVOLUTION_REQUIRED)
> if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then
> 	LIBGTK_VERSION=3
> 	LIBGTK_REQUIRED=2.99.3
>-	EVOLUTION_REQUIRED=2.91.6
>+	EVOLUTION_REQUIRED=3.4.0
> fi
> 
> PKG_CHECK_MODULES(RSPAM_EPLUGIN,
>@@ -46,6 +46,7 @@ PKG_CHECK_MODULES(RSPAM_EPLUGIN,
> 	gtk+-$LIBGTK_VERSION.0 >= $LIBGTK_REQUIRED dnl
> 	evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
> 	evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
>+	libemail-engine >= $EVOLUTION_REQUIRED dnl
> ])
> 
> ##############
>diff -upr f17/evolution-rspam-0.4.0/src/rspam.c evolution-rspam-0.4.0/src/rspam.c
>--- f17/evolution-rspam-0.4.0/src/rspam.c	2011-11-22 18:30:02.000000000 +0100
>+++ evolution-rspam-0.4.0/src/rspam.c	2012-07-04 14:34:14.973794544 +0200
>@@ -26,6 +26,7 @@
> #include <string.h>
> #include <stdio.h>
> #include <fcntl.h>
>+#include <sys/time.h>
> 
> #include <gtk/gtk.h>
> 
>@@ -41,11 +42,26 @@
> #endif
> 
> #if EVOLUTION_VERSION < 22900
>+#include <mail/mail-config.h>
> #include <mail/mail-component.h>
> #include <mail/em-popup.h>
>+#include <mail/mail-tools.h>
>+#include <mail/mail-ops.h>
> #include <misc/e-activity-handler.h>
> #else
>+#if EVOLUTION_VERSION < 30400
> #include <mail/e-mail-local.h>
>+#include <mail/mail-tools.h>
>+#include <mail/mail-ops.h>
>+#else
>+#include <libemail-engine/e-mail-session.h>
>+#include <libemail-engine/e-mail-folder-utils.h>
>+#include <libemail-engine/mail-tools.h>
>+#include <libemail-engine/mail-ops.h>
>+#include <libemail-utils/e-account-utils.h>
>+#include <shell/e-shell.h>
>+#include <mail/e-mail-backend.h>
>+#endif
> #include <mail/message-list.h>
> #include <misc/e-popup-action.h>
> #include <shell/e-shell-view.h>
>@@ -55,13 +71,12 @@
> 
> #include <e-util/e-mktemp.h>
> #include <mail/em-config.h>
>-#include <mail/mail-config.h>
> 
> #include <libedataserver/e-account-list.h>
> #include <libedataserver/e-data-server-util.h>
> 
> #include <mail/em-utils.h>
>-#include <mail/mail-ops.h>
>+//#include <mail/mail-ops.h>
> 
> #include "rspam.h"
> 
>@@ -87,6 +102,7 @@ struct rspam_stuff {
> 	gchar *user;
> 	gchar *pass;
> 	gchar *spamcop_email;
>+	GConfClient *gconf;
> };
> 
> struct _copy_folder_data {
>@@ -444,7 +460,17 @@ spamcop_report(CamelMimeMessage *msg, gc
> #if EVOLUTION_VERSION < 29102
> 		mail_folder = e_mail_local_get_folder(E_MAIL_FOLDER_OUTBOX);
> #else
>+#if EVOLUTION_VERSION < 30400
> 		mail_folder = e_mail_local_get_folder(E_MAIL_LOCAL_FOLDER_OUTBOX);
>+#else
>+	{
>+		EShell *shell = e_shell_get_default ();
>+		EShellBackend *backend = e_shell_get_backend_by_name (shell, "mail");
>+		EMailSession *session = e_mail_backend_get_session (E_MAIL_BACKEND (backend));
>+
>+		mail_folder = e_mail_session_get_local_folder(session, E_MAIL_LOCAL_FOLDER_OUTBOX);
>+	}
>+#endif
> #endif
> 
> #endif
>@@ -986,7 +1012,7 @@ razor_home_cb (GtkWidget *widget, gpoint
> 
> 	/* Save the new setting to gconf */
> 	gconf_client_set_string (
>-		stuff->target->gconf,
>+		stuff->gconf,
> 		GCONF_KEY_RAZOR_HOME, razor_home, NULL);
> }
> 
>@@ -998,7 +1024,7 @@ spamcop_email_cb (GtkWidget *widget, gpo
> 
> 	/* Save the new setting to gconf */
> 	gconf_client_set_string (
>-		stuff->target->gconf,
>+		stuff->gconf,
> 		GCONF_KEY_SPAMCOP_EMAIL, spamcop_email, NULL);
> }
> 
>@@ -1011,7 +1037,7 @@ enable_dcc_cb (GtkWidget *widget, gpoint
> 
> 	/* Save the new setting to gconf */
> 	gconf_client_set_bool (
>-		stuff->target->gconf, GCONF_KEY_ENABLE_DCC, active, NULL);
>+		stuff->gconf, GCONF_KEY_ENABLE_DCC, active, NULL);
> }
> 
> static void
>@@ -1023,7 +1049,7 @@ enable_razor_cb (GtkWidget *widget, gpoi
> 
> 	/* Save the new setting to gconf */
> 	gconf_client_set_bool (
>-		stuff->target->gconf,
>+		stuff->gconf,
> 		GCONF_KEY_ENABLE_RAZOR, active, NULL);
> }
> 
>@@ -1036,7 +1062,7 @@ enable_spamcop_cb (GtkWidget *widget, gp
> 
> 	/* Save the new setting to gconf */
> 	gconf_client_set_bool (
>-		stuff->target->gconf,
>+		stuff->gconf,
> 		GCONF_KEY_ENABLE_SPAMCOP, active, NULL);
> }
> 
>@@ -1051,7 +1077,7 @@ enable_movejunk_cb (GtkWidget *widget, g
> 
> 	/* Save the new setting to gconf */
> 	gconf_client_set_bool (
>-		stuff->target->gconf, GCONF_KEY_MOVE_JUNK, active, NULL);
>+		stuff->gconf, GCONF_KEY_MOVE_JUNK, active, NULL);
> }
> 
> static void
>@@ -1063,7 +1089,7 @@ enable_dryrun_cb (GtkWidget *widget, gpo
> 
> 	/* Save the new setting to gconf */
> 	gconf_client_set_bool (
>-		stuff->target->gconf, GCONF_KEY_DRY_RUN, active, NULL);
>+		stuff->gconf, GCONF_KEY_DRY_RUN, active, NULL);
> }
> 
> static void
>@@ -1075,7 +1101,7 @@ enable_pyzor_cb (GtkWidget *widget, gpoi
> 
> 	/* Save the new setting to gconf */
> 	gconf_client_set_bool (
>-		stuff->target->gconf, GCONF_KEY_ENABLE_PYZOR, active, NULL);
>+		stuff->gconf, GCONF_KEY_ENABLE_PYZOR, active, NULL);
> }
> 
> static void
>@@ -1212,6 +1238,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	/* A structure to pass some stuff around */
> 	stuff = g_new0 (struct rspam_stuff, 100);
> 	stuff->target = target;
>+	stuff->gconf = gconf_client_get_default ();
> 
> 	readrazorconfig(stuff);
> 
>@@ -1236,7 +1263,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	check = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "checkbutton1"));
> 	gtk_toggle_button_set_active (
> 		GTK_TOGGLE_BUTTON (check),
>-		gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_RAZOR, NULL));
>+		gconf_client_get_bool (stuff->gconf, GCONF_KEY_ENABLE_RAZOR, NULL));
> 	g_signal_connect (
> 		GTK_TOGGLE_BUTTON (check),
> 		"toggled", G_CALLBACK (enable_razor_cb), stuff);
>@@ -1244,7 +1271,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	check = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "checkbutton2"));
> 	gtk_toggle_button_set_active (
> 		GTK_TOGGLE_BUTTON (check),
>-		gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_PYZOR, NULL));
>+		gconf_client_get_bool (stuff->gconf, GCONF_KEY_ENABLE_PYZOR, NULL));
> 	g_signal_connect (
> 		GTK_TOGGLE_BUTTON (check),
> 		"toggled", G_CALLBACK (enable_pyzor_cb), stuff);
>@@ -1252,7 +1279,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	check = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "checkbutton3"));
> 	gtk_toggle_button_set_active (
> 		GTK_TOGGLE_BUTTON (check),
>-		gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_DCC, NULL));
>+		gconf_client_get_bool (stuff->gconf, GCONF_KEY_ENABLE_DCC, NULL));
> 	g_signal_connect (
> 		GTK_TOGGLE_BUTTON (check),
> 		"toggled", G_CALLBACK (enable_dcc_cb), stuff);
>@@ -1260,7 +1287,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	check = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "checkbutton4"));
> 	gtk_toggle_button_set_active (
> 		GTK_TOGGLE_BUTTON (check),
>-		gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_SPAMCOP, NULL));
>+		gconf_client_get_bool (stuff->gconf, GCONF_KEY_ENABLE_SPAMCOP, NULL));
> 	g_signal_connect (
> 		GTK_TOGGLE_BUTTON (check),
> 		"toggled", G_CALLBACK (enable_spamcop_cb), stuff);
>@@ -1268,7 +1295,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	stuff->hbox = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "hbox11"));
> 	check = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "checkbutton5"));
> 	gboolean mj =
>-		gconf_client_get_bool (target->gconf, GCONF_KEY_MOVE_JUNK, NULL);
>+		gconf_client_get_bool (stuff->gconf, GCONF_KEY_MOVE_JUNK, NULL);
> 	gtk_toggle_button_set_active (
> 		GTK_TOGGLE_BUTTON (check),
> 		mj);
>@@ -1282,7 +1309,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	check = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "checkbutton6"));
> 	gtk_toggle_button_set_active (
> 		GTK_TOGGLE_BUTTON (check),
>-		gconf_client_get_bool (target->gconf, GCONF_KEY_DRY_RUN, NULL));
>+		gconf_client_get_bool (stuff->gconf, GCONF_KEY_DRY_RUN, NULL));
> 	g_signal_connect (
> 		GTK_TOGGLE_BUTTON (check),
> 		"toggled", G_CALLBACK (enable_dryrun_cb), stuff);
>@@ -1291,7 +1318,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	gtk_entry_set_invisible_char (GTK_ENTRY (entry1), 8226);
> 	gtk_entry_set_text(
> 		GTK_ENTRY(entry1),
>-		gconf_client_get_string(target->gconf, GCONF_KEY_RAZOR_HOME, NULL));
>+		gconf_client_get_string(stuff->gconf, GCONF_KEY_RAZOR_HOME, NULL));
> 	g_signal_connect (
> 		GTK_ENTRY (entry1), "changed",
> 		G_CALLBACK (razor_home_cb), stuff);
>@@ -1321,7 +1348,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	button = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "button3"));
> 	label1 = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "label16"));
> 	fld = gconf_client_get_string(
>-				target->gconf,
>+				stuff->gconf,
> 				GCONF_KEY_MOVE_FOLDER,
> 				NULL);
> 	if (fld && g_ascii_strcasecmp(fld, _("Select..."))) {
>@@ -1354,7 +1381,7 @@ rspam_page_factory (EPlugin *ep, EConfig
> 	entry1 = GTK_WIDGET (gtk_builder_get_object(stuff->xml, "entry4"));
> 	gtk_entry_set_invisible_char (GTK_ENTRY (entry1), 8226);
> 	gchar *sc_email = gconf_client_get_string(
>-				target->gconf,
>+				stuff->gconf,
> 				GCONF_KEY_SPAMCOP_EMAIL,
> 				NULL);
> 	gtk_entry_set_text(GTK_ENTRY(entry1),
>@@ -1401,7 +1428,15 @@ rspam_component_peek_local_store(void)
> #if (EVOLUTION_VERSION < 22900) //kb//
> 	return mail_component_peek_local_store(NULL);
> #else
>+#if (EVOLUTION_VERSION < 30400)
> 	return e_mail_local_get_store();
>+#else
>+	EShell *shell = e_shell_get_default ();
>+	EShellBackend *backend = e_shell_get_backend_by_name (shell, "mail");
>+	EMailSession *session = e_mail_backend_get_session (E_MAIL_BACKEND (backend));
>+
>+	return e_mail_session_get_local_store (session);
>+#endif
> #endif
> }
> 
>@@ -1479,7 +1514,9 @@ rspam_folder_cb (GtkWidget *widget, gpoi
> 	dialog = em_folder_selector_new (
> 			window,
> #if EVOLUTION_VERSION >= 30101
>+#if EVOLUTION_VERSION < 30400
> 			backend,
>+#endif
> #if EVOLUTION_VERSION >= 30103
> 			model,
> #endif

Actions: View | Diff

Attachments on bug 837329: 596210