Mercurial > pidgin
view src/protocols/msn/table.c @ 14089:10e8eb6a4910
[gaim-migrate @ 16712]
Pretty large commit here. Basically I got sick of having to verify
that gc is still valid on all the callback functions for
gaim_proxy_connect(). The fix for this for gaim_proxy_connect() to
return something that allows the connection attempt to be canceled.
It's not quite there yet, but this is a good first step. I changed
gaim_proxy_connect() to return a reference to a new
GaimProxyConnectInfo (this used to be called PHB). Eventually this
can be passed to a function that'll cancel the connection attempt.
I also decided to add an error_cb instead of using connect_cb and
passing a file descriptor of -1. And proxy.c will also pass an
error message to callers which should explain the reason that the
connection attempt failed.
Oh, and proxy.c now never calls gaim_connection_error()
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 12 Aug 2006 10:12:43 +0000 |
parents | 2e01c503aa4f |
children | bc30c6270d9f |
line wrap: on
line source
/** * @file table.c MSN helper structure * * gaim * * Gaim is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "msn.h" #include "table.h" static void null_cmd_cb(MsnCmdProc *cmdproc, MsnCommand *cmd) { } static void null_error_cb(MsnCmdProc *cmdproc, MsnTransaction *trans, int error) { } MsnTable * msn_table_new() { MsnTable *table; table = g_new0(MsnTable, 1); table->cmds = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); table->msgs = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); table->errors = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); table->async = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); table->fallback = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); return table; } void msn_table_destroy(MsnTable *table) { g_return_if_fail(table != NULL); g_hash_table_destroy(table->cmds); g_hash_table_destroy(table->msgs); g_hash_table_destroy(table->errors); g_hash_table_destroy(table->async); g_hash_table_destroy(table->fallback); g_free(table); } void msn_table_add_cmd(MsnTable *table, char *command, char *answer, MsnTransCb cb) { GHashTable *cbs; g_return_if_fail(table != NULL); g_return_if_fail(answer != NULL); cbs = NULL; if (command == NULL) { cbs = table->async; } else if (strcmp(command, "fallback") == 0) { cbs = table->fallback; } else { cbs = g_hash_table_lookup(table->cmds, command); if (cbs == NULL) { cbs = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); g_hash_table_insert(table->cmds, command, cbs); } } if (cb == NULL) cb = null_cmd_cb; g_hash_table_insert(cbs, answer, cb); } void msn_table_add_error(MsnTable *table, char *answer, MsnErrorCb cb) { g_return_if_fail(table != NULL); g_return_if_fail(answer != NULL); if (cb == NULL) cb = null_error_cb; g_hash_table_insert(table->errors, answer, cb); } void msn_table_add_msg_type(MsnTable *table, char *type, MsnMsgTypeCb cb) { g_return_if_fail(table != NULL); g_return_if_fail(type != NULL); g_return_if_fail(cb != NULL); #if 0 if (cb == NULL) cb = null_msg_cb; #endif g_hash_table_insert(table->msgs, type, cb); }