aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

fixes to work with glib2 (untested...)

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2897 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-08-26 23:34:55 +00:00 committed by cras
parent be82733a83
commit a17321c5c8
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/network-openssl.c
View File

@ -37,8 +37,12 @@ GIOError irssi_ssl_write(GIOChannel *, gchar *, guint, guint*);
GIOError irssi_ssl_seek(GIOChannel *, gint, GSeekType); GIOError irssi_ssl_seek(GIOChannel *, gint, GSeekType);
/* ssl close */ /* ssl close */
void irssi_ssl_close(GIOChannel *); void irssi_ssl_close(GIOChannel *);
#if GLIB_MAJOR_VERSION < 2
/* ssl create watch */ /* ssl create watch */
guint irssi_ssl_create_watch(GIOChannel *, gint, GIOCondition, GIOFunc, gpointer, GDestroyNotify); guint irssi_ssl_create_watch(GIOChannel *, gint, GIOCondition, GIOFunc, gpointer, GDestroyNotify);
#else
guint irssi_ssl_create_watch(GIOChannel *, GIOCondition);
#endif
/* ssl free */ /* ssl free */
void irssi_ssl_free(GIOChannel *); void irssi_ssl_free(GIOChannel *);
@ -178,12 +182,22 @@ void irssi_ssl_close(GIOChannel *handle)
g_io_channel_close(chan->giochan); g_io_channel_close(chan->giochan);
} }
#if GLIB_MAJOR_VERSION < 2
guint irssi_ssl_create_watch(GIOChannel *handle, gint priority, GIOCondition cond, guint irssi_ssl_create_watch(GIOChannel *handle, gint priority, GIOCondition cond,
GIOFunc func, gpointer data, GDestroyNotify notify) GIOFunc func, gpointer data, GDestroyNotify notify)
{ {
GIOSSLChannel *chan = (GIOSSLChannel *)handle; GIOSSLChannel *chan = (GIOSSLChannel *)handle;
return chan->giochan->funcs->io_add_watch(handle, priority, cond, func, data, notify); return chan->giochan->funcs->io_add_watch(handle, priority, cond, func, data, notify);
} }
#else
guint irssi_ssl_create_watch(GIOChannel *handle, GIOCondition cond)
{
GIOSSLChannel *chan = (GIOSSLChannel *)handle;
return chan->giochan->funcs->io_create_watch(handle, cond);
}
#endif
void irssi_ssl_free(GIOChannel *handle) void irssi_ssl_free(GIOChannel *handle)
{ {