Mercurial > pidgin

changeset 11498:ea52fefd3602

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13743] Some more fixes. Or maybe just warning fixes. It compiles now. Probably doesn't work correctly. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 10 Sep 2005 21:10:39 +0000
parents 8d0a2b6c192b
children 6f9fc83ee25c
files src/protocols/bonjour/dns_sd.c src/protocols/bonjour/jabber.c
diffstat 2 files changed, 10 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/bonjour/dns_sd.c	Sat Sep 10 21:01:45 2005 +0000
+++ b/src/protocols/bonjour/dns_sd.c	Sat Sep 10 21:10:39 2005 +0000
@@ -89,8 +89,8 @@
 	gint address_length = 16;
 	gchar* ip = NULL;
 	sw_text_record_iterator iterator;
-	sw_int8 key[SW_TEXT_RECORD_MAX_LEN];
-	sw_int8 value[SW_TEXT_RECORD_MAX_LEN];
+	char key[SW_TEXT_RECORD_MAX_LEN];
+	char value[SW_TEXT_RECORD_MAX_LEN];
 	sw_uint32 value_length;
 
 	sw_discovery_cancel(discovery, oid);
--- a/src/protocols/bonjour/jabber.c	Sat Sep 10 21:01:45 2005 +0000
+++ b/src/protocols/bonjour/jabber.c	Sat Sep 10 21:10:39 2005 +0000
@@ -127,12 +127,12 @@
 	xmlnode* html_node = NULL;
 	gboolean isHTML = FALSE;
 	xmlnode* html_body_node = NULL;
-	char* ichat_balloon_color = NULL;
-	char* ichat_text_color = NULL;
+	const char* ichat_balloon_color = NULL;
+	const char* ichat_text_color = NULL;
 	xmlnode* html_body_font_node = NULL;
-	char* font_face = NULL;
-	char* font_size = NULL;
-	char* font_color = NULL;
+	const char* font_face = NULL;
+	const char* font_size = NULL;
+	const char* font_color = NULL;
 	char* html_body = NULL;
 	xmlnode* events_node = NULL;
 	gboolean composing_event = FALSE;
@@ -283,7 +283,6 @@
 	char* closed_conv_message;
 	BonjourBuddy* bb = (BonjourBuddy*)gb->proto_data;
 	gboolean closed_conversation = FALSE;
-	char* error_message;
 
 	// Read the data from the socket
 	if ((message_length = _read_data(socket, &message)) == -1) {
@@ -336,7 +335,7 @@
 		}
 		
 		// Inform the user that the conversation has been closed
-		conversation = gaim_find_conversation_with_account(gb->name, account);
+		conversation = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, gb->name, account);
 		closed_conv_message = g_strconcat(gb->name, " has closed the conversation.", NULL);
 		gaim_conversation_write(conversation, NULL, closed_conv_message, GAIM_MESSAGE_SYSTEM, time(NULL));
 	} else {
@@ -520,7 +519,7 @@
 				gaim_debug_error("bonjour", "Unable to start a conversation\n");
 				perror("send");
 				conv_message = g_strdup("Unable to send the message, the conversation couldn't be started.");
-				conversation = gaim_find_conversation_with_account(bb->name, data->account);
+				conversation = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, bb->name, data->account);
 				gaim_conversation_write(conversation, NULL, conv_message, GAIM_MESSAGE_SYSTEM, time(NULL));
 				close(bb->conversation->socket);
 				gaim_input_remove(bb->conversation->watcher_id);
@@ -539,7 +538,7 @@
 	if (_send_data(bb->conversation->socket, message) == -1) {
 		gaim_debug_error("bonjour", "Unable to send the message\n");
 		conv_message = g_strdup("Unable to send the message.");
-		conversation = gaim_find_conversation_with_account(bb->name, data->account);
+		conversation = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, bb->name, data->account);
 		gaim_conversation_write(conversation, NULL, conv_message, GAIM_MESSAGE_SYSTEM, time(NULL));
 	}
 }