diff src/protocols/simple/simple.c @ 12143:cbebda5f019c

[gaim-migrate @ 14444] SF Patch #1360399 from Evan Schoenberg (evands) "I discussed this previously with Mark and he said it'd be fine. This factors out the part of the send_file function which creates a new GaimXfer into a separate prpl function, new_xfer. It's called in each of the existing send_file functions. This is needed so that another client (okay, Adium) can get a new outgoing GaimXfer from a prpl without depending upon the specific ft.c logic of send_file; previously I was adding a duplicate method to each prpl and then calling it directly." I fixed a couple small bugs in this. Otherwise, it looks good, and seems like a reasonable libgaim request. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Sat, 19 Nov 2005 00:26:12 +0000
parents fa742ad8068c
children 2f379ed0c26b
line wrap: on
line diff
--- a/src/protocols/simple/simple.c	Sat Nov 19 00:16:45 2005 +0000
+++ b/src/protocols/simple/simple.c	Sat Nov 19 00:26:12 2005 +0000
@@ -1334,21 +1334,21 @@
 	0,
 	NULL,					/* user_splits */
 	NULL,					/* protocol_options */
-	NO_BUDDY_ICONS,		/* icon_spec */
+	NO_BUDDY_ICONS,			/* icon_spec */
 	simple_list_icon,		/* list_icon */
-	NULL,	/* list_emblems */
+	NULL,					/* list_emblems */
 	NULL,					/* status_text */
 	NULL,					/* tooltip_text */
 	simple_status_types,	/* away_states */
 	NULL,					/* blist_node_menu */
-	NULL,	/* chat_info */
-	NULL,	/* chat_info_defaults */
-	simple_login,		/* login */
-	simple_close,		/* close */
-	simple_im_send,		/* send_im */
+	NULL,					/* chat_info */
+	NULL,					/* chat_info_defaults */
+	simple_login,			/* login */
+	simple_close,			/* close */
+	simple_im_send,			/* send_im */
 	NULL,					/* set_info */
-	simple_typing,					/* send_typing */
-	NULL,		/* get_info */
+	simple_typing,			/* send_typing */
+	NULL,					/* get_info */
 	simple_set_status,		/* set_status */
 	NULL,					/* set_idle */
 	NULL,					/* change_passwd */
@@ -1356,19 +1356,19 @@
 	NULL,					/* add_buddies */
 	simple_remove_buddy,	/* remove_buddy */
 	NULL,					/* remove_buddies */
-	dummy_add_deny,					/* add_permit */
-	dummy_add_deny,					/* add_deny */
-	dummy_add_deny,					/* rem_permit */
-	dummy_add_deny,					/* rem_deny */
-	dummy_permit_deny,					/* set_permit_deny */
-	NULL,		/* join_chat */
+	dummy_add_deny,			/* add_permit */
+	dummy_add_deny,			/* add_deny */
+	dummy_add_deny,			/* rem_permit */
+	dummy_add_deny,			/* rem_deny */
+	dummy_permit_deny,		/* set_permit_deny */
+	NULL,					/* join_chat */
 	NULL,					/* reject_chat */
-	NULL,	/* get_chat_name */
-	NULL,	/* chat_invite */
-	NULL,		/* chat_leave */
+	NULL,					/* get_chat_name */
+	NULL,					/* chat_invite */
+	NULL,					/* chat_leave */
 	NULL,					/* chat_whisper */
-	NULL,		/* chat_send */
-	simple_keep_alive,					/* keepalive */
+	NULL,					/* chat_send */
+	simple_keep_alive,		/* keepalive */
 	NULL,					/* register_user */
 	NULL,					/* get_cb_info */
 	NULL,					/* get_cb_away */
@@ -1381,13 +1381,14 @@
 	NULL,					/* set_buddy_icon */
 	NULL,					/* remove_group */
 	NULL,					/* get_cb_real_name */
-	NULL,	/* set_chat_topic */
+	NULL,					/* set_chat_topic */
 	NULL,					/* find_blist_chat */
-	NULL,	/* roomlist_get_list */
-	NULL,	/* roomlist_cancel */
+	NULL,					/* roomlist_get_list */
+	NULL,					/* roomlist_cancel */
 	NULL,					/* roomlist_expand_category */
 	NULL,					/* can_receive_file */
-	NULL	/* send_file */
+	NULL,					/* send_file */
+	NULL					/* new_xfer */
 };