File update-for-evolution-3.12.patch of Package mail-notification
From 1bea19fe5c6a22e0f75e5e53b22548763e6728c6 Mon Sep 17 00:00:00 2001
From: James Bottomley <JBottomley@Parallels.com>
Date: Sat, 26 Apr 2014 09:52:17 -0700
Subject: [PATCH 2/2] update for evolution 3.12
---
jbsrc/lib/src/extras/jb-evolution-plugin.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/jbsrc/lib/src/extras/jb-evolution-plugin.c b/jbsrc/lib/src/extras/jb-evolution-plugin.c
index 01e29bc..6222cca 100644
--- a/jbsrc/lib/src/extras/jb-evolution-plugin.c
+++ b/jbsrc/lib/src/extras/jb-evolution-plugin.c
@@ -41,7 +41,7 @@ jb_evolution_plugin_check (const char *minversion)
if (! minversion)
minversion = "2.12";
- packages = g_strdup_printf("evolution-plugin-3.0 >= %s evolution-shell-3.0 libemail-engine", minversion);
+ packages = g_strdup_printf("evolution-shell-3.0 >= %s libemail-engine", minversion);
result = jb_check_packages("Evolution", "evolution-plugin", packages);
g_free(packages);
@@ -50,15 +50,20 @@ jb_evolution_plugin_check (const char *minversion)
if (! strcmp(jb_variable_get_string("evolution-plugin-dir"), "autodetect"))
{
- char *plugindir;
+ char tmpstr[512], *plugindir, *privlibdir;
jb_message_checking("for the Evolution plugin directory");
- plugindir = jb_get_package_variable("evolution-plugin-3.0", "plugindir");
- jb_message_result_string(plugindir ? plugindir : "not found");
+ privlibdir = jb_get_package_variable("evolution-shell-3.0", "privlibdir");
+ jb_message_result_string(privlibdir ? privlibdir : "not found");
- if (! plugindir)
+ if (! privlibdir)
return FALSE;
+ memset(tmpstr, 0, sizeof(tmpstr));
+ strcat(tmpstr, privlibdir);
+ strcat(tmpstr, "/plugins");
+ plugindir = strdup(tmpstr);
+
jb_variable_set_string("evolution-plugin-dir", plugindir);
g_free(plugindir);
}
--
1.9.2