I'm uploading an NMU for this issue. Interdiff is attached.
diff -u mail-notification-5.4.dfsg.1/debian/changelog mail-notification-5.4.dfsg.1/debian/changelog
--- mail-notification-5.4.dfsg.1/debian/changelog
+++ mail-notification-5.4.dfsg.1/debian/changelog
@@ -1,3 +1,12 @@
+mail-notification (5.4.dfsg.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * [debian/patches/02-fix_evolution_crash_on_startup.diff]:
+    - Apply patch from Ubuntu to fix Evolution 2.24 crashing on startup
+      with this plugin enabled.
+
+ -- Ari Pollak <a...@debian.org>  Tue, 07 Apr 2009 12:07:37 -0400
+
 mail-notification (5.4.dfsg.1-1) unstable; urgency=medium
 
   * New upstream release
only in patch2:
unchanged:
--- mail-notification-5.4.dfsg.1.orig/debian/patches/02-fix_evolution_crash_on_startup.diff
+++ mail-notification-5.4.dfsg.1/debian/patches/02-fix_evolution_crash_on_startup.diff
@@ -0,0 +1,76 @@
+#
+# Ubuntu: https://launchpad.net/bugs/251031
+# Upstream: none
+# Description: the behaviour of the function camel_folder_summary_array (which
+#  is called by the function camel_folder_get_summary) has changed.
+#  Instead of a GPtrArray containing CamelMessageInfo pointers, the function
+#  now returns a GPtrArray containing uid's (char*).
+#  Thanks to Erik van Pienbroek for the initial patch.
+#  Unfortunately, patching a ".gob" file means re-running gob2 but
+#  mail-notification requires gob2 2.0.16, which does not exist as of today. To
+#  workaround this, patch the generated file too, and touch the corresponding
+#  stamp file so gob2 is not needed.
+#
+---
+ src/mn-evolution-server.gob             |    5 +++++
+ build/src/mn-evolution-server.c         |    3 ++-
+ build/src/mn-evolution-server.gob.stamp |    1 +
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+
+Index: mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob
+===================================================================
+--- src/mn-evolution-server.gob.orig
++++ src/mn-evolution-server.gob
+@@ -230,17 +230,22 @@
+ 	int i;
+ 
+ 	*ret = g_ptr_array_new();
+ 
+ 	summary = camel_folder_get_summary(folder);
+ 
+ 	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));
+ 	  }
+ 
+ 	camel_folder_free_summary(folder, summary);
+ 	camel_object_unref(folder);
+       }
+Index: mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.c
+===================================================================
+--- build/src/mn-evolution-server.c.orig
++++ build/src/mn-evolution-server.c
+@@ -590,17 +590,18 @@
+ 	int i;
+ 
+ 	*ret = g_ptr_array_new();
+ 
+ 	summary = camel_folder_get_summary(folder);
+ 
+ 	for (i = 0; i < summary->len; i++)
+ 	  {
+-	    CamelMessageInfo *info = summary->pdata[i];
++	    char *uid = summary->pdata[i];
++	    CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
+ 
+ 	    if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
+ 	      g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
+ 	  }
+ 
+ 	camel_folder_free_summary(folder, summary);
+ 	camel_object_unref(folder);
+       }
+Index: mail-notification-5.4.dfsg.1/build/src/mn-evolution-server.gob.stamp
+===================================================================
+--- build/src/mn-evolution-server.gob.stamp.orig
++++ build/src/mn-evolution-server.gob.stamp
+@@ -0,0 +1 @@
++touched

Reply via email to