Allow building the evolution plugin when using GTK2

epienbroek · Nov 24, 2012 · 4656db1 · 4656db1
1 parent f27e2dd
commit 4656db1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/jbsrc/jb.c b/jbsrc/jb.c
@@ -644,8 +644,7 @@ jb_package_add_resources (void)
       jb_group_add_resource(group, JB_GROUP_RESOURCE(jb_template_new("org-jylefort-mail-notification.eplug.in")));
       jb_group_add_data_file(group, "org-jylefort-mail-notification.eplug", "$evolution-plugin-dir");
 
-      jb_compile_options_add_cflags(object->compile_options, "$evolution-plugin-cflags");
-      jb_compile_options_add_cflags(object->compile_options, "$libemail-engine-cflags");
+      jb_compile_options_add_cflags(object->compile_options, "$camel-cflags");
 
       jb_group_add_dbus_interface(group,
 				  "org.freedesktop.DBus.Properties",
@@ -673,7 +672,6 @@ jb_package_add_resources (void)
 
       jb_compile_options_add_package(plugin->compile_options, "gettext");
       jb_compile_options_add_package(plugin->compile_options, "evolution-plugin");
-      jb_compile_options_add_package(plugin->compile_options, "libemail-engine");
       jb_compile_options_add_package(plugin->compile_options, "dbus");
 
       jb_group_add_dbus_interface(group,

diff --git 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", minversion);
+  packages = g_strdup_printf("evolution-plugin-3.0 >= %s evolution-shell-3.0 libemail-engine", minversion);
   result = jb_check_packages("Evolution", "evolution-plugin", packages);
   g_free(packages);
 
@@ -63,5 +63,5 @@ jb_evolution_plugin_check (const char *minversion)
       g_free(plugindir);
     }
 
-  return jb_check_packages("Evolution", "libemail-engine", "libemail-engine");
+  return jb_check_packages("Evolution", "camel", "camel-1.2");
 }