Mercurial > pidgin

changeset 19698:d32ed28cf645

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix mingw build of xmpp prpl
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 10 Sep 2007 14:37:40 +0000
parents 481749fc0b6b
children 680a3aea5eb6
files libpurple/protocols/jabber/Makefile.mingw libpurple/protocols/jabber/adhoccommands.c libpurple/protocols/jabber/caps.c libpurple/protocols/jabber/jabber.h libpurple/protocols/jabber/pep.c libpurple/protocols/jabber/usermood.c libpurple/protocols/jabber/usernick.c libpurple/protocols/jabber/usertune.c
diffstat 8 files changed, 29 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/Makefile.mingw	Mon Sep 10 13:57:15 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Mon Sep 10 14:37:40 2007 +0000
@@ -42,8 +42,11 @@
 ##
 ##  SOURCES, OBJECTS
 ##
-C_SRC =			auth.c \
+C_SRC =	\
+			adhoccommands.c \
+			auth.c \
 			buddy.c \
+			caps.c \
 			chat.c \
 			disco.c \
 			google.c \
@@ -53,10 +56,14 @@
 			message.c \
 			oob.c \
 			parser.c \
+			pep.c \
 			ping.c \
 			presence.c \
 			roster.c \
 			si.c \
+			usermood.c \
+			usernick.c \
+			usertune.c \
 			xdata.c \
 			win32/posix.uname.c
 
--- a/libpurple/protocols/jabber/adhoccommands.c	Mon Sep 10 13:57:15 2007 +0000
+++ b/libpurple/protocols/jabber/adhoccommands.c	Mon Sep 10 14:37:40 2007 +0000
@@ -19,6 +19,8 @@
  *
  */
 
+#include "internal.h"
+
 #include "adhoccommands.h"
 #include <assert.h>
 #include <string.h>
--- a/libpurple/protocols/jabber/caps.c	Mon Sep 10 13:57:15 2007 +0000
+++ b/libpurple/protocols/jabber/caps.c	Mon Sep 10 14:37:40 2007 +0000
@@ -19,6 +19,8 @@
  *
  */
 
+#include "internal.h"
+
 #include "caps.h"
 #include <string.h>
 #include "internal.h"
@@ -464,19 +466,22 @@
 	JabberCapsValue *client;
 	JabberCapsKey *key = g_new0(JabberCapsKey, 1);
 	char *originalext = g_strdup(ext);
-	char *oneext, *ctx;
 	jabber_caps_cbplususerdata *userdata = g_new0(jabber_caps_cbplususerdata, 1);
 	userdata->cb = cb;
 	userdata->user_data = user_data;
 	userdata->who = g_strdup(who);
 	userdata->node = g_strdup(node);
 	userdata->ver = g_strdup(ver);
-	
-	if(originalext)
-		for(oneext = strtok_r(originalext, " ", &ctx); oneext; oneext = strtok_r(NULL, " ", &ctx)) {
-			userdata->ext = g_list_append(userdata->ext,g_strdup(oneext));
+
+	if(originalext) {
+		gchar **tmp;
+		gchar **splat = g_strsplit(originalext, " ", 0);
+		for(tmp = splat; *tmp; tmp++) {
+			userdata->ext = g_list_append(userdata->ext, tmp);
 			++userdata->extOutstanding;
 		}
+		g_free(splat);
+	}
 	g_free(originalext);
 	
 	key->node = g_strdup(node);
--- a/libpurple/protocols/jabber/jabber.h	Mon Sep 10 13:57:15 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Mon Sep 10 14:37:40 2007 +0000
@@ -34,7 +34,7 @@
 	JABBER_CAP_IQ_SEARCH      = 1 << 7,
 	JABBER_CAP_IQ_REGISTER    = 1 << 8,
 
-	/* Google Talk extensions: 
+	/* Google Talk extensions:
 	 * http://code.google.com/apis/talk/jep_extensions/extensions.html
 	 */
 	JABBER_CAP_GMAIL_NOTIFY   = 1 << 9,
--- a/libpurple/protocols/jabber/pep.c	Mon Sep 10 13:57:15 2007 +0000
+++ b/libpurple/protocols/jabber/pep.c	Mon Sep 10 14:37:40 2007 +0000
@@ -19,6 +19,8 @@
  *
  */
 
+#include "internal.h"
+
 #include "pep.h"
 #include "iq.h"
 #include <string.h>
--- a/libpurple/protocols/jabber/usermood.c	Mon Sep 10 13:57:15 2007 +0000
+++ b/libpurple/protocols/jabber/usermood.c	Mon Sep 10 14:37:40 2007 +0000
@@ -19,6 +19,8 @@
  *
  */
 
+#include "internal.h"
+
 #include "usermood.h"
 #include "pep.h"
 #include <assert.h>
--- a/libpurple/protocols/jabber/usernick.c	Mon Sep 10 13:57:15 2007 +0000
+++ b/libpurple/protocols/jabber/usernick.c	Mon Sep 10 14:37:40 2007 +0000
@@ -19,6 +19,8 @@
  *
  */
 
+#include "internal.h"
+
 #include "usernick.h"
 #include "pep.h"
 #include <assert.h>
--- a/libpurple/protocols/jabber/usertune.c	Mon Sep 10 13:57:15 2007 +0000
+++ b/libpurple/protocols/jabber/usertune.c	Mon Sep 10 14:37:40 2007 +0000
@@ -19,6 +19,8 @@
  *
  */
 
+#include "internal.h"
+
 #include "usertune.h"
 #include "pep.h"
 #include <assert.h>