# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1244066239 0
# Node ID 3ada8179ff2a7afc14a9450833358a7cec97ce19
# Parent  2f297ab00e9d31044c5d169d2a3036ae2e33bba2# Parent  1d2b813faca7f1a37cf69ed1bbbf39317d58fa6f
merge of '6fc007db8432a45dd3273d0abcc8bb9a09b11ecf'
     and '8806e5fba5cdb38ef9be6799e7e829dc2a762a69'

diff -r 2f297ab00e9d -r 3ada8179ff2a libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Wed Jun 03 19:34:42 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Wed Jun 03 21:57:19 2009 +0000
@@ -1118,10 +1118,6 @@
 	guint buddy_count;
 
 	body = msim_msg_get_dictionary(reply, "body");
-	if (!body) {
-		/* No friends. Not an error. */
-		return;
-	}
 
 	buddy_count = 0;
 
diff -r 2f297ab00e9d -r 3ada8179ff2a po/de.po
--- a/po/de.po	Wed Jun 03 19:34:42 2009 +0000
+++ b/po/de.po	Wed Jun 03 21:57:19 2009 +0000
@@ -13,7 +13,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-01 12:31+0200\n"
 "PO-Revision-Date: 2009-06-01 12:31+0200\n"
-"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
+"Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -10624,7 +10624,7 @@
 msgstr "/Buddys/Anzeigen/_Offline-Buddys"
 
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Buddys/Anzeigen/_leere Gruppen"
+msgstr "/Buddys/Anzeigen/_Leere Gruppen"
 
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Buddys/Anzeigen/Buddy-_Details"
@@ -10865,7 +10865,7 @@
 msgstr "/Buddys/Anzeigen/Offline-Buddys"
 
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Buddys/Anzeigen/leere Gruppen"
+msgstr "/Buddys/Anzeigen/Leere Gruppen"
 
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Buddys/Anzeigen/Buddy-Details"