merge of 'fb83e7d177c9c63af685747eafc0ea0e660889c8' cpw.qulogic.msnp16

Wed, 24 Feb 2010 17:36:45 +0000

author
Jorge Villaseñor <masca@cpw.pidgin.im>
date
Wed, 24 Feb 2010 17:36:45 +0000
branch
cpw.qulogic.msnp16
changeset 30905
f9b17246cead
parent 30904
fb83e7d177c9 (diff)
parent 30902
a1a3d626b7d4 (current diff)
child 30906
957af130d083

merge of 'fb83e7d177c9c63af685747eafc0ea0e660889c8'
and 'a1a3d626b7d428a393b05fe93252c87ad21b9a02'

pidgin/gtkdocklet-x11.c file | annotate | diff | comparison | revisions
pidgin/pixmaps/emblems/16/mobile.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emblems/16/music.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emblems/scalable/mobile.svg file | annotate | diff | comparison | revisions
pidgin/pixmaps/emblems/scalable/music.svg file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/afraid.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/amorous.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/eat.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/excited.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/happy.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/hot.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/hungry.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/in-love.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/in_love.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/love.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/nailbiting.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/nervous.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/shock.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/shocked.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/sleeping.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/sleepy.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/smile-big.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/smile.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/sweat.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/tremble.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/default/24/yawn.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/excited.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/happy.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/in_love.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/love.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/mobile.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/music.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/scalable/mobile.svg file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/scalable/music.svg file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/shock.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/shocked.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/sleeping.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/sleepy.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/smile-big.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/smile.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/emotes/small/16/yawn.png file | annotate | diff | comparison | revisions
--- a/libpurple/protocols/msn/dialog.c	Wed Feb 24 01:21:07 2010 +0000
+++ b/libpurple/protocols/msn/dialog.c	Wed Feb 24 17:36:45 2010 +0000
@@ -34,9 +34,11 @@
 
 } MsnAddRemData;
 
-/* Remove the buddy referenced by the MsnAddRemData before the serverside list is changed.
- * If the buddy will be added, he'll be added back; if he will be removed, he won't be. */
-/* Actually with our MSNP14 code that isn't true yet, he won't be added back :( */
+/* Remove the buddy referenced by the MsnAddRemData before the serverside list
+ * is changed.  If the buddy will be added, he'll be added back; if he will be
+ * removed, he won't be. */
+/* Actually with our MSNP14 code that isn't true yet, he won't be added back :(
+ * */
 static void
 msn_complete_sync_issue(MsnAddRemData *data)
 {
--- a/libpurple/protocols/msn/msnutils.h	Wed Feb 24 01:21:07 2010 +0000
+++ b/libpurple/protocols/msn/msnutils.h	Wed Feb 24 17:36:45 2010 +0000
@@ -54,7 +54,23 @@
  */
 void msn_import_html(const char *html, char **attributes, char **message);
 
+/**
+ * Parses a socket string.
+ *
+ * @param str		A host:port string.
+ * @param ret_host 	Return string value of the host.
+ * @param ret_port	Return integer value of the port.
+ */
 void msn_parse_socket(const char *str, char **ret_host, int *ret_port);
+
+/**
+ * Handle MSN Challenge Computation
+ * This algorithm references
+ * http://imfreedom.org/wiki/index.php/MSN:NS/Challenges
+ *
+ * @param input 	Challenge input.
+ * @param output 	Callenge output.
+ */
 void msn_handle_chl(char *input, char *output);
 
 #endif /* MSN_UTILS_H */

mercurial