Package: mail-notification Version: 5.4.dfsg.1-2.3 Severity: normal Tags: patch pending
Dear Qi, As agreed I've prepared an NMU for mail-notification (versioned as 5.4.dfsg.1-2.4) and will shortly be requesting a sponsor for it. Regards, Stephen
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 2011-02-28 00:50:50.000000000 +0100 +++ mail-notification-5.4.dfsg.1/debian/changelog 2011-03-13 23:18:40.000000000 +0100 @@ -1,3 +1,12 @@ +mail-notification (5.4.dfsg.1-2.4) unstable; urgency=low + + * Non-maintainer upload, with maintainer approval. + * Correctly support Evolution 2.32 (closes: #617771). + * Ignore mail marked as junk (closes: #547287). + * Thanks to Michel Dänzer for both these fixes! + + -- Stephen Kitt <st...@sk2.org> Sun, 13 Mar 2011 23:17:35 +0100 + mail-notification (5.4.dfsg.1-2.3) unstable; urgency=low * Non-maintainer upload. diff -Nru mail-notification-5.4.dfsg.1/debian/patches/evolution-2.32.patch mail-notification-5.4.dfsg.1/debian/patches/evolution-2.32.patch --- mail-notification-5.4.dfsg.1/debian/patches/evolution-2.32.patch 1970-01-01 01:00:00.000000000 +0100 +++ mail-notification-5.4.dfsg.1/debian/patches/evolution-2.32.patch 2011-03-13 23:17:07.000000000 +0100 @@ -0,0 +1,75 @@ +Description: Support evolution 2.32 +Author: Michel Dänzer <daen...@debian.org> +Origin: http://bugs.debian.org/617771 + +--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-server.gob ++++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob +@@ -98,10 +98,10 @@ + info = g_new0(FolderInfo, 1); + info->uri = g_strdup(uri); + info->folder = folder; +- camel_object_ref(folder); ++ g_object_ref(folder); + + /* uncache the folder when it is deleted */ +- camel_object_hook_event(folder, "deleted", self_folder_deleted_cb, info); ++ g_signal_connect(folder, "deleted", G_CALLBACK(self_folder_deleted_cb), info); + + g_hash_table_replace(folders, info->uri, info); + } +@@ -109,8 +109,8 @@ + private void + folder_info_free (FolderInfo *info (check null)) + { +- camel_object_unhook_event(info->folder, "deleted", self_folder_deleted_cb, info); +- camel_object_unref(info->folder); ++ g_signal_handlers_disconnect_by_func(info->folder, self_folder_deleted_cb, info); ++ g_object_unref(info->folder); + g_free(info->uri); + g_free(info); + } +@@ -140,7 +140,7 @@ + if (info) + { + folder = info->folder; +- camel_object_ref(folder); ++ g_object_ref(folder); + } + } + else +@@ -253,7 +253,7 @@ + } + + camel_folder_free_summary(folder, summary); +- camel_object_unref(folder); ++ g_object_unref(folder); + } + + GDK_THREADS_LEAVE(); +@@ -275,7 +275,7 @@ + if (folder) + { + *ret = g_strdup(camel_folder_get_name(folder)); +- camel_object_unref(folder); ++ g_object_unref(folder); + } + + GDK_THREADS_LEAVE(); +@@ -321,7 +321,7 @@ + gtk_widget_show(((EMMessageBrowser *) browser)->window); + #endif + +- camel_object_unref(folder); ++ g_object_unref(folder); + } + + GDK_THREADS_LEAVE(); +@@ -345,7 +345,7 @@ + if (folder) + { + status = camel_folder_set_message_flags(folder, message_uid, flags, flags); +- camel_object_unref(folder); ++ g_object_unref(folder); + + if (! status) + g_set_error(err, diff -Nru mail-notification-5.4.dfsg.1/debian/patches/ignore-junk.patch mail-notification-5.4.dfsg.1/debian/patches/ignore-junk.patch --- mail-notification-5.4.dfsg.1/debian/patches/ignore-junk.patch 1970-01-01 01:00:00.000000000 +0100 +++ mail-notification-5.4.dfsg.1/debian/patches/ignore-junk.patch 2011-03-13 23:17:19.000000000 +0100 @@ -0,0 +1,15 @@ +Description: Ignore junk messages +Author: Michel Dänzer <daen...@debian.org> +Origin: http://bugs.debian.org/617771 + +--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-server.gob ++++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob +@@ -248,7 +248,7 @@ + CamelMessageInfo *info = summary->pdata[i]; + #endif + +- if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0) ++ if ((camel_message_info_flags(info) & (CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_JUNK)) == 0) + g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info)); + } + 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 2011-02-28 00:31:11.000000000 +0100 +++ mail-notification-5.4.dfsg.1/debian/patches/series 2011-03-13 23:14:01.000000000 +0100 @@ -7,3 +7,5 @@ mail-notification-5.4-gmime.patch camel-includes.patch strict-libs.patch +evolution-2.32.patch +ignore-junk.patch
