From a0d04d6253cf70877a11156059209e1f9a2efe31 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 7 May 2006 20:07:43 +0200 Subject: Got rid of all GLib GIOChannel-related calls outside proxy.c --- bitlbee.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index 4da87ec6..00e5ce97 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -111,6 +111,7 @@ extern char *CONF_FILE; #include "query.h" #include "sock.h" #include "util.h" +#include "proxy.h" typedef struct global { /* In forked mode, child processes store the fd of the IPC socket here. */ @@ -127,8 +128,8 @@ typedef struct global { int bitlbee_daemon_init( void ); int bitlbee_inetd_init( void ); -gboolean bitlbee_io_current_client_read( GIOChannel *source, GIOCondition condition, gpointer data ); -gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condition, gpointer data ); +void bitlbee_io_current_client_read( gpointer data, gint source, GaimInputCondition cond ); +void bitlbee_io_current_client_write( gpointer data, gint source, GaimInputCondition cond ); void root_command_string( irc_t *irc, user_t *u, char *command, int flags ); void root_command( irc_t *irc, char *command[] ); -- cgit v1.2.3 From 67b6766489f1b9b5f2249659b0ddf260e6f8f51b Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 9 May 2006 09:20:36 +0200 Subject: Some extra #defines in bitlbee.h to prevent the use of some GLib functions. --- bitlbee.h | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index 00e5ce97..f9bb70bb 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -57,23 +57,38 @@ /* The following functions should not be used if we want to maintain Windows compatibility... */ #undef free -#define free __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM_INSTEAD__ +#define free __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM__ #undef malloc -#define malloc __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM_INSTEAD__ +#define malloc __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM__ #undef calloc -#define calloc __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM_INSTEAD__ +#define calloc __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM__ #undef realloc -#define realloc __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM_INSTEAD__ +#define realloc __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM__ #undef strdup -#define strdup __PLEASE_USE_THE_GLIB_STRDUP_FUNCTIONS_SYSTEM_INSTEAD__ +#define strdup __PLEASE_USE_THE_GLIB_STRDUP_FUNCTIONS_SYSTEM__ #undef strndup -#define strndup __PLEASE_USE_THE_GLIB_STRDUP_FUNCTIONS_SYSTEM_INSTEAD__ +#define strndup __PLEASE_USE_THE_GLIB_STRDUP_FUNCTIONS_SYSTEM__ #undef snprintf -#define snprintf __PLEASE_USE_G_SNPRINTF_INSTEAD__ +#define snprintf __PLEASE_USE_G_SNPRINTF__ #undef strcasecmp -#define strcasecmp __PLEASE_USE_G_STRCASECMP_INSTEAD__ +#define strcasecmp __PLEASE_USE_G_STRCASECMP__ #undef strncasecmp -#define strncasecmp __PLEASE_USE_G_STRNCASECMP_INSTEAD__ +#define strncasecmp __PLEASE_USE_G_STRNCASECMP__ + +/* And the following functions shouldn't be used anymore to keep compatibility + with other event handling libs than GLib. */ +#undef g_timeout_add +#define g_timeout_add __PLEASE_USE_B_TIMEOUT_ADD__ +#undef g_timeout_add_full +#define g_timeout_add_full __PLEASE_USE_B_TIMEOUT_ADD__ +#undef g_source_remove +#define g_source_remove __PLEASE_USE_B_SOURCE_REMOVE__ +#undef g_source_remove_by_user_data +#define g_source_remove_by_user_data __PLEASE_USE_B_SOURCE_REMOVE_BY_USER_DATA__ +#undef g_main_run +#define g_main_run __PLEASE_USE_B_MAIN_RUN__ +#undef g_main_quit +#define g_main_quit __PLEASE_USE_B_MAIN_QUIT__ #ifndef F_OK #define F_OK 0 -- cgit v1.2.3 From ba9edaa568088900145bbd1004c864b7d408c38d Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 10 May 2006 19:34:46 +0200 Subject: Moved everything to the BitlBee event handling API. --- bitlbee.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index f9bb70bb..709856d8 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -81,8 +81,12 @@ #define g_timeout_add __PLEASE_USE_B_TIMEOUT_ADD__ #undef g_timeout_add_full #define g_timeout_add_full __PLEASE_USE_B_TIMEOUT_ADD__ +#undef g_io_add_watch +#define g_io_add_watch __PLEASE_USE_B_INPUT_ADD__ +#undef g_io_add_watch_full +#define g_io_add_watch_full __PLEASE_USE_B_INPUT_ADD__ #undef g_source_remove -#define g_source_remove __PLEASE_USE_B_SOURCE_REMOVE__ +#define g_source_remove __PLEASE_USE_B_EVENT_REMOVE__ #undef g_source_remove_by_user_data #define g_source_remove_by_user_data __PLEASE_USE_B_SOURCE_REMOVE_BY_USER_DATA__ #undef g_main_run @@ -136,19 +140,18 @@ typedef struct global { conf_t *conf; GList *storage; /* The first backend in the list will be used for saving */ char *helpfile; - GMainLoop *loop; int restart; } global_t; int bitlbee_daemon_init( void ); int bitlbee_inetd_init( void ); -void bitlbee_io_current_client_read( gpointer data, gint source, GaimInputCondition cond ); -void bitlbee_io_current_client_write( gpointer data, gint source, GaimInputCondition cond ); +gboolean bitlbee_io_current_client_read( gpointer data, gint source, b_input_condition cond ); +gboolean bitlbee_io_current_client_write( gpointer data, gint source, b_input_condition cond ); void root_command_string( irc_t *irc, user_t *u, char *command, int flags ); void root_command( irc_t *irc, char *command[] ); -void bitlbee_shutdown( gpointer data ); +gboolean bitlbee_shutdown( gpointer data, gint fd, b_input_condition cond ); extern global_t global; -- cgit v1.2.3 From df1694b9559d4abec748b0506b5f44e684d022a8 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 25 Jun 2006 14:15:42 +0200 Subject: Moving all generic files to lib/ instead of having some in / and some in protocols/, and adding RC4 code. --- bitlbee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index 709856d8..1462316f 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -129,7 +129,7 @@ extern char *CONF_FILE; #include "help.h" #include "query.h" #include "sock.h" -#include "util.h" +#include "misc.h" #include "proxy.h" typedef struct global { -- cgit v1.2.3 From 5b52a4895e5a59ff6509f7771f4d8665737688c3 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 3 Jul 2006 23:22:45 +0200 Subject: Implemented per-account nick lists instead of per-protocol nick lists. nick_t is dead, instead nicks are just saves in a per-account_t GLib hash table. While doing this, the import_buddies command finally died and text_save() disappeared, because the old file format can't handle most of the new features in this branch anyway. Still have to implement support for the new nick lists in text_load()! --- bitlbee.h | 1 + 1 file changed, 1 insertion(+) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index 1462316f..f068aeac 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -123,6 +123,7 @@ extern char *CONF_FILE; #include "nogaim.h" #include "commands.h" #include "account.h" +#include "nick.h" #include "conf.h" #include "log.h" #include "ini.h" -- cgit v1.2.3 From 6cfcfdf92b50719e8c08cc933879dae00a484215 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 18 Feb 2007 23:48:02 +0000 Subject: Added the right version tag. --- bitlbee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index f068aeac..f82f763a 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -29,7 +29,7 @@ #define _GNU_SOURCE /* Stupid GNU :-P */ #define PACKAGE "BitlBee" -#define BITLBEE_VERSION "BZR" +#define BITLBEE_VERSION "1.1dev" #define VERSION BITLBEE_VERSION #define MAX_STRING 128 -- cgit v1.2.3 From 221a27346f768b9626f2a0281ff774790858a0c2 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 24 Nov 2007 19:07:22 +0000 Subject: 1.1.1dev (Although the CHANGES change isn't in there). --- bitlbee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index f82f763a..23ec64b1 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -29,7 +29,7 @@ #define _GNU_SOURCE /* Stupid GNU :-P */ #define PACKAGE "BitlBee" -#define BITLBEE_VERSION "1.1dev" +#define BITLBEE_VERSION "1.1.1dev" #define VERSION BITLBEE_VERSION #define MAX_STRING 128 -- cgit v1.2.3 From 69ac78cef9505f334cf61d13825371ce0c67ca16 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 4 Feb 2008 23:54:08 +0000 Subject: Added bogus G_GNUC_MALLOC to restore GLib 2.4 compatibility (hopefully). --- bitlbee.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index 23ec64b1..55687e3b 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -98,6 +98,12 @@ #define F_OK 0 #endif +#ifndef G_GNUC_MALLOC +/* Doesn't exist in GLib <=2.4 while everything else in BitlBee should + work with it, so let's fake this one. */ +#define G_GNUC_MALLOC +#endif + #define _( x ) x #define ROOT_NICK "root" -- cgit v1.2.3 From eeb85a8a880fefe655eb31b6322136b61ee969e2 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 11 Feb 2008 12:35:01 +0000 Subject: Got rid of some noise at startup: complaining when the default configuration file couldn't be found while the user specified an alternative location with the -c option, and double complaints about /var/lib/bitlbee/ permissions. --- bitlbee.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index 55687e3b..c118d7fc 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -121,8 +121,6 @@ #define HELP_FILE VARDIR "help.txt" #define CONF_FILE_DEF ETCDIR "bitlbee.conf" -extern char *CONF_FILE; - #include "irc.h" #include "storage.h" #include "set.h" @@ -144,6 +142,7 @@ typedef struct global { int listen_socket; gint listen_watch_source_id; help_t *help; + char *conf_file; conf_t *conf; GList *storage; /* The first backend in the list will be used for saving */ char *helpfile; -- cgit v1.2.3 From 9ad86bb22e53a40b3ad5bbc57f33d819d2748b0c Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 15 Mar 2008 16:09:50 +0000 Subject: Fixed issues with "long" URLs in url.c. Reusing code from 2001 wasn't a good idea... --- bitlbee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index c118d7fc..4a1c8b6d 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -32,7 +32,7 @@ #define BITLBEE_VERSION "1.1.1dev" #define VERSION BITLBEE_VERSION -#define MAX_STRING 128 +#define MAX_STRING 511 #if HAVE_CONFIG_H #include "config.h" -- cgit v1.2.3 From d07c3a8cde47096ad69db7139d410dfee29e509b Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 16 Mar 2008 00:40:20 +0000 Subject: No idea what's holding back 1.2 anymore so at least I'll make sure bitlbee.h is correct. Also updated the changelog. Just remembered 1 or 2 things left to do before 1.2, maybe do them tomorrow? --- bitlbee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index 4a1c8b6d..420ab70a 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -29,7 +29,7 @@ #define _GNU_SOURCE /* Stupid GNU :-P */ #define PACKAGE "BitlBee" -#define BITLBEE_VERSION "1.1.1dev" +#define BITLBEE_VERSION "1.2" #define VERSION BITLBEE_VERSION #define MAX_STRING 511 -- cgit v1.2.3