summaryrefslogtreecommitdiff
path: root/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch')
-rw-r--r--testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
deleted file mode 100644
index 51a0eb519..000000000
--- a/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- jbsrc/lib/src/extras/jb-evolution-plugin.c.evolution30 2011-02-02 00:09:33.945696868 +0100
-+++ jbsrc/lib/src/extras/jb-evolution-plugin.c 2011-02-02 00:28:09.096275028 +0100
-@@ -41,7 +41,7 @@
- if (! minversion)
- minversion = "2.12";
-
-- packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion);
-+ packages = g_strdup_printf("evolution-plugin-3.0 >= %s libgtkhtml-4.0 gtkhtml-editor-4.0", minversion);
- result = jb_check_packages("Evolution", "evolution-plugin", packages);
- g_free(packages);
-
-@@ -53,7 +53,7 @@
- char *plugindir;
-
- jb_message_checking("for the Evolution plugin directory");
-- plugindir = jb_get_package_variable("evolution-plugin", "plugindir");
-+ plugindir = jb_get_package_variable("evolution-plugin-3.0", "plugindir");
- jb_message_result_string(plugindir ? plugindir : "not found");
-
- if (! plugindir)
---- src/mn-evolution-plugin.c.orig 2011-02-09 00:07:37.422002566 +0100
-+++ src/mn-evolution-plugin.c 2011-02-09 00:12:43.652678682 +0100
-@@ -25,6 +25,7 @@
- #include <dbus/dbus-glib-lowlevel.h>
- #include <dbus/dbus-glib-bindings.h>
- #include <camel/camel.h>
-+#include <libedataserver/eds-version.h>
- #include <mail/em-event.h>
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
-@@ -249,10 +250,16 @@
- {
- if (evo_server)
- {
-- char *url;
-+#if EDS_CHECK_VERSION(2,91,0)
-+ const char *url = camel_folder_get_uri(message->folder);
-+#else
-+ char *url = mail_tools_folder_to_url(message->folder);
-+#endif
-
-- url = mail_tools_folder_to_url(message->folder);
- mn_evolution_server_message_reading(evo_server, url);
-+
-+#if !EDS_CHECK_VERSION(2,91,0)
- g_free(url);
-+#endif
- }
- }
---- build/src/mn-evolution-server.c.orig 2011-02-09 00:17:38.850944227 +0100
-+++ build/src/mn-evolution-server.c 2011-02-09 22:21:54.155346478 +0100
-@@ -496,11 +496,15 @@
-
- if (! folder)
- {
-- folder = mail_tool_uri_to_folder(uri, 0,
- #if EDS_CHECK_VERSION(2,91,0)
-- NULL,
-+ static EMailSession * session = NULL;
-+ if (!session)
-+ session = e_mail_session_new();
-+
-+ folder = e_mail_session_uri_to_folder_sync(session, uri, 0, NULL, NULL);
-+#else
-+ folder = mail_tool_uri_to_folder(uri, 0, NULL);
- #endif
-- NULL);
- if (folder)
- self_cache_folder(uri, folder);
- else