tag 580884 + patch thanks The attached patch adapts the Fedora changes to the .gob files (see #580886).
Regards, Stephen
Update mail-notification to use the interfaces provided by evolution-data-server 2.29 and later. Based on https://bugzilla.redhat.com/attachment.cgi?id=388098 but applied to the .gob files rather than the generated source. --- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-folder-tree-server.gob +++ mail-notification-5.4.dfsg.1/src/mn-evolution-folder-tree-server.gob @@ -23,7 +23,10 @@ %{ #include <dbus/dbus.h> +#include <libedataserver/eds-version.h> +#if !EDS_CHECK_VERSION(2,29,0) #include <mail/mail-component.h> +#endif #include <mail/em-folder-tree.h> #include "mn-evolution-plugin.h" #include "mn-evolution.h" @@ -59,10 +62,14 @@ constructor (self) { +#if EDS_CHECK_VERSION(2,29,0) + selfp->tree = em_folder_tree_new(); +#else EMFolderTreeModel *model; model = mail_component_peek_tree_model(mail_component_peek()); selfp->tree = em_folder_tree_new_with_model(model); +#endif selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id); gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree); --- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-server.gob +++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob @@ -27,9 +27,14 @@ #include <gobject/gvaluecollector.h> #include <libedataserver/eds-version.h> #include <camel/camel-folder.h> +#if EDS_CHECK_VERSION(2,29,0) +#include <shell/e-shell.h> +#include <mail/e-mail-browser.h> +#else #include <mail/em-folder-view.h> #include <mail/em-format.h> #include <mail/em-message-browser.h> +#endif #include <mail/em-utils.h> #include <mail/mail-session.h> #include <mail/mail-tools.h> @@ -291,6 +296,19 @@ folder = self_lookup_folder(folder_uri, err); if (folder) { +#if EDS_CHECK_VERSION(2,29,0) + EShell *shell; + EShellBackend *shell_backend; + GtkWidget *browser; + + shell = e_shell_get_default(); + shell_backend = e_shell_get_backend_by_name(shell, "mail"); + + browser = e_mail_browser_new(shell_backend); + e_mail_reader_set_folder(E_MAIL_READER(browser), folder, folder_uri); + e_mail_reader_set_message(E_MAIL_READER(browser), message_uid); + gtk_widget_show(browser); +#else GtkWidget *browser; /* modelled after Evolution's handleuri_got_folder() */ @@ -301,6 +319,7 @@ em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri); em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE); gtk_widget_show(((EMMessageBrowser *) browser)->window); +#endif camel_object_unref(folder); } --- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-plugin.c +++ mail-notification-5.4.dfsg.1/src/mn-evolution-plugin.c @@ -204,7 +204,7 @@ } int -e_plugin_lib_enable (EPluginLib *ep, int enable) +e_plugin_lib_enable (EPlugin *ep, int enable) { static gboolean enabled = FALSE; GError *err = NULL;
