pidgin.yaz: libpurple/protocols/msn/msn.c comparison

comparison libpurple/protocols/msn/msn.c @ 32692:0f94ec89f0bc

merged from im.pidgin.pidgin

author	Yoshiki Yazawa <yaz@honeyplanet.jp>
date	Mon, 26 Sep 2011 14:57:21 +0900
parents	ac6353ffa129 904686722499
children	4a34689eeb33

comparison

equal deleted inserted replaced

-:55e678325bda
+:0f94ec89f0bc
 	MsnMessage *msg;
 	MsnSession *session;
 	MsnSwitchBoard *swboard;
 	msg = msn_message_new_nudge();
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	swboard = msn_session_get_swboard(session, username, MSN_SB_FLAG_IM);
 	msn_switchboard_send_msg(swboard, msg, TRUE);
 	msn_message_unref(msg);
 {
 	MsnCmdProc *cmdproc;
 	MsnSession *session;
 	MsnTransaction *trans;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	cmdproc = session->notification->cmdproc;
 	if (entry == NULL || *entry == '\0')
 	{
 		trans = msn_transaction_new(cmdproc, "PRP", "%s", type);
 	MsnUser *user;
 	char *payload = NULL;
 	const char *mobile_number = NULL;
 	gsize payload_len;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	cmdproc = session->notification->cmdproc;
 	page = msn_page_new();
 	msn_page_set_body(page, entry);
 {
 	PurpleConnection *gc;
 	MsnSession *session;
 	gc = (PurpleConnection *) action->context;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	purple_request_input(gc, NULL, _("Set your home phone number."), NULL,
 					   msn_user_get_home_phone(session->user), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(msn_set_home_phone_cb),
 					   _("Cancel"), NULL,
 {
 	PurpleConnection *gc;
 	MsnSession *session;
 	gc = (PurpleConnection *) action->context;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	purple_request_input(gc, NULL, _("Set your work phone number."), NULL,
 					   msn_user_get_work_phone(session->user), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(msn_set_work_phone_cb),
 					   _("Cancel"), NULL,
 {
 	PurpleConnection *gc;
 	MsnSession *session;
 	gc = (PurpleConnection *) action->context;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	purple_request_input(gc, NULL, _("Set your mobile phone number."), NULL,
 					   msn_user_get_mobile_phone(session->user), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(msn_set_mobile_phone_cb),
 					   _("Cancel"), NULL,
 {
 	PurpleConnection *pc = (PurpleConnection *) action->context;
 	MsnSession *session;
 	char *title;
-	session = pc->proto_data;
+	session = purple_connection_get_protocol_data(pc);
 	title = g_strdup_printf(_("Blocked Text for %s"), session->account->username);
 	if (session->blocked_text == NULL) {
 		purple_notify_formatted(pc, title, title, NULL, _("No text is blocked for this account."), NULL, NULL);
 	} else {
 {
 	PurpleConnection *gc;
 	MsnSession *session;
 	gc = (PurpleConnection *) action->context;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	if (!session->passport_info.email_enabled) {
 		purple_notify_error(gc, NULL,
 						  _("This account does not have email enabled."), NULL);
 		return;
 	MsnSession *session;
 	MsnCmdProc *cmdproc;
 	MsnTransaction *trans;
 	account = purple_connection_get_account(gc);
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	cmdproc = session->notification->cmdproc;
 	if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL ||
 	    account->perm_deny == PURPLE_PRIVACY_DENY_USERS)
 		trans = msn_transaction_new(cmdproc, "BLP", "%s", "AL");
 	buddy = (PurpleBuddy *) node;
 	account = purple_buddy_get_account(buddy);
 	gc = purple_account_get_connection(account);
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	swboard = msn_switchboard_new(session);
 	msn_switchboard_request(swboard);
 	msn_switchboard_request_add_user(swboard, purple_buddy_get_name(buddy));
 msn_new_xfer(PurpleConnection *gc, const char *who)
 {
 	MsnSession *session;
 	PurpleXfer *xfer;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	xfer = purple_xfer_new(gc->account, PURPLE_XFER_SEND, who);
 	g_return_val_if_fail(xfer != NULL, NULL);
 	normal = g_strdup(msn_normalize(account, purple_account_get_username(account)));
 	ret = strcmp(normal, msn_normalize(account, who));
 	g_free(normal);
 	if (ret) {
-		MsnSession *session = gc->proto_data;
+		MsnSession *session = purple_connection_get_protocol_data(gc);
 		if (session) {
 			MsnUser *user = msn_userlist_find_user(session->userlist, who);
 			if (user) {
 				/* Include these too: MSN_CAP_MOBILE_ON|MSN_CAP_WEB_WATCH ? */
 				if ((user->clientid & MSN_CAP_VIA_WEBIM) ||
 	MsnSession *session;
 	GList *m = NULL;
 	PurplePluginAction *act;
 	gc = (PurpleConnection *) context;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	act = purple_plugin_action_new(_("Set Friendly Name..."),
 								 msn_show_set_friendly_name);
 	m = g_list_append(m, act);
 	m = g_list_append(m, NULL);
 		host = purple_account_get_string(account, "server", MSN_SERVER);
 	port = purple_account_get_int(account, "port", MSN_PORT);
 	session = msn_session_new(account);
-	gc->proto_data = session;
+	purple_connection_set_protocol_data(gc, session);
 	gc->flags |= PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_FORMATTING_WBFO | PURPLE_CONNECTION_NO_BGCOLOR |
 		PURPLE_CONNECTION_NO_FONTSIZE | PURPLE_CONNECTION_NO_URLDESC | PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY;
 	msn_session_set_login_step(session, MSN_LOGIN_STEP_START);
 static void
 msn_close(PurpleConnection *gc)
 {
 	MsnSession *session;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	g_return_if_fail(session != NULL);
 	msn_session_destroy(session);
-	gc->proto_data = NULL;
+	purple_connection_set_protocol_data(gc, NULL);
 }
 static gboolean
 msn_send_me_im(gpointer data)
 {
 }
 static void msn_emoticon_destroy(MsnEmoticon *emoticon)
 {
 	if (emoticon->obj)
-		msn_object_destroy(emoticon->obj);
+		msn_object_destroy(emoticon->obj, FALSE);
 	g_free(emoticon->smile);
 	g_free(emoticon);
 }
 static GSList* msn_msg_grab_emoticons(const char *msg, const char *username)
 	purple_debug_info("msn", "send IM {%s} to %s\n", message, who);
 	account = purple_connection_get_account(gc);
 	username = purple_account_get_username(account);
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	swboard = msn_session_find_swboard(session, who);
 	if (!strncmp("tel:+", who, 5)) {
 		char *text = purple_markup_strip_html(message);
 		send_to_mobile(gc, who, text);
 	MsnSession *session;
 	MsnSwitchBoard *swboard;
 	MsnMessage *msg;
 	account = purple_connection_get_account(gc);
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	/*
 	 * TODO: I feel like this should be "if (state != PURPLE_TYPING)"
 	 *       but this is how it was before, and I don't want to break
 	 *       anything. --KingAnt
 	gc = purple_account_get_connection(account);
 	if (gc != NULL)
 	{
-		session = gc->proto_data;
+		session = purple_connection_get_protocol_data(gc);
 		msn_change_status(session);
 	}
 }
 static void
 msn_set_idle(PurpleConnection *gc, int idle)
 {
 	MsnSession *session;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	msn_change_status(session);
 }
 /*
 msn_rem_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
 	MsnSession *session;
 	MsnUserList *userlist;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	userlist = session->userlist;
 	if (!session->logged_in)
 		return;
 {
 	MsnSession *session;
 	MsnUserList *userlist;
 	MsnUser *user;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	userlist = session->userlist;
 	user = msn_userlist_find_user(userlist, who);
 	if (!session->logged_in)
 		return;
 {
 	MsnSession *session;
 	MsnUserList *userlist;
 	MsnUser *user;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	userlist = session->userlist;
 	user = msn_userlist_find_user(userlist, who);
 	if (!session->logged_in)
 		return;
 {
 	MsnSession *session;
 	MsnUserList *userlist;
 	MsnUser *user;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	userlist = session->userlist;
 	if (!session->logged_in)
 		return;
 {
 	MsnSession *session;
 	MsnUserList *userlist;
 	MsnUser *user;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	userlist = session->userlist;
 	if (!session->logged_in)
 		return;
 				const char *who)
 {
 	MsnSession *session;
 	MsnSwitchBoard *swboard;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	swboard = msn_session_find_swboard_with_id(session, id);
 	if (swboard == NULL)
 	{
 {
 	MsnSession *session;
 	MsnSwitchBoard *swboard;
 	PurpleConversation *conv;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	swboard = msn_session_find_swboard_with_id(session, id);
 	/* if swboard is NULL we were the only person left anyway */
 	if (swboard == NULL)
 	MsnEmoticon *smile;
 	GSList *smileys;
 	GString *emoticons = NULL;
 	account = purple_connection_get_account(gc);
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	username = purple_account_get_username(account);
 	swboard = msn_session_find_swboard_with_id(session, id);
 	if (swboard == NULL)
 		return -EINVAL;
 msn_keepalive(PurpleConnection *gc)
 {
 	MsnSession *session;
 	MsnTransaction *trans;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	if (!session->http_method)
 	{
 		MsnCmdProc *cmdproc;
 static void msn_alias_buddy(PurpleConnection *pc, const char *name, const char *alias)
 {
 	MsnSession *session;
-	session = pc->proto_data;
+	session = purple_connection_get_protocol_data(pc);
 	msn_update_contact(session, name, MSN_UPDATE_ALIAS, alias);
 }
 static void
 				const char *old_group_name, const char *new_group_name)
 {
 	MsnSession *session;
 	MsnUserList *userlist;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	userlist = session->userlist;
 	msn_userlist_move_buddy(userlist, who, old_group_name, new_group_name);
 }
 				 PurpleGroup *group, GList *moved_buddies)
 {
 	MsnSession *session;
 	const char *gname;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	g_return_if_fail(session != NULL);
 	g_return_if_fail(session->userlist != NULL);
 	gname = purple_group_get_name(group);
 {
 	MsnSession *session;
 	MsnSwitchBoard *swboard;
 	PurpleConversation *conv;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	swboard = msn_session_find_swboard(session, who);
 	/*
 	 * Don't perform an assertion here. If swboard is NULL, then the
 msn_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
 {
 	MsnSession *session;
 	MsnUser *user;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	user = session->user;
 	msn_user_set_buddy_icon(user, img);
 	msn_change_status(session);
 msn_remove_group(PurpleConnection *gc, PurpleGroup *group)
 {
 	MsnSession *session;
 	const char *gname;
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(gc);
 	gname = purple_group_get_name(group);
 	purple_debug_info("msn", "Remove group %s\n", gname);
 	/*we can't delete the default group*/
 	if(!strcmp(gname, MSN_INDIVIDUALS_GROUP_NAME)||
 	info2_data->photo_url_text = photo_url_text;
 	/* Try to put the photo in there too, if there's one */
 	if (photo_url_text)
 	{
-		url_data = purple_util_fetch_url_len(photo_url_text, FALSE, NULL, FALSE,
+		url_data = purple_util_fetch_url(photo_url_text, FALSE, NULL, FALSE,
 		                                     MAX_HTTP_BUDDYICON_BYTES,
 		                                     msn_got_photo, info2_data);
 		session->url_datas = g_slist_prepend(session->url_datas, url_data);
 	}
 	else
 	url = g_strdup_printf("%s%s", PROFILE_URL, name);
 	url_data = purple_util_fetch_url(url, FALSE,
 	                                 "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
-	                                 TRUE, msn_got_info, data);
+	                                 TRUE, -1, msn_got_info, data);
 	session->url_datas = g_slist_prepend(session->url_datas, url_data);
 	g_free(url);
 }
 }
 static PurplePluginProtocolInfo prpl_info =
 {
+	sizeof(PurplePluginProtocolInfo),	/* struct_size */
 	OPT_PROTO_MAIL_CHECK|OPT_PROTO_INVITE_MESSAGE,
 	NULL,                               /* user_splits */
 	NULL,                               /* protocol_options */
 	{"png,gif", 0, 0, 96, 96, 0, PURPLE_ICON_SCALE_SEND},   /* icon_spec */
 	msn_list_icon,                      /* list_icon */
 	msn_send_typing,                    /* send_typing */
 	msn_get_info,                       /* get_info */
 	msn_set_status,                     /* set_away */
 	msn_set_idle,                       /* set_idle */
 	NULL,                               /* change_passwd */
-	NULL,                               /* add_buddy */
+	msn_add_buddy,                      /* add_buddy */
 	NULL,                               /* add_buddies */
 	msn_rem_buddy,                      /* remove_buddy */
 	NULL,                               /* remove_buddies */
 	msn_add_permit,                     /* add_permit */
 	msn_add_deny,                       /* add_deny */
 	NULL,                               /* chat_whisper */
 	msn_chat_send,                      /* chat_send */
 	msn_keepalive,                      /* keepalive */
 	NULL,                               /* register_user */
 	NULL,                               /* get_cb_info */
-	NULL,                               /* get_cb_away */
 	msn_alias_buddy,                    /* alias_buddy */
 	msn_group_buddy,                    /* group_buddy */
 	msn_rename_group,                   /* rename_group */
 	NULL,                               /* buddy_free */
 	msn_convo_closed,                   /* convo_closed */
 	NULL,                               /* send_raw */
 	NULL,                               /* roomlist_room_serialize */
 	NULL,                               /* unregister_user */
 	msn_send_attention,                 /* send_attention */
 	msn_attention_types,                /* attention_types */
-	sizeof(PurplePluginProtocolInfo),	/* struct_size */
 	msn_get_account_text_table,         /* get_account_text_table */
 	NULL,                               /* initiate_media */
 	NULL,                               /* get_media_caps */
 	NULL,                               /* get_moods */
 	msn_set_public_alias,               /* set_public_alias */
-	msn_get_public_alias,               /* get_public_alias */
+	msn_get_public_alias                /* get_public_alias */
-	msn_add_buddy,                      /* add_buddy_with_invite */
-	NULL                                /* add_buddies_with_invite */
 };
 static PurplePluginInfo info =
 {
 	PURPLE_PLUGIN_MAGIC,

Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/msn.c @ 32692:0f94ec89f0bc