tags 577503 + pending
tags 580884 + pending
tags 580886 + pending
tags 582118 + patch
tags 582118 + pending
thanks
Dear maintainer,
I've prepared an NMU for mail-notification (versioned as 5.4.dfsg.1-2.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
It's actually a sponsored NMU.
Regards.
diff -Nru mail-notification-5.4.dfsg.1/AUTHORS mail-notification-5.4.dfsg.1/AUTHORS
--- mail-notification-5.4.dfsg.1/AUTHORS 2010-05-26 15:52:30.000000000 +0200
+++ mail-notification-5.4.dfsg.1/AUTHORS 2007-12-30 22:53:16.000000000 +0100
@@ -34,12 +34,9 @@
* The GNU C Library (src/mn-md5.*)
External image sources (images taken as-is or slightly modified):
+ * Google (gmail.png)
* Yahoo! (yahoo.png)
* Microsoft (hotmail.png)
External sound sources:
* Ekiga (new-mail.wav)
-
-The gmail.png included in the upstream package (created by Google)
-has been replaced by another "G", created especially for Debian, by
-Pascal Giard <evily...@gmail.com> using The GIMP.
diff -Nru mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.c mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.c
--- mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.c 2010-05-26 15:52:30.000000000 +0200
+++ mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.c 2008-05-22 17:47:48.000000000 +0200
@@ -595,8 +595,7 @@
for (i = 0; i < summary->len; i++)
{
- char *uid = summary->pdata[i];
- CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
+ CamelMessageInfo *info = summary->pdata[i];
if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
diff -Nru mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.gob.stamp mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.gob.stamp
--- mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.gob.stamp 2010-05-26 15:52:30.000000000 +0200
+++ mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.gob.stamp 2008-05-22 17:47:48.000000000 +0200
@@ -1 +0,0 @@
-touched
diff -Nru mail-notification-5.4.dfsg.1/debian/changelog mail-notification-5.4.dfsg.1/debian/changelog
--- mail-notification-5.4.dfsg.1/debian/changelog 2010-05-26 15:52:30.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/changelog 2010-05-26 08:09:41.000000000 +0200
@@ -1,3 +1,24 @@
+mail-notification (5.4.dfsg.1-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Switch to "3.0 (quilt)" source format, to allow the various changes
+ below to be readily identified.
+ * Split existing changes into patches, and fix the existing change to
+ mn-evolution-server.gob for evolution-data-server 2.23.5 (the
+ eds-version.h include file was missing).
+ * Update .gob files for gob2 2.0.16 and rebuild from scratch (Closes:
+ #580886).
+ * Update for evolution-data-server 2.29 and later, based on the fix
+ present in Fedora 13
+ (https://bugzilla.redhat.com/attachment.cgi?id=388098) (Closes:
+ #580884, #582118).
+ * Replace stock icons with icons present in current versions of
+ gnome-icon-theme, based on the fix present in Fedora 13
+ (https://bugzilla.redhat.com/attachment.cgi?id=415509) (Closes:
+ #577503).
+
+ -- Stephen Kitt <st...@sk2.org> Wed, 26 May 2010 06:58:44 +0200
+
mail-notification (5.4.dfsg.1-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru mail-notification-5.4.dfsg.1/debian/control mail-notification-5.4.dfsg.1/debian/control
--- mail-notification-5.4.dfsg.1/debian/control 2010-05-26 15:52:30.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/control 2010-05-26 06:55:55.000000000 +0200
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: LIU Qi <liuq...@gmail.com>
-Build-Depends: debhelper (>= 7), scrollkeeper, gnome-pkg-tools, libxml-parser-perl, libglade2-dev (>= 2.6.0), libsasl2-dev (>= 2.0.0), libgmime-2.0-2-dev (>= 2.2.3), evolution-dev (>= 2.11.0), evolution-plugins (>= 2.6.0), evolution-data-server-dev (>= 1.6.0), libgnomeprintui2.2-dev, libnotify-dev (>= 0.4.3), intltool (>= 0.35)
+Build-Depends: debhelper (>= 7), scrollkeeper, gnome-pkg-tools, libxml-parser-perl, libglade2-dev (>= 2.6.0), libsasl2-dev (>= 2.0.0), libgmime-2.0-2-dev (>= 2.2.3), evolution-dev (>= 2.11.0), evolution-plugins (>= 2.6.0), evolution-data-server-dev (>= 1.6.0), libgnomeprintui2.2-dev, libnotify-dev (>= 0.4.3), intltool (>= 0.35), gob2 (>= 2.0.16)
Standards-Version: 3.8.4
Package: mail-notification
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/replace-gmail-icon.patch mail-notification-5.4.dfsg.1/debian/patches/replace-gmail-icon.patch
--- mail-notification-5.4.dfsg.1/debian/patches/replace-gmail-icon.patch 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/replace-gmail-icon.patch 2010-05-26 06:58:09.000000000 +0200
@@ -0,0 +1,16 @@
+--- mail-notification-5.4.dfsg.1.orig/AUTHORS
++++ mail-notification-5.4.dfsg.1/AUTHORS
+@@ -34,9 +34,12 @@
+ * The GNU C Library (src/mn-md5.*)
+
+ External image sources (images taken as-is or slightly modified):
+- * Google (gmail.png)
+ * Yahoo! (yahoo.png)
+ * Microsoft (hotmail.png)
+
+ External sound sources:
+ * Ekiga (new-mail.wav)
++
++The gmail.png included in the upstream package (created by Google)
++has been replaced by another "G", created especially for Debian, by
++Pascal Giard <evily...@gmail.com> using The GIMP.
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/series mail-notification-5.4.dfsg.1/debian/patches/series
--- mail-notification-5.4.dfsg.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/series 2010-05-26 07:22:05.000000000 +0200
@@ -0,0 +1,6 @@
+replace-gmail-icon.patch
+typo-fixes.patch
+update-eds-2.23.5.patch
+update-gob2-2.0.16.patch
+update-eds-2.29.patch
+update-icons.patch
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/typo-fixes.patch mail-notification-5.4.dfsg.1/debian/patches/typo-fixes.patch
--- mail-notification-5.4.dfsg.1/debian/patches/typo-fixes.patch 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/typo-fixes.patch 2010-05-26 06:58:56.000000000 +0200
@@ -0,0 +1,11 @@
+--- mail-notification-5.4.dfsg.1.orig/po/de.po
++++ mail-notification-5.4.dfsg.1/po/de.po
+@@ -1275,7 +1275,7 @@
+
+ #: ../src/mn-main.c:361
+ msgid "quitting Mail Notification"
+-msgstr "E-Mail-Eingangsüberwachung wir beendet"
++msgstr "E-Mail-Eingangsüberwachung wird beendet"
+
+ #: ../src/mn-main.c:365
+ msgid "Mail Notification is not running"
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.23.5.patch mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.23.5.patch
--- mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.23.5.patch 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.23.5.patch 2010-05-26 07:19:44.000000000 +0200
@@ -0,0 +1,23 @@
+--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-server.gob
++++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <libintl.h>
+ #include <gobject/gvaluecollector.h>
++#include <libedataserver/eds-version.h>
+ #include <camel/camel-folder.h>
+ #include <mail/em-folder-view.h>
+ #include <mail/em-format.h>
+@@ -235,7 +236,12 @@
+
+ for (i = 0; i < summary->len; i++)
+ {
++#if EDS_CHECK_VERSION(2,23,5)
++ char *uid = summary->pdata[i];
++ CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
++#else
+ CamelMessageInfo *info = summary->pdata[i];
++#endif
+
+ if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
+ g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.29.patch mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.29.patch
--- mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.29.patch 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.29.patch 2010-05-26 08:09:05.000000000 +0200
@@ -0,0 +1,89 @@
+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;
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/update-gob2-2.0.16.patch mail-notification-5.4.dfsg.1/debian/patches/update-gob2-2.0.16.patch
--- mail-notification-5.4.dfsg.1/debian/patches/update-gob2-2.0.16.patch 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/update-gob2-2.0.16.patch 2010-05-26 08:12:52.000000000 +0200
@@ -0,0 +1,273 @@
+Update .gob source to handle changes between gob2 2.0.15 and 2.0.16.
+
+--- mail-notification-5.4.dfsg.1.orig/src/mn-authenticated-mailbox.gob
++++ mail-notification-5.4.dfsg.1/src/mn-authenticated-mailbox.gob
+@@ -361,12 +361,12 @@
+ self->auth_failed = TRUE;
+ }
+
+- [G_GNUC_PRINTF(3, 4)]
+ private gboolean
+ prompt_for_password (self,
+ char **password (check null),
+ const char *format (check null),
+ ...)
++ attr {G_GNUC_PRINTF(3, 4)}
+ {
+ char *message;
+ gboolean ok;
+--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-client.gob
++++ mail-notification-5.4.dfsg.1/src/mn-evolution-client.gob
+@@ -33,7 +33,7 @@
+ * from unreferencing the proxy, so provide an eternal singleton
+ * proxy.
+ */
+-class MN:Evolution:Client
++class MN:Evolution:Client from G:Object
+ {
+ public DBusGProxy *proxy;
+ property POINTER proxy (link, export, type = DBusGProxy *);
+--- 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
+@@ -31,7 +31,7 @@
+ #include "mn-evolution-folder-tree-server-dbus.h"
+ %}
+
+-class MN:Evolution:Folder:Tree:Server
++class MN:Evolution:Folder:Tree:Server from G:Object
+ {
+ /* the GdkNativeWindow, which we also use as our ID */
+ private guint32 id;
+--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-server.gob
++++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob
+@@ -65,7 +65,7 @@
+ * interface methods are run from a main loop callback.
+ */
+
+-class MN:Evolution:Server
++class MN:Evolution:Server from G:Object
+ {
+ signal NONE (STRING)
+ void folder_changed (self, const char *uri (check null));
+--- mail-notification-5.4.dfsg.1.orig/src/mn-imap-mailbox.gob
++++ mail-notification-5.4.dfsg.1/src/mn-imap-mailbox.gob
+@@ -1492,11 +1492,11 @@
+ return FALSE;
+ }
+
+- [G_GNUC_PRINTF(2, 3)]
+ private int
+ session_write (MNClientSessionPrivate *priv (check null),
+ const char *format (check null),
+ ...)
++ attr {G_GNUC_PRINTF(2, 3)}
+ {
+ char *command;
+ int result;
+--- mail-notification-5.4.dfsg.1.orig/src/mn-mailbox-properties.gob
++++ mail-notification-5.4.dfsg.1/src/mn-mailbox-properties.gob
+@@ -27,7 +27,7 @@
+ #include "mn-mailbox-properties-dialog.h"
+ %}
+
+-class MN:Mailbox:Properties (abstract)
++class MN:Mailbox:Properties from G:Object (abstract)
+ {
+ classwide const char *type;
+ classwide const char *stock_id;
+--- mail-notification-5.4.dfsg.1.orig/src/mn-mailbox.gob
++++ mail-notification-5.4.dfsg.1/src/mn-mailbox.gob
+@@ -110,7 +110,7 @@
+ static unsigned int cleanup_messages_considered_as_read_idle_id = 0;
+ %}
+
+-class MN:Mailbox (abstract)
++class MN:Mailbox from G:Object (abstract)
+ {
+ classwide const char *type;
+ classwide int default_check_delay = -1;
+@@ -506,9 +506,9 @@
+ public char *error destroywith g_free;
+ property STRING error (link);
+
+- [G_GNUC_PRINTF(2, 3)]
+ protected void
+ set_error (self, const char *format, ...)
++ attr {G_GNUC_PRINTF(2, 3)}
+ {
+ char *error = NULL;
+
+@@ -634,9 +634,9 @@
+ self_filter_messages(self);
+ }
+
+- [G_GNUC_NULL_TERMINATED]
+ public MNMailbox *
+ new (const char *type (check null), ...)
++ attr {G_GNUC_NULL_TERMINATED}
+ {
+ va_list args;
+ GType type_id;
+@@ -1105,9 +1105,9 @@
+ : SELF_GET_CLASS(self)->default_check_delay;
+ }
+
+- [G_GNUC_UNUSED] /* invoked via the class pointer */
+ virtual private MNMailbox *
+- parse_uri (self, const char *uri (check null));
++ parse_uri (self, const char *uri (check null))
++ /*attr {G_GNUC_UNUSED}*/; /* invoked via the class pointer */
+
+ virtual public void
+ check (self)
+@@ -1135,9 +1135,9 @@
+ self_check(self);
+ }
+
+- [G_GNUC_PRINTF(2, 3)]
+ protected void
+ notice (self, const char *format (check null), ...)
++ attr {G_GNUC_PRINTF(2, 3)}
+ {
+ char *message;
+
+@@ -1153,9 +1153,9 @@
+ g_free(message);
+ }
+
+- [G_GNUC_PRINTF(2, 3)]
+ protected void
+ warning (self, const char *format (check null), ...)
++ attr {G_GNUC_PRINTF(2, 3)}
+ {
+ char *message;
+
+--- mail-notification-5.4.dfsg.1.orig/src/mn-mailboxes.gob
++++ mail-notification-5.4.dfsg.1/src/mn-mailboxes.gob
+@@ -39,7 +39,7 @@
+ #include "mn-util.h"
+ %}
+
+-class MN:Mailboxes
++class MN:Mailboxes from G:Object
+ {
+ public GList *list; /* freed in finalize */
+
+@@ -97,11 +97,11 @@
+ self_error_changed(self);
+ }
+
+- [G_GNUC_UNUSED] /* we use g_signal_emit_by_name(), for passing a detail */
+ signal (DETAILED) private NONE (OBJECT, POINTER)
+ void mailbox_notify (self,
+ MN:Mailbox *mailbox (check null type),
+- GParamSpec *pspec (check null));
++ GParamSpec *pspec (check null))
++ /*attr {G_GNUC_UNUSED}*/; /* we use g_signal_emit_by_name(), for passing a detail */
+
+ /**
+ * list-changed:
+@@ -310,12 +310,12 @@
+ self_save(self);
+ }
+
+- [G_GNUC_PRINTF(3, 4)]
+ private void
+ add_error (GString **errors (check null),
+ int *n_errors (check null),
+ const char *format,
+ ...)
++ attr {G_GNUC_PRINTF(3, 4)}
+ {
+ char *message;
+
+--- mail-notification-5.4.dfsg.1.orig/src/mn-maildir-message.gob
++++ mail-notification-5.4.dfsg.1/src/mn-maildir-message.gob
+@@ -141,9 +141,9 @@
+ return NULL;
+ }
+
+- [G_GNUC_PRINTF(2, 3)]
+ private GError *
+ delete_with_prompt (self, const char *format (check null), ...)
++ attr {G_GNUC_PRINTF(2, 3)}
+ {
+ GtkWidget *dialog;
+ char *prompt;
+--- mail-notification-5.4.dfsg.1.orig/src/mn-message.gob
++++ mail-notification-5.4.dfsg.1/src/mn-message.gob
+@@ -134,7 +134,7 @@
+ };
+ %}
+
+-class MN:Message
++class MN:Message from G:Object
+ {
+ /*
+ * In order to not create reference cycles, we do not hold a
+--- mail-notification-5.4.dfsg.1.orig/src/mn-popups.gob
++++ mail-notification-5.4.dfsg.1/src/mn-popups.gob
+@@ -28,7 +28,7 @@
+ #include "mn-properties-dialog.h"
+ %}
+
+-class MN:Popups
++class MN:Popups from G:Object
+ {
+ /*
+ * Maps message IDs to popups. If a message is known but has no
+--- mail-notification-5.4.dfsg.1.orig/src/mn-server.gob
++++ mail-notification-5.4.dfsg.1/src/mn-server.gob
+@@ -43,7 +43,7 @@
+ * main loop callback.
+ */
+
+-class MN:Server
++class MN:Server from G:Object
+ {
+ class_init (class)
+ {
+--- mail-notification-5.4.dfsg.1.orig/src/mn-shell.gob
++++ mail-notification-5.4.dfsg.1/src/mn-shell.gob
+@@ -73,7 +73,7 @@
+ NONE
+ } MN:Shell:Tooltip:Mail:Summary;
+
+-class MN:Shell
++class MN:Shell from G:Object
+ {
+ public MNMailboxes *mailboxes;
+
+--- mail-notification-5.4.dfsg.1.orig/src/mn-sound-player.gob
++++ mail-notification-5.4.dfsg.1/src/mn-sound-player.gob
+@@ -31,7 +31,7 @@
+ #include "mn-util.h"
+ %}
+
+-class MN:Sound:Player
++class MN:Sound:Player from G:Object
+ {
+ private gboolean can_play;
+ property BOOLEAN can_play (export)
+--- mail-notification-5.4.dfsg.1.orig/src/mn-tooltips.gob
++++ mail-notification-5.4.dfsg.1/src/mn-tooltips.gob
+@@ -71,7 +71,7 @@
+ #define GTK_PRIVATE_SET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
+ %}
+
+-class MN:Tooltips
++class MN:Tooltips from G:Object
+ {
+ private GtkWidget *window;
+ private TooltipsData *active_data;
+--- mail-notification-5.4.dfsg.1.orig/src/mn-vfs-mailbox-backend.gob
++++ mail-notification-5.4.dfsg.1/src/mn-vfs-mailbox-backend.gob
+@@ -31,7 +31,7 @@
+ #include "mn-util.h"
+ %}
+
+-class MN:VFS:Mailbox:Backend (abstract)
++class MN:VFS:Mailbox:Backend from G:Object (abstract)
+ {
+ classwide const char *format;
+
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/update-icons.patch mail-notification-5.4.dfsg.1/debian/patches/update-icons.patch
--- mail-notification-5.4.dfsg.1/debian/patches/update-icons.patch 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/update-icons.patch 2010-05-26 08:10:51.000000000 +0200
@@ -0,0 +1,33 @@
+Use icons still present in newer versions of gnome-icon-theme or
+elsewhere. Based on
+https://bugzilla.redhat.com/attachment.cgi?id=415509
+
+--- mail-notification-5.4.dfsg.1.orig/src/mn-stock.c
++++ mail-notification-5.4.dfsg.1/src/mn-stock.c
+@@ -32,11 +32,11 @@
+ const char *icon_name;
+ const char *source_stock_id;
+ } icons[] = {
+- { MN_STOCK_MAIL, NULL, "stock_mail" },
+- { MN_STOCK_NO_MAIL, NULL, "stock_inbox" },
++ { MN_STOCK_MAIL, NULL, "mail-notification" },
++ { MN_STOCK_NO_MAIL, NULL, "mail-notification" },
+ { MN_STOCK_LOCAL, NULL, "stock_folder" },
+ { MN_STOCK_REMOTE, NULL, "stock_internet" },
+- { MN_STOCK_UNKNOWN, NULL, "stock_unknown" },
++ { MN_STOCK_UNKNOWN, NULL, "unknown" },
+ { MN_STOCK_ERROR, NULL, NULL, GTK_STOCK_DIALOG_ERROR },
+ #if WITH_GMAIL
+ { MN_STOCK_GMAIL, PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
+@@ -53,9 +53,9 @@
+ #if WITH_EVOLUTION
+ { MN_STOCK_EVOLUTION_MAILBOX, NULL, "evolution" },
+ #endif
+- { MN_STOCK_MAIL_READER, NULL, "stock_mail-handling" },
++ { MN_STOCK_MAIL_READER, NULL, "stock_mail-compose" },
+ { MN_STOCK_OPEN_MESSAGE, NULL, "stock_mail-open" },
+- { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
++ { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
+ };
+ GtkIconFactory *factory;
+ GtkIconTheme *icon_theme;
diff -Nru mail-notification-5.4.dfsg.1/debian/rules mail-notification-5.4.dfsg.1/debian/rules
--- mail-notification-5.4.dfsg.1/debian/rules 2010-05-26 15:52:30.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/rules 2010-05-26 06:55:55.000000000 +0200
@@ -28,8 +28,7 @@
dh_testdir
dh_testroot
- [ ! -f build/config ] || ./jb distclean
- -rm -f build/*.log build/jbsrc/jb.c
+ rm -rf build
-rm -f build-stamp configure-stamp install-stamp
dh_clean
diff -Nru mail-notification-5.4.dfsg.1/debian/source/format mail-notification-5.4.dfsg.1/debian/source/format
--- mail-notification-5.4.dfsg.1/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/source/format 2010-05-26 06:56:46.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru mail-notification-5.4.dfsg.1/po/de.po mail-notification-5.4.dfsg.1/po/de.po
--- mail-notification-5.4.dfsg.1/po/de.po 2010-05-26 15:52:30.000000000 +0200
+++ mail-notification-5.4.dfsg.1/po/de.po 2008-01-04 16:34:26.000000000 +0100
@@ -1275,7 +1275,7 @@
#: ../src/mn-main.c:361
msgid "quitting Mail Notification"
-msgstr "E-Mail-Eingangsüberwachung wird beendet"
+msgstr "E-Mail-Eingangsüberwachung wir beendet"
#: ../src/mn-main.c:365
msgid "Mail Notification is not running"
diff -Nru mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob
--- mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob 2010-05-26 15:52:30.000000000 +0200
+++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob 2008-05-22 17:45:36.000000000 +0200
@@ -235,12 +235,7 @@
for (i = 0; i < summary->len; i++)
{
-#if EDS_CHECK_VERSION(2,23,5)
- char *uid = summary->pdata[i];
- CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
-#else
CamelMessageInfo *info = summary->pdata[i];
-#endif
if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
