# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1194976822 0
# Node ID 94b3275eafcc9fc7cef82218fe727edcd745d38c
# Parent  3d70e3ec8a47fd0d5b2f60f0ccf55cb5ddea545a# Parent  eb0f36c3a58feaadf1fda0834b5502063eae58fc
merge of '7a98d978e56502762335bda8f19011a139ac460a'
     and 'd2959ce162eb97cc02e8a7f61fe9a804391fdd46'

diff -r 3d70e3ec8a47 -r 94b3275eafcc Doxyfile.in
--- a/Doxyfile.in	Tue Nov 13 06:27:27 2007 +0000
+++ b/Doxyfile.in	Tue Nov 13 18:00:22 2007 +0000
@@ -604,7 +604,7 @@
 # then you must also enable this option. If you don't then doxygen will produce 
 # a warning and turn it on anyway
 
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body 
 # of functions and classes directly in the documentation.
diff -r 3d70e3ec8a47 -r 94b3275eafcc libpurple/prpl.h
--- a/libpurple/prpl.h	Tue Nov 13 06:27:27 2007 +0000
+++ b/libpurple/prpl.h	Tue Nov 13 18:00:22 2007 +0000
@@ -341,7 +341,7 @@
 
 	/** Gets the real name of a participant in a chat.  For example, on
 	 *  XMPP this turns a chat room nick <tt>foo</tt> into
-	 *  <tt>room@server/foo</tt>
+	 *  <tt>room\@server/foo</tt>
 	 *  @param gc  the connection on which the room is.
 	 *  @param id  the ID of the chat room.
 	 *  @param who the nickname of the chat participant.
diff -r 3d70e3ec8a47 -r 94b3275eafcc libpurple/xmlnode.h
--- a/libpurple/xmlnode.h	Tue Nov 13 06:27:27 2007 +0000
+++ b/libpurple/xmlnode.h	Tue Nov 13 18:00:22 2007 +0000
@@ -158,10 +158,10 @@
 /**
  * Sets a prefixed attribute for a node
  *
- * @param node  The node to set an attribute for.
- * @param attr  The name of the attribute to set
- * @param xmlns The prefix of the attribute to ste
- * @param value The value of the attribute
+ * @param node   The node to set an attribute for.
+ * @param attr   The name of the attribute to set
+ * @param prefix The prefix of the attribute to ste
+ * @param value  The value of the attribute
  */
 void xmlnode_set_attrib_with_prefix(xmlnode *node, const char *attr, const char *prefix, const char *value);
 
@@ -232,8 +232,8 @@
 /**
  * Sets the prefix of a node
  *
- * @param node The node to qualify
- * @param xmlns The prefix of the node
+ * @param node   The node to qualify
+ * @param prefix The prefix of the node
  */
 void xmlnode_set_prefix(xmlnode *node, const char *prefix);
 
diff -r 3d70e3ec8a47 -r 94b3275eafcc pidgin/minidialog.h
--- a/pidgin/minidialog.h	Tue Nov 13 06:27:27 2007 +0000
+++ b/pidgin/minidialog.h	Tue Nov 13 18:00:22 2007 +0000
@@ -120,7 +120,7 @@
  *  @param mini_dialog a mini-dialog
  *  @param title       the new title for @a mini_dialog
  */
-void pidgin_mini_dialog_set_title(PidginMiniDialog *mini_dialogtitle ,
+void pidgin_mini_dialog_set_title(PidginMiniDialog *mini_dialog,
 	const char *title);
 
 /** Shortcut for setting a mini-dialog's description via GObject properties.
@@ -133,7 +133,7 @@
 
 /** Shortcut for setting a mini-dialog's icon via GObject properties.
  *  @param mini_dialog a mini-dialog
- *  @param title       the Gtk stock ID of an icon, or @c NULL for no icon.
+ *  @param icon_name   the Gtk stock ID of an icon, or @c NULL for no icon.
  */
 void pidgin_mini_dialog_set_icon_name(PidginMiniDialog *mini_dialog,
 	const char *icon_name);