Mercurial > pidgin
view src/sslconn.c @ 7450:685736e14aac
[gaim-migrate @ 8061]
from bug #836143
-----------------------------------------------------------------
Date: 2003-11-06 17:19
Sender: zuperdee
Logged In: YES
user_id=347499
Alright folks, I HAVE A FIX!!!! I repeat, I HAVE A FIX!!!!!!!!!
Basically, this is what was wrong: the
account_win_destroy_cb function was failing to destroy the
window when the "window delete" event was happening.
I
reviewed the code, and it appears there are only 2 places
where that function is called, and in BOTH cases,
gtk_widget_destroy(dialog->window) was called before calling
account_win_destroy_cb. That's ugly!!!! So, my patch
rearranges things so gtk_widget_destroy is called at the
beginning of account_win_destroy_cb. That way, it *DOES*
destroy the window as it is supposed to, and it removes a
couple unnecessary lines of code. Woohoo!!!!!!!!!
I've tested it here on my own system, and it appears to
work, but I'd appreciate it if someone else could verify my
fix before it is checked in (should it be accepted).
The fix is in Patch #837542 here on Sourceforge. :-)
Yours Truly,
Daniel
(Yes, I am excited!!! I just fixed a problem in Gaim that
has been bugging me for some time. I *HATE* instability...
Call me the Segfault Avenger. ;-))
---------------------------------------------------------------
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Thu, 06 Nov 2003 23:29:40 +0000 |
parents | ef0684dfdf74 |
children | 6ee2fe9bb74e |
line wrap: on
line source
/** * @file sslconn.c SSL API * @ingroup core * * gaim * * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org> * * 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 "internal.h" #include "debug.h" #include "sslconn.h" static gboolean _ssl_initialized = FALSE; static GaimSslOps *_ssl_ops = NULL; static gboolean ssl_init(void) { GaimPlugin *plugin; GaimSslOps *ops = gaim_ssl_get_ops(); gboolean success = FALSE; if (_ssl_initialized) return FALSE; plugin = gaim_plugins_find_with_id("core-ssl"); if (plugin != NULL && !gaim_plugin_is_loaded(plugin)) gaim_plugin_load(plugin); if (ops != NULL && ops->init != NULL) success = ops->init(); _ssl_initialized = success; return success; } gboolean gaim_ssl_is_supported(void) { #ifdef HAVE_SSL ssl_init(); return (gaim_ssl_get_ops() != NULL); #else return FALSE; #endif } GaimSslConnection * gaim_ssl_connect(GaimAccount *account, const char *host, int port, GaimSslInputFunction func, GaimSslErrorFunction error_func, void *data) { GaimSslConnection *gsc; GaimSslOps *ops; int i; g_return_val_if_fail(host != NULL, NULL); g_return_val_if_fail(port != 0 && port != -1, NULL); g_return_val_if_fail(func != NULL, NULL); g_return_val_if_fail(gaim_ssl_is_supported(), NULL); ops = gaim_ssl_get_ops(); g_return_val_if_fail(ops != NULL, NULL); g_return_val_if_fail(ops->connect_cb != NULL, NULL); if (!_ssl_initialized) { if (!ssl_init()) return NULL; } gsc = g_new0(GaimSslConnection, 1); gsc->host = g_strdup(host); gsc->port = port; gsc->connect_cb_data = data; gsc->connect_cb = func; gsc->error_cb = error_func; i = gaim_proxy_connect(account, host, port, ops->connect_cb, gsc); if (i < 0) { g_free(gsc->host); g_free(gsc); return NULL; } return (GaimSslConnection *)gsc; } static void recv_cb(gpointer data, gint source, GaimInputCondition cond) { GaimSslConnection *gsc = data; gsc->recv_cb(gsc->recv_cb_data, gsc, cond); } void gaim_ssl_input_add(GaimSslConnection *gsc, GaimSslInputFunction func, void *data) { GaimSslOps *ops; g_return_if_fail(func != NULL); g_return_if_fail(gaim_ssl_is_supported()); ops = gaim_ssl_get_ops(); gsc->recv_cb_data = data; gsc->recv_cb = func; gsc->inpa = gaim_input_add(gsc->fd, GAIM_INPUT_READ, recv_cb, gsc); } GaimSslConnection * gaim_ssl_connect_fd(GaimAccount *account, int fd, GaimSslInputFunction func, GaimSslErrorFunction error_func, void *data) { GaimSslConnection *gsc; GaimSslOps *ops; g_return_val_if_fail(fd > 0, NULL); g_return_val_if_fail(func != NULL, NULL); g_return_val_if_fail(gaim_ssl_is_supported(), NULL); ops = gaim_ssl_get_ops(); g_return_val_if_fail(ops != NULL, NULL); g_return_val_if_fail(ops->connect_cb != NULL, NULL); if (!_ssl_initialized) { if (!ssl_init()) return NULL; } gsc = g_new0(GaimSslConnection, 1); gsc->connect_cb_data = data; gsc->connect_cb = func; gsc->error_cb = error_func; ops->connect_cb(gsc, fd, GAIM_INPUT_READ); return (GaimSslConnection *)gsc; } void gaim_ssl_close(GaimSslConnection *gsc) { GaimSslOps *ops; g_return_if_fail(gsc != NULL); ops = gaim_ssl_get_ops(); if (gsc->inpa) gaim_input_remove(gsc->inpa); if (ops != NULL && ops->close != NULL) (ops->close)(gsc); if (gsc->fd) close(gsc->fd); if (gsc->host != NULL) g_free(gsc->host); g_free(gsc); } size_t gaim_ssl_read(GaimSslConnection *gsc, void *data, size_t len) { GaimSslOps *ops; g_return_val_if_fail(gsc != NULL, 0); g_return_val_if_fail(data != NULL, 0); g_return_val_if_fail(len > 0, 0); ops = gaim_ssl_get_ops(); if (ops != NULL && (ops->read) != NULL) return (ops->read)(gsc, data, len); return 0; } size_t gaim_ssl_write(GaimSslConnection *gsc, const void *data, size_t len) { GaimSslOps *ops; g_return_val_if_fail(gsc != NULL, 0); g_return_val_if_fail(data != NULL, 0); g_return_val_if_fail(len > 0, 0); ops = gaim_ssl_get_ops(); if (ops != NULL && (ops->write) != NULL) return (ops->write)(gsc, data, len); return 0; } void gaim_ssl_set_ops(GaimSslOps *ops) { _ssl_ops = ops; } GaimSslOps * gaim_ssl_get_ops(void) { return _ssl_ops; } void gaim_ssl_init(void) { } void gaim_ssl_uninit(void) { GaimSslOps *ops; if (!_ssl_initialized) return; ops = gaim_ssl_get_ops(); if (ops != NULL && ops->uninit != NULL) ops->uninit(); _ssl_initialized = FALSE; }