[Gaim-commits] SF.net SVN: gaim: [16757] branches/v2_0_0/src

[<dat...@us...>]

Revision: 16757
Author:   datallah
Date:     2006-08-14 05:58:04 -0700 (Mon, 14 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16757&view=rev

Log Message:
-----------
Merge from trunk:

16740 - Fix for CID 97
16710 - Fix CID 101.  Also fix the behavior of adding a group to a fields list so that it doesn't matter if you add the group to a fields list before you add fields to the group or not.
16709 - Deal with inability to create key pair. (CID 139)
16708 - Fix CID 122 - Avoid an assert when the conversation has been closed before a custom emoticon finishes loading

Modified Paths:
--------------
    branches/v2_0_0/plugins/log_reader.c
    branches/v2_0_0/src/protocols/msn/slp.c
    branches/v2_0_0/src/protocols/silc/util.c
    branches/v2_0_0/src/request.c
Modified: branches/v2_0_0/plugins/log_reader.c
===================================================================
--- branches/v2_0_0/plugins/log_reader.c	2006-08-14 08:36:25 UTC (rev 16756)
+++ branches/v2_0_0/plugins/log_reader.c	2006-08-14 12:58:04 UTC (rev 16757)
@@ -857,11 +857,10 @@
 				 * friendly name or alias. For this test, "match" is defined as:
 				 * ^(friendly_name|alias)([^a-zA-Z0-9].*)?$
 				 */
-				from_name_matches = from_name != NULL && (
-				                     (gaim_str_has_prefix(from_name, friendly_name) &&
+				from_name_matches = (gaim_str_has_prefix(from_name, friendly_name) &&
 				                      !isalnum(*(from_name + friendly_name_length))) ||
 				                     (gaim_str_has_prefix(from_name, log->account->alias) &&
-				                      !isalnum(*(from_name + alias_length))));
+				                      !isalnum(*(from_name + alias_length)));
 
 				to_name_matches = to_name != NULL && (
 				                   (gaim_str_has_prefix(to_name, friendly_name) &&
@@ -930,10 +929,11 @@
 									!isalnum(*(from_name +
 									friendly_name_length)));
 
-							to_name_matches = (gaim_str_has_prefix(
+							to_name_matches = to_name && (
+									(gaim_str_has_prefix(
 									to_name, buddy->server_alias) &&
 									!isalnum(*(to_name +
-									friendly_name_length)));
+									friendly_name_length))));
 
 							if (from_name_matches) {
 								if (!to_name_matches) {

Modified: branches/v2_0_0/src/protocols/msn/slp.c
===================================================================
--- branches/v2_0_0/src/protocols/msn/slp.c	2006-08-14 08:36:25 UTC (rev 16756)
+++ branches/v2_0_0/src/protocols/msn/slp.c	2006-08-14 12:58:04 UTC (rev 16757)
@@ -768,14 +768,15 @@
 	gc = slpcall->slplink->session->account->gc;
 	who = slpcall->slplink->remote_user;
 
-	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, who, gc->account);
+	if ((conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, who, gc->account))) {
 
-	/* FIXME: it would be better if we wrote the data as we received it
-	          instead of all at once, calling write multiple times and
-	          close once at the very end
-	*/
-	gaim_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
-	gaim_conv_custom_smiley_close(conv, slpcall->data_info );
+		/* FIXME: it would be better if we wrote the data as we received it
+		          instead of all at once, calling write multiple times and
+		          close once at the very end
+		*/
+		gaim_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
+		gaim_conv_custom_smiley_close(conv, slpcall->data_info);
+	}
 #ifdef MSN_DEBUG_UD
 	gaim_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
 #endif

Modified: branches/v2_0_0/src/protocols/silc/util.c
===================================================================
--- branches/v2_0_0/src/protocols/silc/util.c	2006-08-14 08:36:25 UTC (rev 16756)
+++ branches/v2_0_0/src/protocols/silc/util.c	2006-08-14 12:58:04 UTC (rev 16757)
@@ -205,12 +205,20 @@
 		/* If file doesn't exist */
 		if (errno == ENOENT) {
 			gaim_connection_update_progress(gc, _("Creating SILC key pair..."), 1, 5);
-			silc_create_key_pair(SILCGAIM_DEF_PKCS,
+			if (!silc_create_key_pair(SILCGAIM_DEF_PKCS,
 					     SILCGAIM_DEF_PKCS_LEN,
 					     file_public_key, file_private_key, NULL,
 					     (gc->password == NULL) ? "" : gc->password,
-						 NULL, NULL, NULL, FALSE);
-			g_stat(file_public_key, &st);
+						 NULL, NULL, NULL, FALSE)) {
+				gaim_debug_error("silc", "Couldn't create key pair\n");
+				return FALSE;
+			}
+
+			if ((g_stat(file_public_key, &st)) == -1) {
+				gaim_debug_error("silc", "Couldn't stat '%s' public key, error: %s\n",
+					file_public_key, strerror(errno));
+				return FALSE;
+			}
 		} else {
 			gaim_debug_error("silc", "Couldn't stat '%s' public key, error: %s\n",
 							 file_public_key, strerror(errno));

Modified: branches/v2_0_0/src/request.c
===================================================================
--- branches/v2_0_0/src/request.c	2006-08-14 08:36:25 UTC (rev 16756)
+++ branches/v2_0_0/src/request.c	2006-08-14 12:58:04 UTC (rev 16757)
@@ -84,7 +84,13 @@
 		field = l->data;
 
 		g_hash_table_insert(fields->fields,
-							g_strdup(gaim_request_field_get_id(field)), field);
+			g_strdup(gaim_request_field_get_id(field)), field);
+
+		if (gaim_request_field_is_required(field)) {
+			fields->required_fields =
+				g_list_append(fields->required_fields, field);
+		}
+
 	}
 }
 
@@ -280,15 +286,16 @@
 	{
 		g_hash_table_insert(group->fields_list->fields,
 							g_strdup(gaim_request_field_get_id(field)), field);
+
+		if (gaim_request_field_is_required(field))
+		{
+			group->fields_list->required_fields =
+				g_list_append(group->fields_list->required_fields, field);
+		}
 	}
 
 	field->group = group;
 
-	if (gaim_request_field_is_required(field))
-	{
-		group->fields_list->required_fields =
-			g_list_append(group->fields_list->required_fields, field);
-	}
 }
 
 const char *


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