packages: gnome-mail-notification/gnome-mail-notification-evolution-3-0.pat...
baggins
baggins at pld-linux.org
Sun Jul 1 23:57:17 CEST 2012
Author: baggins Date: Sun Jul 1 21:57:17 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated gtk3/evolution patches from fedora
---- Files affected:
packages/gnome-mail-notification:
gnome-mail-notification-evolution-3-0.patch (1.1 -> 1.2) , gnome-mail-notification-gtk3-support.patch (1.1 -> 1.2) , gnome-mail-notification.spec (1.62 -> 1.63)
---- Diffs:
================================================================
Index: packages/gnome-mail-notification/gnome-mail-notification-evolution-3-0.patch
diff -u packages/gnome-mail-notification/gnome-mail-notification-evolution-3-0.patch:1.1 packages/gnome-mail-notification/gnome-mail-notification-evolution-3-0.patch:1.2
--- packages/gnome-mail-notification/gnome-mail-notification-evolution-3-0.patch:1.1 Thu Apr 21 15:47:12 2011
+++ packages/gnome-mail-notification/gnome-mail-notification-evolution-3-0.patch Sun Jul 1 23:57:12 2012
@@ -5,7 +5,7 @@
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);
++ packages = g_strdup_printf("evolution-plugin-3.0 >= %s evolution-shell-3.0", minversion);
result = jb_check_packages("Evolution", "evolution-plugin", packages);
g_free(packages);
@@ -20,20 +20,37 @@
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 @@
+@@ -25,8 +25,10 @@
#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 <mail/e-mail-folder-utils.h>
#include "mn-evolution.h"
-@@ -249,10 +250,16 @@
+ #include "mn-evolution-server.h"
+ #include "mn-evolution-plugin.h"
+@@ -240,7 +242,11 @@
+ EMEventTargetFolder *folder)
+ {
+ if (evo_server)
++#if EDS_CHECK_VERSION(3,1,0)
++ mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name));
++#else
+ mn_evolution_server_folder_changed(evo_server, folder->uri);
++#endif
+ }
+
+ void
+@@ -249,10 +255,18 @@
{
if (evo_server)
{
- char *url;
-+#if EDS_CHECK_VERSION(2,91,0)
++#if EDS_CHECK_VERSION(3,1,0)
++ char *url = e_mail_folder_uri_from_folder(message->folder);
++#elif 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);
@@ -42,14 +59,14 @@
- url = mail_tools_folder_to_url(message->folder);
mn_evolution_server_message_reading(evo_server, url);
+
-+#if !EDS_CHECK_VERSION(2,91,0)
++#if EDS_CHECK_VERSION(3,1,0) || !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 @@
+@@ -496,11 +422,23 @@
if (! folder)
{
@@ -58,7 +75,15 @@
- NULL,
+ static EMailSession * session = NULL;
+ if (!session)
-+ session = e_mail_session_new();
++ {
++#if EDS_CHECK_VERSION(3,1,0)
++ EShell *shell = e_shell_get_default();
++ EShellBackend *shell_backend = e_shell_get_backend_by_name(shell, "mail");
++ session = E_MAIL_SESSION(e_mail_backend_get_session(E_MAIL_BACKEND(shell_backend)));
++#else
++ session = e_mail_session_new();
++#endif
++ }
+
+ folder = e_mail_session_uri_to_folder_sync(session, uri, 0, NULL, NULL);
+#else
@@ -68,3 +93,196 @@
if (folder)
self_cache_folder(uri, folder);
else
+@@ -677,7 +681,12 @@
+ folder = self_lookup_folder(folder_uri, err);
+ if (folder)
+ {
++#if EDS_CHECK_VERSION(3,1,0)
++ *ret = g_strdup(camel_folder_get_display_name(folder));
++#else
+ *ret = g_strdup(camel_folder_get_name(folder));
++#endif
++
+ #if EDS_CHECK_VERSION(2,31,0)
+ g_object_unref(folder);
+ #else
+@@ -725,8 +734,12 @@
+ shell = e_shell_get_default ();
+ shell_backend = e_shell_get_backend_by_name (shell, "mail");
+
+- browser = e_mail_browser_new (shell_backend);
++ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
++#if EDS_CHECK_VERSION(3,1,0)
++ e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
++#else
+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
++#endif
+ e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
+ gtk_widget_show (browser);
+ #else
+--- build/src/mn-evolution-folder-tree-server.c.orig 2011-06-17 22:01:49.226886994 +0200
++++ build/src/mn-evolution-folder-tree-server.c 2011-06-18 00:34:23.046889847 +0200
+@@ -29,6 +29,12 @@
+ #if !EDS_CHECK_VERSION(2,29,0)
+ #include <mail/mail-component.h>
+ #endif
++#if EDS_CHECK_VERSION(3,1,0)
++#include <mail/e-mail-folder-utils.h>
++#include <mail/e-mail-browser.h>
++#include <mail/e-mail-reader.h>
++#include <shell/e-shell.h>
++#endif
+ #include <mail/em-folder-tree.h>
+ #include "mn-evolution-plugin.h"
+ #include "mn-evolution.h"
+@@ -72,12 +78,17 @@
+ #line 70 "mn-evolution-folder-tree-server.c"
+ #line 84 "src/mn-evolution-folder-tree-server.gob"
+ static void mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data);
++#if EDS_CHECK_VERSION(3,1,0)
++static void mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, CamelStore * store, const char * folder_name, guint32 flags, gpointer user_data);
++static void mn_evolution_folder_tree_server_activated_h (EMFolderTree * tree, CamelStore * store, const char * folder_name, gpointer user_data);
++#else
+ #line 73 "mn-evolution-folder-tree-server.c"
+ #line 104 "src/mn-evolution-folder-tree-server.gob"
+ static void mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, const char * full_name, const char * uri, guint32 flags, gpointer user_data);
+ #line 76 "mn-evolution-folder-tree-server.c"
+ #line 115 "src/mn-evolution-folder-tree-server.gob"
+ static void mn_evolution_folder_tree_server_activated_h (EMFolderTree * tree, const char * full_name, const char * uri, gpointer user_data);
++#endif
+ #line 79 "mn-evolution-folder-tree-server.c"
+
+ /*
+@@ -444,7 +455,17 @@
+ {
+ #line 61 "src/mn-evolution-folder-tree-server.gob"
+
+-#if EDS_CHECK_VERSION(2,91,0)
++#if EDS_CHECK_VERSION(3,1,0)
++ EShell *shell = e_shell_get_default();
++ EShellBackend *shell_backend = e_shell_get_backend_by_name(shell, "mail");
++ GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
++ EAlertSink *alert_sink = e_mail_reader_get_alert_sink(E_MAIL_READER(browser));
++#if EDS_CHECK_VERSION(3,4,0)
++ selfp->tree = em_folder_tree_new(e_mail_session_new(), alert_sink);
++#else
++ selfp->tree = em_folder_tree_new(E_MAIL_BACKEND(shell_backend), alert_sink);
++#endif
++#elif EDS_CHECK_VERSION(2,91,0)
+ selfp->session = e_mail_session_new();
+ selfp->tree = em_folder_tree_new(selfp->session);
+ #elif EDS_CHECK_VERSION(2,29,0)
+@@ -480,8 +497,11 @@
+ #line 80 "src/mn-evolution-folder-tree-server.gob"
+
+ #if EDS_CHECK_VERSION(2,91,0)
+- g_object_unref(selfp->session);
+- selfp->session = NULL;
++ if (selfp->session)
++ {
++ g_object_unref(selfp->session);
++ selfp->session = NULL;
++ }
+ #endif
+ g_signal_handlers_disconnect_by_func(selfp->plug, self_plug_destroy_h, self);
+ }}
+@@ -516,6 +536,29 @@
+ #line 503 "mn-evolution-folder-tree-server.c"
+ #undef __GOB_FUNCTION__
+
++#if EDS_CHECK_VERSION(3,1,0)
++static void
++mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, CamelStore * store, const char * folder_name, guint32 flags, gpointer user_data)
++{
++ Self *self = user_data;
++ char *uri;
++
++ if (!folder_name) return;
++
++ uri = e_mail_folder_uri_build(store, folder_name);
++ self_folder_selected(self, uri);
++ g_free(uri);
++}
++
++static void
++mn_evolution_folder_tree_server_activated_h (EMFolderTree * tree, CamelStore * store, const char * folder_name, gpointer user_data)
++{
++ Self *self = user_data;
++ self_folder_activated(self);
++}
++
++#else
++
+ #line 104 "src/mn-evolution-folder-tree-server.gob"
+ static void
+ mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, const char * full_name, const char * uri, guint32 flags, gpointer user_data)
+@@ -546,6 +589,8 @@
+ #line 533 "mn-evolution-folder-tree-server.c"
+ #undef __GOB_FUNCTION__
+
++#endif
++
+ #line 125 "src/mn-evolution-folder-tree-server.gob"
+ MNEvolutionFolderTreeServer *
+ mn_evolution_folder_tree_server_new (guint32 id)
+--- build/src/mn-evolution-mailbox-properties.c.orig 2011-12-04 16:23:29.197007315 +0100
++++ build/src/mn-evolution-mailbox-properties.c 2011-12-04 19:11:07.103199549 +0100
+@@ -165,12 +165,20 @@
+
+ MNMailboxProperties *properties = MN_MAILBOX_PROPERTIES(self);
+ GtkWidget *vbox;
++ GtkWidget *scrolled_window;
+
+ /* translators: header capitalization */
+ vbox = mn_mailbox_properties_add_general_section(properties, _("Folder"));
+
+ selfp->tree = mn_evolution_folder_tree_client_new();
+- gtk_box_pack_start(GTK_BOX(vbox), selfp->tree, TRUE, TRUE, 0);
++
++ scrolled_window = gtk_scrolled_window_new(NULL, NULL);
++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), selfp->tree);
++
++ gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
++
++ gtk_widget_show(scrolled_window);
+ gtk_widget_show(selfp->tree);
+
+ g_object_connect(selfp->tree,
+@@ -236,6 +244,8 @@
+ if (client->proxy)
+ org_gnome_MailNotification_Evolution_get_folder_name(client->proxy, MN_EVOLUTION_FOLDER_TREE_CLIENT(selfp->tree)->selected_uri, &name, NULL);
+
++ g_return_if_fail(name != NULL);
++
+ g_free(selfp->name);
+ selfp->name = name;
+
+--- build/src/mn-evolution-folder-tree-server.c.orig 2012-05-09 22:30:51.870995975 +0200
++++ build/src/mn-evolution-folder-tree-server.c 2012-05-09 22:32:06.031523970 +0200
+@@ -416,7 +416,11 @@
+ #if EDS_CHECK_VERSION(3,1,0)
+ EShell *shell = e_shell_get_default();
+ EShellBackend *shell_backend = e_shell_get_backend_by_name(shell, "mail");
++#if EDS_CHECK_VERSION(3,5,1)
++ GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), NULL, NULL, EM_FORMAT_WRITE_MODE_NORMAL);
++#else
+ GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
++#endif
+ EAlertSink *alert_sink = e_mail_reader_get_alert_sink(E_MAIL_READER(browser));
+ #if EDS_CHECK_VERSION(3,4,0)
+ selfp->tree = em_folder_tree_new(e_mail_session_new(), alert_sink);
+--- build/src/mn-evolution-server.c.orig 2012-05-09 22:40:19.949022881 +0200
++++ build/src/mn-evolution-server.c 2012-05-09 22:41:09.307372669 +0200
+@@ -636,7 +636,11 @@
+ shell = e_shell_get_default ();
+ shell_backend = e_shell_get_backend_by_name (shell, "mail");
+
++#if EDS_CHECK_VERSION(3,5,1)
++ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), NULL, NULL, EM_FORMAT_WRITE_MODE_NORMAL);
++#else
+ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
++#endif
+ #if EDS_CHECK_VERSION(3,1,0)
+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
+ #else
================================================================
Index: packages/gnome-mail-notification/gnome-mail-notification-gtk3-support.patch
diff -u packages/gnome-mail-notification/gnome-mail-notification-gtk3-support.patch:1.1 packages/gnome-mail-notification/gnome-mail-notification-gtk3-support.patch:1.2
--- packages/gnome-mail-notification/gnome-mail-notification-gtk3-support.patch:1.1 Thu Apr 21 15:47:12 2011
+++ packages/gnome-mail-notification/gnome-mail-notification-gtk3-support.patch Sun Jul 1 23:57:12 2012
@@ -93,15 +93,15 @@
#include <libedataserver/eds-version.h>
#if !EDS_CHECK_VERSION(2,29,0)
#include <mail/mail-component.h>
-@@ -71,7 +72,7 @@
+@@ -77,7 +78,7 @@
static void mn_evolution_folder_tree_server_finalize (MNEvolutionFolderTreeServer * self);
#line 70 "mn-evolution-folder-tree-server.c"
#line 84 "src/mn-evolution-folder-tree-server.gob"
-static void mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data);
+static void mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data);
- #line 73 "mn-evolution-folder-tree-server.c"
- #line 104 "src/mn-evolution-folder-tree-server.gob"
- static void mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, const char * full_name, const char * uri, guint32 flags, gpointer user_data);
+ #if EDS_CHECK_VERSION(3,1,0)
+ static void mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, CamelStore * store, const char * folder_name, guint32 flags, gpointer user_data);
+ static void mn_evolution_folder_tree_server_activated_h (EMFolderTree * tree, CamelStore * store, const char * folder_name, gpointer user_data);
@@ -456,7 +457,7 @@
selfp->tree = em_folder_tree_new_with_model(model);
#endif
@@ -545,7 +545,7 @@
+ int y;
+
+ gtk_widget_get_allocation(widget, &allocation);
-+ y = allocation.y;
++ y = 0;
- if (! GTK_WIDGET_DRAWABLE(widget))
+ if (! gtk_widget_is_drawable(widget))
@@ -557,7 +557,7 @@
Row *row = g_ptr_array_index(selfp->rows, i);
int j;
- int x = widget->allocation.x;
-+ int x = allocation.x;
++ int x = 0;
int column = 0;
MN_ARRAY_FOREACH(j, row->cells)
@@ -587,6 +587,20 @@
#line 109 "mn-tooltips.c"
#line 308 "src/mn-tooltips.gob"
static void mn_tooltips_draw_tips (MNTooltips * self);
+@@ -422,7 +422,13 @@
+
+ if (! selfp->window)
+ {
++ GtkStyleContext *ctx;
++
+ selfp->window = gtk_window_new(GTK_WINDOW_POPUP);
++
++ ctx = gtk_widget_get_style_context(GTK_WIDGET(selfp->window));
++ gtk_style_context_add_class(ctx, "tooltip");
++
+ self_update_screen(self, TRUE);
+ gtk_widget_set_app_paintable(selfp->window, TRUE);
+ gtk_window_set_resizable(GTK_WINDOW(selfp->window), FALSE);
@@ -430,7 +430,7 @@
gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width);
@@ -614,23 +628,32 @@
{
#line 600 "mn-tooltips.c"
#define __GOB_FUNCTION__ "MN:Tooltips::paint_window"
-@@ -608,13 +608,12 @@
+@@ -608,18 +608,13 @@
GtkRequisition req;
- gtk_widget_size_request(selfp->window, &req);
- gtk_paint_flat_box(selfp->window->style,
- selfp->window->window,
-+ gtk_widget_size_request(GTK_WIDGET(selfp), &req);
-+ gtk_paint_flat_box(gtk_widget_get_style(GTK_WIDGET(selfp)),
-+ cr,
- GTK_STATE_NORMAL,
- GTK_SHADOW_OUT,
- NULL,
+- GTK_STATE_NORMAL,
+- GTK_SHADOW_OUT,
+- NULL,
- selfp->window,
- "tooltip",
- 0,
- 0,
+- "tooltip",
+- 0,
+- 0,
+- req.width,
+- req.height);
++ gtk_widget_size_request(GTK_WIDGET(selfp->window), &req);
++ gtk_render_background(gtk_widget_get_style_context(GTK_WIDGET(selfp->window)),
++ cr,
++ 0,
++ 0,
++ req.width,
++ req.height);
+
+ return FALSE;
+ }}
@@ -651,10 +650,11 @@
gint monitor_num, px, py;
GdkRectangle monitor;
@@ -1380,3 +1403,45 @@
#include "mn-util.h"
#include "mn-conf.h"
#include "mn-shell.h"
+--- data/mail-notification.desktop.in.orig 2011-07-08 13:46:52.327548264 +0200
++++ data/mail-notification.desktop.in 2011-07-08 13:47:00.732704467 +0200
+@@ -5,7 +5,7 @@
+ _Comment=Get notified when new mail arrives
+ Type=Application
+ Categories=GNOME;GTK;Network;Email;
+-Exec=mail-notification --sm-disable
++Exec=mail-notification
+ Terminal=false
+ StartupNotify=true
+ X-GNOME-DocPath=mail-notification/mail-notification.xml
+--- build/src/mn-mailbox-properties.c.orig 2012-04-09 15:49:18.093348313 +0200
++++ build/src/mn-mailbox-properties.c 2012-04-09 15:50:03.182466264 +0200
+@@ -457,7 +457,7 @@
+ GSList *l;
+
+ MN_LIST_FOREACH(l, selfp->general_sections)
+- gtk_box_pack_start(GTK_BOX(MN_MAILBOX_PROPERTIES_DIALOG(properties->dialog)->general_vbox), l->data, FALSE, FALSE, 0);
++ gtk_box_pack_start(GTK_BOX(MN_MAILBOX_PROPERTIES_DIALOG(properties->dialog)->general_vbox), l->data, TRUE, TRUE, 0);
+ }}
+ #line 463 "mn-mailbox-properties.c"
+ #undef __GOB_FUNCTION__
+--- ui/properties-dialog.ui.orig 2012-04-06 16:04:55.392070305 +0200
++++ ui/properties-dialog.ui 2012-04-09 15:46:50.894046104 +0200
+@@ -37,6 +37,7 @@
+ <object class="GtkVBox" id="vbox22">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
++ <property name="expand">False</property>
+ <child>
+ <object class="GtkLabel" id="label36">
+ <property name="visible">True</property>
+--- ui/mailbox-properties-dialog.ui.orig 2012-04-06 15:58:00.449269640 +0200
++++ ui/mailbox-properties-dialog.ui 2012-04-09 16:15:19.602051281 +0200
+@@ -31,6 +31,7 @@
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
++ <property name="expand">False</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
================================================================
Index: packages/gnome-mail-notification/gnome-mail-notification.spec
diff -u packages/gnome-mail-notification/gnome-mail-notification.spec:1.62 packages/gnome-mail-notification/gnome-mail-notification.spec:1.63
--- packages/gnome-mail-notification/gnome-mail-notification.spec:1.62 Sun Jul 1 23:49:24 2012
+++ packages/gnome-mail-notification/gnome-mail-notification.spec Sun Jul 1 23:57:12 2012
@@ -77,6 +77,15 @@
%prep
%setup -q -n %{rname}-%{version}
+
+# Convert the Glade UI to GtkBuilder
+cd ui
+gtk-builder-convert mailbox-properties-dialog.glade mailbox-properties-dialog.ui
+gtk-builder-convert properties-dialog.glade properties-dialog.ui
+sed -i s@'<property name="has_separator">False</property>'@@ mailbox-properties-dialog.ui
+sed -i s@'<property name="has_separator">False</property>'@@ properties-dialog.ui
+cd -
+
%patch0 -p1
%patch1 -p1
%patch3 -p1
@@ -136,6 +145,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.63 2012/07/01 21:57:12 baggins
+- updated gtk3/evolution patches from fedora
+
Revision 1.62 2012/07/01 21:49:24 baggins
- fix for evolution 3.3.5+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/gnome-mail-notification/gnome-mail-notification-evolution-3-0.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/gnome-mail-notification/gnome-mail-notification-gtk3-support.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/gnome-mail-notification/gnome-mail-notification.spec?r1=1.62&r2=1.63
More information about the pld-cvs-commit
mailing list