pidgin: 34ae5911: On Windows, treat a 'xmpp:foo at bar.com' U...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 34ae591131a579911cfae8a20bcf7231fd20aff2
Ancestor: d434ce06afcd01bcaa35f6f861f6e4b9a2651421
Author: darkrain42 at pidgin.im
Date: 2009-12-08T07:41:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/34ae591131a579911cfae8a20bcf7231fd20aff2

Modified files:
        libpurple/protocols/jabber/libxmpp.c

ChangeLog: 

On Windows, treat a 'xmpp:foo at bar.com' URI as opening an IM window.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/libxmpp.c	fa1b2b78022e4068984bcf64896101cd9874c5b2
+++ libpurple/protocols/jabber/libxmpp.c	c739b998e2d8e9ec087bace5bad3f165f1632260
@@ -295,7 +295,7 @@ static gboolean xmpp_uri_handler(const c
 
 static gboolean xmpp_uri_handler(const char *proto, const char *user, GHashTable *params)
 {
-	char *acct_id = g_hash_table_lookup(params, "account");
+	char *acct_id = params ? g_hash_table_lookup(params, "account") : NULL;
 	PurpleAccount *acct;
 
 	if (g_ascii_strcasecmp(proto, "xmpp"))
@@ -307,7 +307,8 @@ static gboolean xmpp_uri_handler(const c
 		return FALSE;
 
 	/* xmpp:romeo at montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message */
-	if (g_hash_table_lookup_extended(params, "message", NULL, NULL)) {
+	/* params is NULL if the URI has no '?' (or anything after it) */
+	if (!params || g_hash_table_lookup_extended(params, "message", NULL, NULL)) {
 		char *body = g_hash_table_lookup(params, "body");
 		if (user && *user) {
 			PurpleConversation *conv =