# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1211852315 0
# Node ID 1e87376e77f2038ef9dc629e263efeac762c8b26
# Parent  bda7c7c4d4b2f7148645360e77d3c554e2ab726c# Parent  313b87adb730d25821935c8653fa48336a820671
merge of '50ee8ea93d28a742019b72de39c81427af3ca785'
     and 'e7d6a0a271d8fe8435f200e0f1ec123053e57493'

diff -r 313b87adb730 -r 1e87376e77f2 libpurple/buddyicon.h
--- a/libpurple/buddyicon.h	Tue May 27 01:11:46 2008 +0000
+++ b/libpurple/buddyicon.h	Tue May 27 01:38:35 2008 +0000
@@ -26,6 +26,11 @@
 #ifndef _PURPLE_BUDDYICON_H_
 #define _PURPLE_BUDDYICON_H_
 
+/** An opaque structure representing a buddy icon for a particular user on a
+ *  particular #PurpleAccount.  Instances are reference-counted; use
+ *  purple_buddy_icon_ref() and purple_buddy_icon_unref() to take and release
+ *  references.
+ */
 typedef struct _PurpleBuddyIcon PurpleBuddyIcon;
 
 #include "account.h"
diff -r 313b87adb730 -r 1e87376e77f2 libpurple/core.c
--- a/libpurple/core.c	Tue May 27 01:11:46 2008 +0000
+++ b/libpurple/core.c	Tue May 27 01:38:35 2008 +0000
@@ -131,13 +131,14 @@
 
 	purple_ciphers_init();
 
-	/* Initialize all static protocols. */
-	static_proto_init();
-
 	/* Since plugins get probed so early we should probably initialize their
 	 * subsystem right away too.
 	 */
 	purple_plugins_init();
+	
+	/* Initialize all static protocols. */
+	static_proto_init();
+
 	purple_plugins_probe(G_MODULE_SUFFIX);
 
 	/* The buddy icon code uses the imgstore, so init it early. */
diff -r 313b87adb730 -r 1e87376e77f2 libpurple/prpl.h
--- a/libpurple/prpl.h	Tue May 27 01:11:46 2008 +0000
+++ b/libpurple/prpl.h	Tue May 27 01:38:35 2008 +0000
@@ -71,16 +71,22 @@
 #include "status.h"
 #include "whiteboard.h"
 
+
+/** @copydoc PurpleBuddyIconSpec */
 struct _PurpleBuddyIconSpec {
-	char *format;                       /**< This is a comma-delimited list of image formats or NULL if icons are not supported.
-					     * Neither the core nor the prpl will actually check to see if the data it's given matches this; it's
-					     * entirely up to the UI to do what it wants */
-	int min_width;                          /**< The minimum width of this icon  */
-	int min_height;                         /**< The minimum height of this icon */
-	int max_width;                          /**< The maximum width of this icon  */
-	int max_height;                         /**< The maximum height of this icon */
-	size_t max_filesize;                     /**< The maximum number of bytes    */
-	PurpleIconScaleRules scale_rules;		/**< How to stretch this icon */
+	/** This is a comma-delimited list of image formats or @c NULL if icons
+	 *  are not supported.  Neither the core nor the prpl will actually
+	 *  check to see if the data it's given matches this; it's entirely up
+	 *  to the UI to do what it wants
+	 */
+	char *format;
+
+	int min_width;                     /**< Minimum width of this icon  */
+	int min_height;                    /**< Minimum height of this icon */
+	int max_width;                     /**< Maximum width of this icon  */
+	int max_height;                    /**< Maximum height of this icon */
+	size_t max_filesize;               /**< Maximum size in bytes */
+	PurpleIconScaleRules scale_rules;  /**< How to stretch this icon */
 };
 
 struct proto_chat_entry {
diff -r 313b87adb730 -r 1e87376e77f2 po/de.po
--- a/po/de.po	Tue May 27 01:11:46 2008 +0000
+++ b/po/de.po	Tue May 27 01:38:35 2008 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-24 10:32+0200\n"
-"PO-Revision-Date: 2008-05-24 10:31+0200\n"
+"POT-Creation-Date: 2008-05-26 21:14+0200\n"
+"PO-Revision-Date: 2008-05-26 21:14+0200\n"
 "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -10813,9 +10813,6 @@
 msgid "Fatal Error"
 msgstr "Schwerer Fehler"
 
-msgid "lead developer"
-msgstr "Hauptentwickler"
-
 msgid "developer"
 msgstr "Entwickler"
 
@@ -10850,6 +10847,9 @@
 msgid "original author"
 msgstr "Originalautor"
 
+msgid "lead developer"
+msgstr "Hauptentwickler"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -11229,23 +11229,35 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Rechtsklicken für weitere ungelesene Nachrichten...\n"
 
-msgid "Change Status"
-msgstr "Ändere Status"
-
-msgid "Show Buddy List"
-msgstr "Buddy-Liste anzeigen"
-
-msgid "New Message..."
-msgstr "Neue Nachricht..."
-
-msgid "Mute Sounds"
-msgstr "Stummschalten"
-
-msgid "Blink on New Message"
-msgstr "Bei neuen Nachrichten blinken"
-
-msgid "Quit"
-msgstr "Beenden"
+msgid "_Change Status"
+msgstr "Ändere _Status"
+
+msgid "Show Buddy _List"
+msgstr "Buddy-_Liste anzeigen"
+
+msgid "_Unread Messages"
+msgstr "_Ungelesene Nachrichten"
+
+msgid "New _Message..."
+msgstr "_Neue Nachricht..."
+
+msgid "_Accounts"
+msgstr "_Konten"
+
+msgid "Plu_gins"
+msgstr "_Plugins"
+
+msgid "Pr_eferences"
+msgstr "_Einstellungen"
+
+msgid "Mute _Sounds"
+msgstr "Stu_mmschalten"
+
+msgid "_Blink on New Message"
+msgstr "Be_i neuen Nachrichten blinken"
+
+msgid "_Quit"
+msgstr "_Beenden"
 
 msgid "Not started"
 msgstr "Nicht gestartet"