comparison libpurple/protocols/zephyr/zephyr.c @ 24543:a6a6a6c19058

A Warmenhoved patch from rwbarton to avoid showing the default instance name (PERSONAL) in Zephyr chats and to show the instance before the sender name for other instances. Fixes #3007 The functional change is two lines, but I cleaned up some string allocation mess at the same time. I don't use Zephyr, so this may not work. I should be getting access to a test account soon, though.

24542:4777c4681776

		char *send_inst;
		PurpleConversation *gconv1;
		PurpleConvChat *gcc;
		char *ptr = (char *) notice.z_message + (strlen(notice.z_message) + 1);
		int len; 
		char *sendertmp = g_strdup_printf("%s", zephyr->username);
		int signature_length = strlen(notice.z_message);
		int message_has_no_body = 0;
		PurpleMessageFlags flags = 0;
		gchar *tmpescape;

			buf3 = zephyr_recv_convert(gc, buf2);
			g_free(buf2);
			g_free(tmpescape);
		}

		if (!g_ascii_strcasecmp(notice.z_class, "MESSAGE") && !g_ascii_strcasecmp(notice.z_class_inst, "PERSONAL") 
		    && !g_ascii_strcasecmp(notice.z_recipient,zephyr->username)) {
			gchar* stripped_sender;
			if (!g_ascii_strcasecmp(notice.z_message, "Automated reply:"))
				flags |= PURPLE_MESSAGE_AUTO_RESP;
			stripped_sender = zephyr_strip_local_realm(zephyr,notice.z_sender);
			
			if (!g_ascii_strcasecmp(notice.z_opcode,"PING"))
				serv_got_typing(gc,stripped_sender,ZEPHYR_TYPING_RECV_TIMEOUT, PURPLE_TYPING);
			else
				serv_got_im(gc, stripped_sender, buf3, flags, time(NULL));

			g_free(stripped_sender);
		} else {
			zephyr_triple *zt1, *zt2;
			gchar *send_inst_utf8;
			zephyr_account *zephyr = gc->proto_data;
			zt1 = new_triple(gc->proto_data,notice.z_class, notice.z_class_inst, notice.z_recipient);

			if (!zt2->open) {
				zt2->open = TRUE;
				serv_got_joined_chat(gc, zt2->id, zt2->name);
				zephyr_chat_set_topic(gc,zt2->id,notice.z_class_inst);
			}
			g_free(sendertmp); /* fix memory leak? */
			/* If the person is in the default Realm, then strip the 
			   Realm from the sender field */
			sendertmp = zephyr_strip_local_realm(zephyr,notice.z_sender);
			send_inst = g_strdup_printf("%s %s",sendertmp,notice.z_class_inst);					
			send_inst_utf8 = zephyr_recv_convert(gc,send_inst);
			if (!send_inst_utf8) {
				purple_debug_error("zephyr","send_inst %s became null\n", send_inst);
				send_inst_utf8 = "malformed instance";
			}

			gconv1 = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
														 zt2->name, gc->account);
			gcc = purple_conversation_get_chat_data(gconv1);

#endif
				purple_conv_chat_add_user(gcc, sendertmp, ipaddr, PURPLE_CBFLAGS_NONE, TRUE);
			}
			g_free(sendertmp);
			serv_got_chat_in(gc, zt2->id, send_inst_utf8, 0, buf3, time(NULL));
			g_free(send_inst);
			g_free(send_inst_utf8);
				
			free_triple(zt1);
		}
		g_free(buf3);
		
	}
}

static int  free_parse_tree(parse_tree* tree) {
	if (!tree) {

24543:a6a6a6c19058

		char *send_inst;
		PurpleConversation *gconv1;
		PurpleConvChat *gcc;
		char *ptr = (char *) notice.z_message + (strlen(notice.z_message) + 1);
		int len; 
		char *stripped_sender;
		int signature_length = strlen(notice.z_message);
		int message_has_no_body = 0;
		PurpleMessageFlags flags = 0;
		gchar *tmpescape;

			buf3 = zephyr_recv_convert(gc, buf2);
			g_free(buf2);
			g_free(tmpescape);
		}

		stripped_sender = zephyr_strip_local_realm(zephyr,notice.z_sender);

		if (!g_ascii_strcasecmp(notice.z_class, "MESSAGE") && !g_ascii_strcasecmp(notice.z_class_inst, "PERSONAL") 
		    && !g_ascii_strcasecmp(notice.z_recipient,zephyr->username)) {
			if (!g_ascii_strcasecmp(notice.z_message, "Automated reply:"))
				flags |= PURPLE_MESSAGE_AUTO_RESP;
			
			if (!g_ascii_strcasecmp(notice.z_opcode,"PING"))
				serv_got_typing(gc,stripped_sender,ZEPHYR_TYPING_RECV_TIMEOUT, PURPLE_TYPING);
			else
				serv_got_im(gc, stripped_sender, buf3, flags, time(NULL));

		} else {
			zephyr_triple *zt1, *zt2;
			gchar *send_inst_utf8;
			zephyr_account *zephyr = gc->proto_data;
			zt1 = new_triple(gc->proto_data,notice.z_class, notice.z_class_inst, notice.z_recipient);

			if (!zt2->open) {
				zt2->open = TRUE;
				serv_got_joined_chat(gc, zt2->id, zt2->name);
				zephyr_chat_set_topic(gc,zt2->id,notice.z_class_inst);
			}

			if (!g_ascii_strcasecmp(notice.z_class_inst,"PERSONAL"))
				send_inst_utf8 = g_strdup(stripped_sender);
			else {
				send_inst = g_strdup_printf("[%s] %s",notice.z_class_inst,stripped_sender);
				send_inst_utf8 = zephyr_recv_convert(gc,send_inst);
				g_free(send_inst);
				if (!send_inst_utf8) {
					purple_debug_error("zephyr","Failed to convert instance for sender %s.\n", stripped_sender);
					send_inst_utf8 = g_strdup(stripped_sender);
				}
			}

			gconv1 = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
														 zt2->name, gc->account);
			gcc = purple_conversation_get_chat_data(gconv1);

#endif
				purple_conv_chat_add_user(gcc, sendertmp, ipaddr, PURPLE_CBFLAGS_NONE, TRUE);
			}
			g_free(sendertmp);
			serv_got_chat_in(gc, zt2->id, send_inst_utf8, 0, buf3, time(NULL));
			g_free(send_inst_utf8);

			free_triple(zt1);
		}
		g_free(stripped_sender);
		g_free(buf3);
	}
}

static int  free_parse_tree(parse_tree* tree) {
	if (!tree) {