Mercurial > pidgin.yaz
view src/sslconn.c @ 12498:a2de852981c1
[gaim-migrate @ 14810]
SF Patch #1380806 from charkins
"leave docklet loaded when notification area is not present"
"From the summary, this sounds weird, but I think its
better behavior. This really only effects some odd
corner cases. The existing behavior is that the docklet
plugin unloads itself after 10 seconds if the tray icon
isn't created. The behavior with this patch is that
there is a 3 second timeout (this is necessary to avoid
race condition when restoring the gtkblist's visibility
state on startup). After this timeout, the docklet
plugin stays loaded waiting for a notification to
appear, but is essentially non-functional.
In the typical scenario, this patch doesn't effect the
behavior. Here are some examples of where it does matter:
1) If gaim is closed with the buddy list hidden to the
docklet, then gaim is started again without a
notification area, the buddy list doesn't show up for
10 seconds (the time it takes for the docklet to
timeout). This patch would reduce this to 3 seconds.
2) If the user removes the notification area from their
panel, maybe to remove it from one panel and add it to
a different panel, but doesn't add a new one back
within 10 seconds, the current behavior would cause the
docklet plugin to be unloaded. With this patch, the
tray icon would automatically be added to the new
notification area when it becomes available.
3) The gnome-panel dies and is not restarted within 10
seconds. Similar to #2. (There was a bug filed for
this, but can't find it right now).
My main concern was that it could be confusing to the
user if they enable the docklet plugin, then 10 seconds
later it gets disabled without any notification. This
patch doesn't add any notification, but leaves the
plugin running so it will automatically use a
notification area when one becomes available.
I also removed an unused parameter from
docklet_remove() and changed the plugin description
slightly to reflect the change in queuing/notification.
Not sure how clear this is, so bug me on #gaim if you
have any questions. --charkins"
I made a few changes to this patch, but nothing terribly significant...
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Dec 2005 09:16:14 +0000 |
parents | fa6395637e2c |
children | b76c6de0c3b5 |
line wrap: on
line source
/** * @file sslconn.c SSL API * @ingroup core * * 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 "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; 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); ops = gaim_ssl_get_ops(); if (ops != NULL && ops->init != NULL) return ops->init(); else return FALSE; } 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; }