[Pkg-telepathy-commits] ./packages/unstable/empathy r99: debian/patches/00_set_null_presence_message.patch: Removed. Merged upstream

[Sjoerd Simons]

------------------------------------------------------------
revno: 99
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: empathy
timestamp: Mon 2008-03-03 19:05:35 +0100
message:
  debian/patches/00_set_null_presence_message.patch: Removed. Merged upstream
removed:
  patches/00_set_null_presence_message.patch
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-03-03 17:10:38 +0000
+++ b/changelog	2008-03-03 18:05:35 +0000
@@ -1,8 +1,10 @@
 empathy (0.21.91-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/00_set_null_presence_message.patch:
+    - Removed. Merged upstream
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 03 Mar 2008 18:09:49 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 03 Mar 2008 19:04:30 +0100
 
 empathy (0.21.90-2) unstable; urgency=low
 

=== removed file 'patches/00_set_null_presence_message.patch'
--- a/patches/00_set_null_presence_message.patch	2008-02-10 12:09:56 +0000
+++ b/patches/00_set_null_presence_message.patch	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-commit 94cde42c3f7800a0b3f63feff88e659ebc99afc7
-Author: Sjoerd Simons <sjoerd at luon.net>
-Date:   Sun Feb 10 12:26:46 2008 +0100
-
-    EmpathyTpContactFactory: If the presence dict doesn't contain a presence-message set the presence message to NULL
-
-diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
-index 14d2640..7748252 100644
---- a/libempathy/empathy-tp-contact-factory.c
-+++ b/libempathy/empathy-tp-contact-factory.c
-@@ -122,6 +122,8 @@ tp_contact_factory_presences_table_foreach (const gchar    *state_str,
- 	if (message != NULL) {
- 		empathy_contact_set_presence_message (contact,
- 						      g_value_get_string (message));
-+	} else {
-+		empathy_contact_set_presence_message (contact, NULL);
- 	}
- }
-