comparison libpurple/server.c @ 25890:43b721aa4b76

explicit merge of '32d4ce0b6cfc9ccb9a6e7ed661423b9260a0bead' and '0bcc8cd8e68241cf9c13be5b28ced3a4a5d4e488'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:28:34 +0000
parents 94fa7211eb98 75690a3eeee0
children a6e3cb32cdd2
comparison
equal deleted inserted replaced
25889:e2b193decaa5 25890:43b721aa4b76
809 void serv_got_chat_invite(PurpleConnection *gc, const char *name, 809 void serv_got_chat_invite(PurpleConnection *gc, const char *name,
810 const char *who, const char *message, GHashTable *data) 810 const char *who, const char *message, GHashTable *data)
811 { 811 {
812 PurpleAccount *account; 812 PurpleAccount *account;
813 char buf2[BUF_LONG]; 813 char buf2[BUF_LONG];
814 struct chat_invite_data *cid = g_new0(struct chat_invite_data, 1); 814 struct chat_invite_data *cid;
815 int plugin_return; 815 int plugin_return;
816 816
817 account = purple_connection_get_account(gc); 817 account = purple_connection_get_account(gc);
818 if (PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->set_permit_deny == NULL) { 818 if (PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->set_permit_deny == NULL) {
819 /* protocol does not support privacy, handle it ourselves */ 819 /* protocol does not support privacy, handle it ourselves */
822 account, who, name, message, data); 822 account, who, name, message, data);
823 return; 823 return;
824 } 824 }
825 } 825 }
826 826
827 cid = g_new0(struct chat_invite_data, 1);
828
827 plugin_return = GPOINTER_TO_INT(purple_signal_emit_return_1( 829 plugin_return = GPOINTER_TO_INT(purple_signal_emit_return_1(
828 purple_conversations_get_handle(), 830 purple_conversations_get_handle(),
829 "chat-invited", account, who, name, message, data)); 831 "chat-invited", account, who, name, message, data));
830 832
831 cid->gc = gc; 833 cid->gc = gc;