[Gaim-commits] SF.net SVN: gaim: [16839] branches/v2_0_0beta3_1/gaim

[<sea...@us...>]

Revision: 16839
Author:   seanegan
Date:     2006-08-18 12:03:28 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16839&view=rev

Log Message:
-----------
Anyone else have any critical bugfix changes for this?

Modified Paths:
--------------
    branches/v2_0_0beta3_1/gaim/COPYRIGHT
    branches/v2_0_0beta3_1/gaim/configure.ac
    branches/v2_0_0beta3_1/gaim/src/gtkblist.c
    branches/v2_0_0beta3_1/gaim/src/protocols/msn/nexus.c
Modified: branches/v2_0_0beta3_1/gaim/COPYRIGHT
===================================================================
--- branches/v2_0_0beta3_1/gaim/COPYRIGHT	2006-08-18 18:47:03 UTC (rev 16838)
+++ branches/v2_0_0beta3_1/gaim/COPYRIGHT	2006-08-18 19:03:28 UTC (rev 16839)
@@ -292,6 +292,7 @@
 David Vermeille
 Sid Vicious
 Bjoern Voigt
+Wan Hing Wah
 Philip Walford
 Nathan Walp
 Eric Warmenhoven

Modified: branches/v2_0_0beta3_1/gaim/configure.ac
===================================================================
--- branches/v2_0_0beta3_1/gaim/configure.ac	2006-08-18 18:47:03 UTC (rev 16838)
+++ branches/v2_0_0beta3_1/gaim/configure.ac	2006-08-18 19:03:28 UTC (rev 16839)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gaim], [2.0.0beta3], [gai...@li...])
+AC_INIT([gaim], [2.0.0beta3.1], [gai...@li...])
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: branches/v2_0_0beta3_1/gaim/src/gtkblist.c
===================================================================
--- branches/v2_0_0beta3_1/gaim/src/gtkblist.c	2006-08-18 18:47:03 UTC (rev 16838)
+++ branches/v2_0_0beta3_1/gaim/src/gtkblist.c	2006-08-18 19:03:28 UTC (rev 16839)
@@ -3422,7 +3422,7 @@
 	len = g_utf8_strlen(normalized, -1);
 	log_attrs = g_new(PangoLogAttr, len + 1);
 
-	pango_get_log_attrs(normalized, len, -1, NULL, log_attrs, len + 1);
+	pango_get_log_attrs(normalized, strlen(normalized), -1, NULL, log_attrs, len + 1);
 
 	word = normalized;
 	result = TRUE;

Modified: branches/v2_0_0beta3_1/gaim/src/protocols/msn/nexus.c
===================================================================
--- branches/v2_0_0beta3_1/gaim/src/protocols/msn/nexus.c	2006-08-18 18:47:03 UTC (rev 16838)
+++ branches/v2_0_0beta3_1/gaim/src/protocols/msn/nexus.c	2006-08-18 19:03:28 UTC (rev 16839)
@@ -293,7 +293,16 @@
 
 }
 
+/* this guards against missing hash entries */
+static char *
+nexus_challenge_data_lookup(GHashTable *challenge_data, const char *key)
+{
+	char *entry;
 
+	return (entry = (char *)g_hash_table_lookup(challenge_data, key)) ?
+		entry : "(null)";
+}
+
 void
 login_connect_cb(gpointer data, GaimSslConnection *gsc,
 				 GaimInputCondition cond)
@@ -336,16 +345,16 @@
 		"Host: %s\r\n"
 		"Connection: Keep-Alive\r\n"
 		"Cache-Control: no-cache\r\n",
-		(char *)g_hash_table_lookup(nexus->challenge_data, "lc"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "id"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "tw"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "fs"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "ru"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "lc"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "id"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "tw"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "fs"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "ru"),
 		ctint,
-		(char *)g_hash_table_lookup(nexus->challenge_data, "kpp"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "kv"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "ver"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "tpf"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "kpp"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "kv"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "ver"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "tpf"),
 		nexus->login_host);
 
 	buffer = g_strdup_printf("%s,pwd=XXXXXXXX,%s\r\n", head, tail);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.