Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:sleep_walker
mail-notification
more-fixes-for-3.12.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File more-fixes-for-3.12.patch of Package mail-notification
From 5da84181aaa6a36b9bb855c14610ed18774adad9 Mon Sep 17 00:00:00 2001 From: James Bottomley <JBottomley@Parallels.com> Date: Sat, 15 Nov 2014 09:38:43 -0800 Subject: more fixes for 3.12 --- src/mn-evolution-folder-tree-server.gob | 16 ++++++++++++++-- src/mn-evolution-plugin.c | 4 ++++ src/mn-evolution-server.gob | 12 ++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/mn-evolution-folder-tree-server.gob b/src/mn-evolution-folder-tree-server.gob index 756a9c0..4140e19 100644 --- a/src/mn-evolution-folder-tree-server.gob +++ b/src/mn-evolution-folder-tree-server.gob @@ -21,7 +21,11 @@ #include <gtk/gtk.h> #include <libedataserver/eds-version.h> #if EDS_CHECK_VERSION(3,3,5) - #include <libemail-engine/e-mail-session.h> + #if EDS_CHECK_VERSION(3,12,0) + #include <libemail-engine/libemail-engine.h> + #else + #include <libemail-engine/e-mail-session.h> + #endif #else #if EDS_CHECK_VERSION(2,91,0) #include <mail/e-mail-session.h> @@ -41,7 +45,11 @@ #endif #if EDS_CHECK_VERSION(3,1,0) #if EDS_CHECK_VERSION(3,3,5) - #include <libemail-engine/e-mail-folder-utils.h> + #if EDS_CHECK_VERSION(3,12,0) + /* no include */ + #else + #include <libemail-engine/e-mail-folder-utils.h> + #endif #else #include <mail/e-mail-folder-utils.h> #endif @@ -89,7 +97,11 @@ class MN:Evolution:Folder:Tree:Server from G:Object EShell *shell = e_shell_get_default(); EShellBackend *shell_backend = e_shell_get_backend_by_name(shell, "mail"); #if EDS_CHECK_VERSION(3,5,1) +#if EDS_CHECK_VERSION(3,12,0) + GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), E_MAIL_FORMATTER_MODE_NORMAL); +#else GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), NULL, NULL, E_MAIL_FORMATTER_MODE_NORMAL); +#endif #else GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend)); #endif diff --git a/src/mn-evolution-plugin.c b/src/mn-evolution-plugin.c index e3d0b27..e88c589 100644 --- a/src/mn-evolution-plugin.c +++ b/src/mn-evolution-plugin.c @@ -28,8 +28,12 @@ #include <libedataserver/eds-version.h> #include <mail/em-event.h> #if EDS_CHECK_VERSION(3,3,5) +#if EDS_CHECK_VERSION(3,12,0) +#include <libemail-engine/libemail-engine.h> +#else #include <libemail-engine/e-mail-folder-utils.h> #include <libemail-engine/mail-tools.h> +#endif #else #include <mail/mail-tools.h> #include <mail/e-mail-folder-utils.h> diff --git a/src/mn-evolution-server.gob b/src/mn-evolution-server.gob index c4577e1..451e703 100644 --- a/src/mn-evolution-server.gob +++ b/src/mn-evolution-server.gob @@ -37,8 +37,12 @@ #endif #include <mail/em-utils.h> #if EDS_CHECK_VERSION(3,3,5) - #include <libemail-engine/e-mail-session.h> - #include <libemail-engine/mail-tools.h> + #if EDS_CHECK_VERSION(3,12,0) + #include <libemail-engine/libemail-engine.h> + #else + #include <libemail-engine/e-mail-session.h> + #include <libemail-engine/mail-tools.h> + #endif #else #include <mail/mail-tools.h> #if EDS_CHECK_VERSION(2,91,0) @@ -375,7 +379,11 @@ class MN:Evolution:Server from G:Object shell_backend = e_shell_get_backend_by_name (shell, "mail"); #if EDS_CHECK_VERSION(3,5,1) + #if EDS_CHECK_VERSION(3,12,0) + browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), E_MAIL_FORMATTER_MODE_NORMAL); + #else browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), NULL, NULL, E_MAIL_FORMATTER_MODE_NORMAL); + #endif #else browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend)); #endif -- 2.1.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor