You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
(997) |
May
(483) |
Jun
(142) |
Jul
(209) |
Aug
(109) |
Sep
(135) |
Oct
(213) |
Nov
(46) |
Dec
(93) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(59) |
Feb
(11) |
Mar
(8) |
Apr
(2) |
May
(5) |
Jun
(16) |
Jul
(14) |
Aug
(5) |
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
2005 |
Jan
|
Feb
(18) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(6) |
Nov
(4) |
Dec
|
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(14) |
2007 |
Jan
(79) |
Feb
(47) |
Mar
(30) |
Apr
(30) |
May
(6) |
Jun
(13) |
Jul
(10) |
Aug
(72) |
Sep
(4) |
Oct
(30) |
Nov
(10) |
Dec
(13) |
2008 |
Jan
|
Feb
|
Mar
(12) |
Apr
(5) |
May
|
Jun
(50) |
Jul
(32) |
Aug
(70) |
Sep
(4) |
Oct
(1) |
Nov
(9) |
Dec
|
2009 |
Jan
|
Feb
(7) |
Mar
(11) |
Apr
(16) |
May
(19) |
Jun
(4) |
Jul
(100) |
Aug
(141) |
Sep
(89) |
Oct
(25) |
Nov
(26) |
Dec
(1) |
2010 |
Jan
(5) |
Feb
(11) |
Mar
(2) |
Apr
(3) |
May
(2) |
Jun
(1) |
Jul
(5) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:45
|
Update of /cvsroot/ayttm/ayttm/modules/smtp In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/smtp Modified Files: smtp.c Log Message: reformatted source code Index: smtp.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/smtp/smtp.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- smtp.c 6 Sep 2009 18:23:08 -0000 1.24 +++ smtp.c 17 Sep 2009 12:04:59 -0000 1.25 @@ -47,16 +47,15 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info smtp_LTX_plugin_info - #define SERVICE_INFO smtp_LTX_SERVICE_INFO - #define module_version smtp_LTX_module_version +#define plugin_info smtp_LTX_plugin_info +#define SERVICE_INFO smtp_LTX_SERVICE_INFO +#define module_version smtp_LTX_module_version #endif - /* Function Prototypes */ static int plugin_init(); static int plugin_finish(); -struct service_callbacks * query_callbacks(); +struct service_callbacks *query_callbacks(); static int is_setting_state = 0; @@ -66,8 +65,7 @@ static int default_online = 0; /* Module Exports */ -PLUGIN_INFO plugin_info = -{ +PLUGIN_INFO plugin_info = { PLUGIN_SERVICE, "SMTP", "Provides Simple Mail Transfer Protocol (SMTP) support", @@ -78,17 +76,22 @@ plugin_finish, NULL }; + struct service SERVICE_INFO = { "SMTP", -1, SERVICE_CAN_OFFLINEMSG | /* all messages are offline */ - SERVICE_CAN_FILETRANSFER, /* true so i can prevent file - transfer altogether */ + SERVICE_CAN_FILETRANSFER, /* true so i can prevent file + transfer altogether */ NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static int plugin_init() { @@ -121,9 +124,8 @@ * End Module Code ******************************************************************************/ - #ifdef __STDC__ -int SMTP_DEBUGLOG(char *fmt,...) +int SMTP_DEBUGLOG(char *fmt, ...) #else int SMTP_DEBUGLOG(fmt, va_alist) char *fmt; @@ -144,7 +146,6 @@ return 0; } - #define LOG(x) if(do_smtp_debug) { SMTP_DEBUGLOG("%s:%d: ", __FILE__, __LINE__); \ SMTP_DEBUGLOG x; \ SMTP_DEBUGLOG("\n"); } @@ -153,19 +154,21 @@ SMTP_DEBUGLOG x; \ SMTP_DEBUGLOG("\n"); } - #define SMTP_MSG_COLOR "#2080d0" -static char *eb_smtp_get_color(void) { return SMTP_MSG_COLOR; } +static char *eb_smtp_get_color(void) +{ + return SMTP_MSG_COLOR; +} enum smtp_status_code { SMTP_STATUS_ONLINE, SMTP_STATUS_OFFLINE }; - + typedef struct eb_smtp_account_data { int status; /* always online */ } eb_smtp_account_data; typedef struct eb_smtp_local_account_data { char password[MAX_PREF_LEN]; /* in case of SMTP Auth? */ - int status; /* always online */ + int status; /* always online */ char smtp_host[MAX_PREF_LEN]; char smtp_port[MAX_PREF_LEN]; } eb_smtp_local_account_data; @@ -205,24 +208,24 @@ } -static LList * eb_smtp_buddies = NULL; +static LList *eb_smtp_buddies = NULL; static int smtp_tcp_writeline(char *buff, int fd) { int len = strlen(buff); int i; - for (i=1; i<=2; i++) - if(buff[len-i] == '\r' || buff[len-i] == '\n') - buff[len-i]='\0'; + for (i = 1; i <= 2; i++) + if (buff[len - i] == '\r' || buff[len - i] == '\n') + buff[len - i] = '\0'; return ay_tcp_writeline(buff, strlen(buff), fd); } -static eb_local_account *eb_smtp_read_local_account_config(LList * pairs) +static eb_local_account *eb_smtp_read_local_account_config(LList *pairs) { eb_local_account *ela; eb_smtp_local_account_data *sla; - if(!pairs) { + if (!pairs) { WARNING(("eb_smtp_read_local_account_config: pairs == NULL")); return NULL; } @@ -238,33 +241,33 @@ smtp_account_prefs_init(ela); eb_update_from_value_pair(ela->prefs, pairs); - if(!sla->smtp_host[0]) + if (!sla->smtp_host[0]) strncpy(sla->smtp_host, "127.0.0.1", sizeof(sla->smtp_host)); - if(!sla->smtp_port[0]) + if (!sla->smtp_port[0]) strncpy(sla->smtp_port, "25", sizeof(sla->smtp_host)); return ela; } -static LList *eb_smtp_write_local_config(eb_local_account * account) +static LList *eb_smtp_write_local_config(eb_local_account *account) { return eb_input_to_value_pair(account->prefs); } -static void _buddy_change_state(void * data, void * user_data) +static void _buddy_change_state(void *data, void *user_data) { eb_account *ea = find_account_by_handle(data, SERVICE_INFO.protocol_id); eb_smtp_account_data *sad; int status = (int)user_data; - if(!ea) + if (!ea) return; sad = ea->protocol_account_data; sad->status = status; - if(status == SMTP_STATUS_ONLINE) + if (status == SMTP_STATUS_ONLINE) buddy_login(ea); else buddy_logoff(ea); @@ -272,7 +275,7 @@ buddy_update_status(ea); } -static LList * pending_connects = NULL; +static LList *pending_connects = NULL; static void eb_smtp_login(eb_local_account *account) { @@ -280,42 +283,43 @@ eb_smtp_local_account_data *sla = account->protocol_local_account_data; enum smtp_status_code status = SMTP_STATUS_OFFLINE; - if(account->status_menu) { + if (account->status_menu) { sla->status = SMTP_STATUS_ONLINE; is_setting_state = 1; - eb_set_active_menu_status(account->status_menu, SMTP_STATUS_ONLINE); + eb_set_active_menu_status(account->status_menu, + SMTP_STATUS_ONLINE); is_setting_state = 0; - } + } account->connected = 1; ref_count++; - if(default_online) + if (default_online) status = SMTP_STATUS_ONLINE; - l_list_foreach(eb_smtp_buddies, _buddy_change_state, - (void *)status); + l_list_foreach(eb_smtp_buddies, _buddy_change_state, (void *)status); } static void eb_smtp_logout(eb_local_account *account) { /* cannot logout */ eb_smtp_local_account_data *sla = account->protocol_local_account_data; - LList * l; + LList *l; - for(l = pending_connects; l; l=l->next) + for (l = pending_connects; l; l = l->next) ay_socket_cancel_async((int)l->data); account->connected = 0; ref_count--; - if(account->status_menu) { + if (account->status_menu) { sla->status = SMTP_STATUS_OFFLINE; is_setting_state = 1; - eb_set_active_menu_status(account->status_menu, SMTP_STATUS_OFFLINE); + eb_set_active_menu_status(account->status_menu, + SMTP_STATUS_OFFLINE); is_setting_state = 0; - } + } - l_list_foreach(eb_smtp_buddies, _buddy_change_state, - (void *)SMTP_STATUS_OFFLINE); + l_list_foreach(eb_smtp_buddies, _buddy_change_state, + (void *)SMTP_STATUS_OFFLINE); } static LList *eb_smtp_get_states() @@ -339,26 +343,28 @@ { eb_smtp_local_account_data *sla = account->protocol_local_account_data; - if(is_setting_state) + if (is_setting_state) return; - if(sla->status == SMTP_STATUS_OFFLINE && state == SMTP_STATUS_ONLINE) + if (sla->status == SMTP_STATUS_OFFLINE && state == SMTP_STATUS_ONLINE) eb_smtp_login(account); - else if(sla->status == SMTP_STATUS_ONLINE && state == SMTP_STATUS_OFFLINE) + else if (sla->status == SMTP_STATUS_ONLINE + && state == SMTP_STATUS_OFFLINE) eb_smtp_logout(account); sla->status = state; } -static void eb_smtp_set_idle(eb_local_account * account, int idle) +static void eb_smtp_set_idle(eb_local_account *account, int idle) { } -static void eb_smtp_set_away(eb_local_account * account, char * message, int away) +static void eb_smtp_set_away(eb_local_account *account, char *message, int away) { } -static eb_account *eb_smtp_new_account(eb_local_account *ela, const char * account) +static eb_account *eb_smtp_new_account(eb_local_account *ela, + const char *account) { eb_account *ea = calloc(1, sizeof(eb_account)); eb_smtp_account_data *sad = calloc(1, sizeof(eb_smtp_account_data)); @@ -372,31 +378,31 @@ return ea; } -static void eb_smtp_add_user(eb_account * account) +static void eb_smtp_add_user(eb_account *account) { - eb_smtp_account_data * sad = account->protocol_account_data; - eb_local_account * ela = find_local_account_for_remote(account, 0); + eb_smtp_account_data *sad = account->protocol_account_data; + eb_local_account *ela = find_local_account_for_remote(account, 0); eb_smtp_local_account_data *sla; - if(!ela) { + if (!ela) { WARNING(("eb_smtp_add_user: ela == NULL")); return; } - + sla = ela->protocol_local_account_data; eb_smtp_buddies = l_list_append(eb_smtp_buddies, account->handle); - if( (sad->status = sla->status) == SMTP_STATUS_ONLINE) + if ((sad->status = sla->status) == SMTP_STATUS_ONLINE) buddy_login(account); } -static void eb_smtp_del_user(eb_account * account) +static void eb_smtp_del_user(eb_account *account) { eb_smtp_buddies = l_list_remove(eb_smtp_buddies, account->handle); } -static eb_account *eb_smtp_read_account_config(eb_account *ea, LList * config) +static eb_account *eb_smtp_read_account_config(eb_account *ea, LList *config) { eb_smtp_account_data *sad = calloc(1, sizeof(eb_smtp_account_data)); @@ -409,7 +415,7 @@ return ea; } -static int eb_smtp_query_connected(eb_account * account) +static int eb_smtp_query_connected(eb_account *account) { eb_smtp_account_data *sad = account->protocol_account_data; @@ -421,40 +427,42 @@ "Offline" }; -static char *eb_smtp_get_status_string(eb_account * account) +static char *eb_smtp_get_status_string(eb_account *account) { eb_smtp_account_data *sad = account->protocol_account_data; return status_strings[sad->status]; } - #include "smtp_online.xpm" #include "smtp_away.xpm" -static char ** eb_smtp_get_status_pixmap(eb_account * account) +static char **eb_smtp_get_status_pixmap(eb_account *account) { eb_smtp_account_data *sad; sad = account->protocol_account_data; - if(sad->status == SMTP_STATUS_ONLINE) + if (sad->status == SMTP_STATUS_ONLINE) return smtp_online_xpm; else return smtp_away_xpm; } -static void eb_smtp_send_file(eb_local_account *from, eb_account *to, char *file) +static void eb_smtp_send_file(eb_local_account *from, eb_account *to, + char *file) { - ay_do_info( _("SMTP Warning"), _("You cannot send files through SMTP... yet") ); + ay_do_info(_("SMTP Warning"), + _("You cannot send files through SMTP... yet")); } -static int validate_or_die_gracefully(const char *buff, const char *valid, int fd) +static int validate_or_die_gracefully(const char *buff, const char *valid, + int fd) { - if(strstr(buff, valid) == buff) { + if (strstr(buff, valid) == buff) { return 1; - } + } LOG(("Server responded: %s", buff)); smtp_tcp_writeline("QUIT", fd); @@ -462,9 +470,9 @@ return 0; } -enum smtp_states { - SMTP_CONNECT, SMTP_HELO, - SMTP_FROM, SMTP_TO, +enum smtp_states { + SMTP_CONNECT, SMTP_HELO, + SMTP_FROM, SMTP_TO, SMTP_DATA, SMTP_DATA_END, SMTP_QUIT }; @@ -472,18 +480,19 @@ struct smtp_callback_data { int tag; char localhost[255]; - eb_local_account * from; - eb_account * to; - char * msg; + eb_local_account *from; + eb_account *to; + char *msg; enum smtp_states state; }; -static const char *expected[7]={ +static const char *expected[7] = { "220", "250", "250", "250", "354", "250", "221" }; -static void destroy_callback_data(struct smtp_callback_data * d) + +static void destroy_callback_data(struct smtp_callback_data *d) { - if(d->tag) + if (d->tag) eb_input_remove(d->tag); free(d->msg); free(d); @@ -492,7 +501,7 @@ static void smtp_message_sent(struct smtp_callback_data *d, int success) { char reply[1024] = "<FONT COLOR=\"#a0a0a0\"><I>"; - if(success) + if (success) strcat(reply, _("Message sent via SMTP.")); else strcat(reply, _("Error sending message via SMTP.")); @@ -501,33 +510,35 @@ eb_parse_incoming_message(d->from, d->to, reply); } -static void send_message_async(void * data, int fd, eb_input_condition cond) +static void send_message_async(void *data, int fd, eb_input_condition cond) { - struct smtp_callback_data * d = data; + struct smtp_callback_data *d = data; char buff[1024]; - if(ay_tcp_readline(buff, sizeof(buff)-1, fd) <= 0) { + if (ay_tcp_readline(buff, sizeof(buff) - 1, fd) <= 0) { WARNING(("smtp server closed connection")); close(fd); destroy_callback_data(d); }; - if(!validate_or_die_gracefully(buff, expected[d->state], fd)) { + if (!validate_or_die_gracefully(buff, expected[d->state], fd)) { smtp_message_sent(d, 0); destroy_callback_data(d); } - switch(d->state) { + switch (d->state) { case SMTP_CONNECT: - snprintf(buff, sizeof(buff)-1, "HELO %s", d->localhost); + snprintf(buff, sizeof(buff) - 1, "HELO %s", d->localhost); d->state = SMTP_HELO; break; case SMTP_HELO: - snprintf(buff, sizeof(buff)-1, "MAIL FROM: <%s>", d->from->handle); + snprintf(buff, sizeof(buff) - 1, "MAIL FROM: <%s>", + d->from->handle); d->state = SMTP_FROM; break; case SMTP_FROM: - snprintf(buff, sizeof(buff)-1, "RCPT TO: <%s>", d->to->handle); + snprintf(buff, sizeof(buff) - 1, "RCPT TO: <%s>", + d->to->handle); d->state = SMTP_TO; break; case SMTP_TO: @@ -536,18 +547,21 @@ break; case SMTP_DATA: { - int n, len = strlen(d->msg); - char buf[1024]; - /* avoid having no To: in mail - server may append - "Undisclosed recipients"*/ - snprintf(buf, 1024, "To: %s <%s>", d->to->handle, d->to->handle); - smtp_tcp_writeline(buf, fd); - for(n=1; d->msg[len-n] == '\r' || d->msg[len-n] == '\n'; n++) - d->msg[len-n] = '\0'; - if(strncasecmp(d->msg, "Subject:", strlen("Subject:"))) - smtp_tcp_writeline("", fd); - smtp_tcp_writeline(d->msg, fd); - strcpy(buff, "."); + int n, len = strlen(d->msg); + char buf[1024]; + /* avoid having no To: in mail - server may append + "Undisclosed recipients" */ + snprintf(buf, 1024, "To: %s <%s>", d->to->handle, + d->to->handle); + smtp_tcp_writeline(buf, fd); + for (n = 1; + d->msg[len - n] == '\r' + || d->msg[len - n] == '\n'; n++) + d->msg[len - n] = '\0'; + if (strncasecmp(d->msg, "Subject:", strlen("Subject:"))) + smtp_tcp_writeline("", fd); + smtp_tcp_writeline(d->msg, fd); + strcpy(buff, "."); } d->state = SMTP_DATA_END; break; @@ -565,11 +579,11 @@ static void eb_smtp_got_connected(int fd, int error, void *data) { - struct smtp_callback_data * d = data; + struct smtp_callback_data *d = data; - if(error) { - WARNING(("Could not connect to smtp server: %d: %s", - error, strerror(error))); + if (error) { + WARNING(("Could not connect to smtp server: %d: %s", + error, strerror(error))); destroy_callback_data(d); return; } @@ -579,17 +593,17 @@ d->tag = eb_input_add(fd, EB_INPUT_READ, send_message_async, d); } -static void eb_smtp_send_im(eb_local_account * account_from, - eb_account * account_to, char * message) - +static void eb_smtp_send_im(eb_local_account *account_from, + eb_account *account_to, char *message) { char localhost[255]; - struct smtp_callback_data * d; - eb_smtp_local_account_data *sla = account_from->protocol_local_account_data; + struct smtp_callback_data *d; + eb_smtp_local_account_data *sla = + account_from->protocol_local_account_data; - if(gethostname(localhost, sizeof(localhost)-1) == -1) { + if (gethostname(localhost, sizeof(localhost) - 1) == -1) { strcpy(localhost, "localhost"); - WARNING(("could not get localhost name: %d: %s", + WARNING(("could not get localhost name: %d: %s", errno, strerror(errno))); return; } @@ -599,17 +613,18 @@ d->from = account_from; d->to = account_to; d->msg = strdup(message); - d->tag = ay_socket_new_async(sla->smtp_host, atoi(sla->smtp_port), eb_smtp_got_connected, d, NULL); + d->tag = ay_socket_new_async(sla->smtp_host, atoi(sla->smtp_port), + eb_smtp_got_connected, d, NULL); pending_connects = l_list_append(pending_connects, (void *)d->tag); } -static char * eb_smtp_check_login(const char * user, const char * pass) +static char *eb_smtp_check_login(const char *user, const char *pass) { - if(strchr(user,'@') == NULL) { - return strdup(_("SMTP logins must have @domain.tld part.")); - } - return NULL; + if (strchr(user, '@') == NULL) { + return strdup(_("SMTP logins must have @domain.tld part.")); + } + return NULL; } struct service_callbacks *query_callbacks() @@ -618,35 +633,34 @@ sc = calloc(1, sizeof(struct service_callbacks)); - sc->query_connected = eb_smtp_query_connected; - sc->login = eb_smtp_login; - sc->logout = eb_smtp_logout; - sc->check_login = eb_smtp_check_login; - - sc->send_im = eb_smtp_send_im; - - sc->read_local_account_config = eb_smtp_read_local_account_config; - sc->write_local_config = eb_smtp_write_local_config; - sc->read_account_config = eb_smtp_read_account_config; - - sc->get_states = eb_smtp_get_states; - sc->get_current_state = eb_smtp_get_current_state; - sc->set_current_state = eb_smtp_set_current_state; - - sc->new_account = eb_smtp_new_account; - sc->add_user = eb_smtp_add_user; - sc->del_user = eb_smtp_del_user; - - sc->get_status_string = eb_smtp_get_status_string; - sc->get_status_pixmap = eb_smtp_get_status_pixmap; + sc->query_connected = eb_smtp_query_connected; + sc->login = eb_smtp_login; + sc->logout = eb_smtp_logout; + sc->check_login = eb_smtp_check_login; + + sc->send_im = eb_smtp_send_im; + + sc->read_local_account_config = eb_smtp_read_local_account_config; + sc->write_local_config = eb_smtp_write_local_config; + sc->read_account_config = eb_smtp_read_account_config; + + sc->get_states = eb_smtp_get_states; + sc->get_current_state = eb_smtp_get_current_state; + sc->set_current_state = eb_smtp_set_current_state; - sc->set_idle = eb_smtp_set_idle; - sc->set_away = eb_smtp_set_away; + sc->new_account = eb_smtp_new_account; + sc->add_user = eb_smtp_add_user; + sc->del_user = eb_smtp_del_user; - sc->send_file = eb_smtp_send_file; + sc->get_status_string = eb_smtp_get_status_string; + sc->get_status_pixmap = eb_smtp_get_status_pixmap; - sc->get_color = eb_smtp_get_color; + sc->set_idle = eb_smtp_set_idle; + sc->set_away = eb_smtp_set_away; + + sc->send_file = eb_smtp_send_file; + + sc->get_color = eb_smtp_get_color; return sc; } - |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:45
|
Update of /cvsroot/ayttm/ayttm/sounds In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/sounds Modified Files: au2h.c Log Message: reformatted source code Index: au2h.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/sounds/au2h.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- au2h.c 1 Apr 2003 07:25:11 -0000 1.1.1.1 +++ au2h.c 17 Sep 2009 12:05:00 -0000 1.2 @@ -11,7 +11,7 @@ int fd; FILE *f; int cnt; - int res,x; + int res, x; char buf[BUF_SIZE]; fd = open(argv[1], O_RDONLY); @@ -24,18 +24,18 @@ perror("fopen"); exit(1); } - /* we will use arg[3] for the name of the C object*/ + /* we will use arg[3] for the name of the C object */ fprintf(f, "static unsigned char %s[] = {\n", argv[3]); - read(fd, buf, 8); /* id & offset */ - read(fd, buf, 8); /* len & encoding */ - read(fd, buf, 8); /* rate & count */ + read(fd, buf, 8); /* id & offset */ + read(fd, buf, 8); /* len & encoding */ + read(fd, buf, 8); /* rate & count */ /* no more click :) */ - - while((res = read(fd, buf, BUF_SIZE)) > 0) { - for (x=0;x<res;x++) + + while ((res = read(fd, buf, BUF_SIZE)) > 0) { + for (x = 0; x < res; x++) fprintf(f, "%#x, ", buf[x] & 0xff); fprintf(f, "\n"); } - fprintf(f,"};\n"); + fprintf(f, "};\n"); return 0; } |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:44
|
Update of /cvsroot/ayttm/ayttm/modules/importers In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/importers Modified Files: import_everybuddy.c import_gaim.c import_gnomeicu.c importicq.c importlicq.c Log Message: reformatted source code Index: import_everybuddy.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/importers/import_everybuddy.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- import_everybuddy.c 26 Aug 2009 16:25:56 -0000 1.14 +++ import_everybuddy.c 17 Sep 2009 12:04:58 -0000 1.15 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - + #include "intl.h" #include <stdlib.h> @@ -37,63 +37,66 @@ #include "plugin_api.h" #include "messages.h" - /************************************************************************************* * Begin Module Code ************************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info import_everybuddy_LTX_plugin_info - #define plugin_init import_everybuddy_LTX_plugin_init - #define plugin_finish import_everybuddy_LTX_plugin_finish - #define module_version import_everybuddy_LTX_module_version +#define plugin_info import_everybuddy_LTX_plugin_info +#define plugin_init import_everybuddy_LTX_plugin_init +#define plugin_finish import_everybuddy_LTX_plugin_finish +#define module_version import_everybuddy_LTX_module_version #endif - /* Function Prototypes */ void import_eb_accounts(ebmCallbackData *data); int plugin_init(); int plugin_finish(); -static int ref_count=0; +static int ref_count = 0; /* Module Exports */ PLUGIN_INFO plugin_info = { - PLUGIN_IMPORTER, - "Everybuddy Settings", - "Imports your Everybuddy settings into Ayttm", + PLUGIN_IMPORTER, + "Everybuddy Settings", + "Imports your Everybuddy settings into Ayttm", "$Revision$", "$Date$", &ref_count, plugin_init, plugin_finish }; + /* End Module Exports */ -static void *buddy_list_tag=NULL; +static void *buddy_list_tag = NULL; -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} int plugin_init() { - eb_debug(DBG_MOD,"EB Buddy List init\n"); - buddy_list_tag=eb_add_menu_item("Everybuddy Settings", EB_IMPORT_MENU, - import_eb_accounts, ebmIMPORTDATA, NULL); - if(!buddy_list_tag) - return(-1); - return(0); + eb_debug(DBG_MOD, "EB Buddy List init\n"); + buddy_list_tag = eb_add_menu_item("Everybuddy Settings", EB_IMPORT_MENU, + import_eb_accounts, ebmIMPORTDATA, NULL); + if (!buddy_list_tag) + return (-1); + return (0); } int plugin_finish() { int result; - result=eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); - if(result) { - g_warning("Unable to remove eb Buddy List menu item from menu!"); - return(-1); + result = eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); + if (result) { + g_warning + ("Unable to remove eb Buddy List menu item from menu!"); + return (-1); } - return(0); + return (0); } /************************************************************************************ @@ -112,47 +115,55 @@ static GtkWidget *label; static int eb_imp_window_open = 0; -static void ok_callback(GtkWidget * widget, gpointer data) { - +static void ok_callback(GtkWidget *widget, gpointer data) +{ + char buff[1024]; - int a=0,c=0,p=0,m=0; - + int a = 0, c = 0, p = 0, m = 0; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(accountsbutton))) { snprintf(buff, 1024, "%s/.everybuddy/accounts", getenv("HOME")); if (!load_accounts_from_file(buff)) { - ay_do_error(_("Import error"), _("Cannot import accounts.\n" + ay_do_error(_("Import error"), + _("Cannot import accounts.\n" "Check that ~/.everybuddy/accounts exists " "and is readable.")); } else { - a=1; + a = 1; } } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(contactsbutton))) { snprintf(buff, 1024, "%s/.everybuddy/contacts", getenv("HOME")); if (!load_contacts_from_file(buff)) { - ay_do_error(_("Import error"), _("Cannot import contacts.\n" + ay_do_error(_("Import error"), + _("Cannot import contacts.\n" "Check that ~/.everybuddy/contacts exists " "and is readable.")); } else - c=1; + c = 1; } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsbutton))) { /* prefs we want to save */ char saved[7][MAX_PREF_LEN]; FILE *in; - - strncpy(saved[0], cGetLocalPref("BuddyArriveFilename"), MAX_PREF_LEN); - strncpy(saved[1], cGetLocalPref("BuddyAwayFilename"), MAX_PREF_LEN); - strncpy(saved[2], cGetLocalPref("BuddyLeaveFilename"), MAX_PREF_LEN); + + strncpy(saved[0], cGetLocalPref("BuddyArriveFilename"), + MAX_PREF_LEN); + strncpy(saved[1], cGetLocalPref("BuddyAwayFilename"), + MAX_PREF_LEN); + strncpy(saved[2], cGetLocalPref("BuddyLeaveFilename"), + MAX_PREF_LEN); strncpy(saved[3], cGetLocalPref("SendFilename"), MAX_PREF_LEN); - strncpy(saved[4], cGetLocalPref("ReceiveFilename"), MAX_PREF_LEN); - strncpy(saved[5], cGetLocalPref("FirstMsgFilename"), MAX_PREF_LEN); + strncpy(saved[4], cGetLocalPref("ReceiveFilename"), + MAX_PREF_LEN); + strncpy(saved[5], cGetLocalPref("FirstMsgFilename"), + MAX_PREF_LEN); strncpy(saved[6], cGetLocalPref("modules_path"), MAX_PREF_LEN); snprintf(buff, 1024, "%s/.everybuddy/prefs", getenv("HOME")); in = fopen(buff, "r"); if (in) { - fclose (in); + fclose(in); ayttm_prefs_read_file(buff); cSetLocalPref("BuddyArriveFilename", saved[0]); @@ -164,56 +175,55 @@ cSetLocalPref("modules_path", saved[6]); ayttm_prefs_write(); - p=1; + p = 1; } else { - ay_do_error(_("Import error"), - _("Cannot import preferences.\n" + ay_do_error(_("Import error"), + _("Cannot import preferences.\n" "Check that ~/.everybuddy/preferences " - "exists and is readable.")); + "exists and is readable.")); } - + } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(awaybutton))) { FILE *in = NULL, *out = NULL; - snprintf(buff, 1024, "%s/.everybuddy/away_messages", getenv("HOME")); + snprintf(buff, 1024, "%s/.everybuddy/away_messages", + getenv("HOME")); in = fopen(buff, "r"); if (in) { snprintf(buff, 1024, "%saway_messages", config_dir); out = fopen(buff, "a"); if (!out) { ay_do_error(_("Import error"), - _("Cannot save away messages.\n" + _("Cannot save away messages.\n" "Check that ~/.ayttm/away_messages " "is writable.")); } else { while (fgets(buff, 1024, in) != NULL) fputs(buff, out); fclose(out); - m=1; + m = 1; } fclose(in); } else { - ay_do_error(_("Import error"), - _("Cannot import away messages.\n" + ay_do_error(_("Import error"), + _("Cannot import away messages.\n" "Check that ~/.everybuddy/away_messages " - "exists and is readable.")); + "exists and is readable.")); } } - + if (!a && !c && !p && !m) { return; } else { char message[1024]; snprintf(message, 1024, "Successfully imported %s%s%s%s%s%s%s." - "from Everybuddy.", - a?"accounts":"", - (a && (c||p||m))?", ":"", - c?"contacts":"", - (c && (p||m))?", ":"", - p?"preferences":"", - (p && m)?", ":"", - m?"away messages":"" - ); + "from Everybuddy.", + a ? "accounts" : "", + (a && (c || p || m)) ? ", " : "", + c ? "contacts" : "", + (c && (p || m)) ? ", " : "", + p ? "preferences" : "", + (p && m) ? ", " : "", m ? "away messages" : ""); ay_do_info(_("Import success"), message); } gtk_widget_destroy(window); @@ -221,58 +231,69 @@ set_menu_sensitivity(); } -static void cancel_callback(GtkWidget * widget, gpointer data) { +static void cancel_callback(GtkWidget *widget, gpointer data) +{ gtk_widget_destroy(window); } -static void destroy_callback(GtkWidget * widget, gpointer data) { +static void destroy_callback(GtkWidget *widget, gpointer data) +{ eb_imp_window_open = 0; } - void import_eb_accounts(ebmCallbackData *data) { if (!eb_imp_window_open) { eb_imp_window_open = 1; window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE); - gtk_window_set_title(GTK_WINDOW(window), _("Import parameters")); + gtk_window_set_title(GTK_WINDOW(window), + _("Import parameters")); gtk_widget_realize(window); gtk_container_set_border_width(GTK_CONTAINER(window), 5); - + vbox = gtk_vbox_new(FALSE, 5); - + label = gtk_label_new(_("Select which parts of your everybuddy " "configuration to import.\n")); - - accountsbutton = gtk_check_button_new_with_label( - _("Import local accounts")); - contactsbutton = gtk_check_button_new_with_label( - _("Import contacts")); - prefsbutton = gtk_check_button_new_with_label( - _("Import preferences")); - awaybutton = gtk_check_button_new_with_label( - _("Import away messages")); - + + accountsbutton = + gtk_check_button_new_with_label(_ + ("Import local accounts")); + contactsbutton = + gtk_check_button_new_with_label(_("Import contacts")); + prefsbutton = + gtk_check_button_new_with_label(_ + ("Import preferences")); + awaybutton = + gtk_check_button_new_with_label(_ + ("Import away messages")); + okbutton = gtk_button_new_from_stock(GTK_STOCK_OK); cancelbutton = gtk_button_new_from_stock(GTK_STOCK_CANCEL); hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), okbutton, FALSE, FALSE, 2); - gtk_box_pack_start(GTK_BOX(hbox), cancelbutton, FALSE, FALSE, 2); + gtk_box_pack_start(GTK_BOX(hbox), cancelbutton, FALSE, FALSE, + 2); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 2); - gtk_box_pack_start(GTK_BOX(vbox), accountsbutton, FALSE, FALSE, 2); - gtk_box_pack_start(GTK_BOX(vbox), contactsbutton, FALSE, FALSE, 2); + gtk_box_pack_start(GTK_BOX(vbox), accountsbutton, FALSE, FALSE, + 2); + gtk_box_pack_start(GTK_BOX(vbox), contactsbutton, FALSE, FALSE, + 2); gtk_box_pack_start(GTK_BOX(vbox), prefsbutton, FALSE, FALSE, 2); gtk_box_pack_start(GTK_BOX(vbox), awaybutton, FALSE, FALSE, 2); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2); - - gtk_container_add (GTK_CONTAINER(window), vbox); - g_signal_connect(okbutton, "clicked", G_CALLBACK(ok_callback), NULL); - g_signal_connect(cancelbutton, "clicked", G_CALLBACK(cancel_callback), NULL); - g_signal_connect(window, "destroy", G_CALLBACK(destroy_callback), NULL); - + + gtk_container_add(GTK_CONTAINER(window), vbox); + g_signal_connect(okbutton, "clicked", G_CALLBACK(ok_callback), + NULL); + g_signal_connect(cancelbutton, "clicked", + G_CALLBACK(cancel_callback), NULL); + g_signal_connect(window, "destroy", + G_CALLBACK(destroy_callback), NULL); + gtk_widget_show(vbox); gtk_widget_show(hbox); gtk_widget_show(accountsbutton); Index: import_gaim.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/importers/import_gaim.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import_gaim.c 27 Jul 2009 16:42:03 -0000 1.11 +++ import_gaim.c 17 Sep 2009 12:04:58 -0000 1.12 @@ -38,62 +38,67 @@ #include "plugin_api.h" #include "messages.h" - /************************************************************************************* * Begin Module Code ************************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info import_gaim_LTX_plugin_info - #define plugin_init import_gaim_LTX_plugin_init - #define plugin_finish import_gaim_LTX_plugin_finish - #define module_version import_gaim_LTX_module_version +#define plugin_info import_gaim_LTX_plugin_info +#define plugin_init import_gaim_LTX_plugin_init +#define plugin_finish import_gaim_LTX_plugin_finish +#define module_version import_gaim_LTX_module_version #endif - /* Function Prototypes */ void import_gaim_accounts(ebmCallbackData *data); int plugin_init(); int plugin_finish(); -static int ref_count=0; +static int ref_count = 0; /* Module Exports */ PLUGIN_INFO plugin_info = { - PLUGIN_IMPORTER, - "Gaim Buddy List", - "Imports your Gaim buddy list into Ayttm", + PLUGIN_IMPORTER, + "Gaim Buddy List", + "Imports your Gaim buddy list into Ayttm", "$Revision$", "$Date$", &ref_count, plugin_init, plugin_finish }; + /* End Module Exports */ -static void *buddy_list_tag=NULL; +static void *buddy_list_tag = NULL; -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} int plugin_init() { - eb_debug(DBG_MOD,"Gaim Buddy List init\n"); - buddy_list_tag=eb_add_menu_item("Gaim Buddy List", EB_IMPORT_MENU, import_gaim_accounts, ebmIMPORTDATA, NULL); - if(!buddy_list_tag) - return(-1); - return(0); + eb_debug(DBG_MOD, "Gaim Buddy List init\n"); + buddy_list_tag = + eb_add_menu_item("Gaim Buddy List", EB_IMPORT_MENU, + import_gaim_accounts, ebmIMPORTDATA, NULL); + if (!buddy_list_tag) + return (-1); + return (0); } int plugin_finish() { int result; - result=eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); - if(result) { - g_warning("Unable to remove Gaim Buddy List menu item from import menu!"); - return(-1); + result = eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); + if (result) { + g_warning + ("Unable to remove Gaim Buddy List menu item from import menu!"); + return (-1); } - return(0); + return (0); } /******************************************************************************* @@ -102,54 +107,55 @@ void import_gaim_accounts(ebmCallbackData *data) { - gchar buff[1024]; - gchar c[1024]; - gchar group[1024]; - gchar *fname = NULL; + gchar buff[1024]; + gchar c[1024]; + gchar group[1024]; + gchar *fname = NULL; gchar *handle = NULL; - FILE * fp; - - gint AIM_ID=-1; - g_snprintf(buff, 1024, "%s/gaim.buddy", getenv("HOME")); - if( !(fp = fopen(buff, "r")) ) { - g_snprintf(c, 1024, "Unable to import gaim accounts from %s: %s", buff, strerror(errno)); - ay_do_error( "Import Error", c ); - return; - } - AIM_ID=get_service_id("AIM"); - while(!feof(fp)) - { - fgets(c, 1024, fp); - g_strchomp(c); - if (*c == 'g') { - strncpy(group,c+2, 1024); - if(!find_grouplist_by_name(group)) - { - add_group(group); - } - } else if (*c == 'b') { - handle = c+2; - if (strchr(handle,':')) { - fname = strchr(handle,':') + 1; - *(strchr(handle,':')) = '\0'; + FILE *fp; + + gint AIM_ID = -1; + g_snprintf(buff, 1024, "%s/gaim.buddy", getenv("HOME")); + if (!(fp = fopen(buff, "r"))) { + g_snprintf(c, 1024, + "Unable to import gaim accounts from %s: %s", buff, + strerror(errno)); + ay_do_error("Import Error", c); + return; + } + AIM_ID = get_service_id("AIM"); + while (!feof(fp)) { + fgets(c, 1024, fp); + g_strchomp(c); + if (*c == 'g') { + strncpy(group, c + 2, 1024); + if (!find_grouplist_by_name(group)) { + add_group(group); + } + } else if (*c == 'b') { + handle = c + 2; + if (strchr(handle, ':')) { + fname = strchr(handle, ':') + 1; + *(strchr(handle, ':')) = '\0'; + } else + fname = handle; + + if (!find_account_by_handle(handle, AIM_ID)) { + eb_account *ea = + eb_services[AIM_ID].sc-> + new_account(NULL, handle); + add_account(fname, ea); + move_contact(group, + find_contact_by_nick(fname)); + } + } else if (*c == 'p') { + /*no need */ + } else if (*c == 'd') { + /*no need */ + } else if (*c == 'm') { + /*no need */ } - else - fname = handle; - - if(!find_account_by_handle(handle, AIM_ID)) - { - eb_account * ea = eb_services[AIM_ID].sc->new_account(NULL,handle); - add_account( fname, ea ); - move_contact (group, find_contact_by_nick(fname)); - } - } else if (*c == 'p') { - /*no need*/ - } else if (*c == 'd') { - /*no need*/ - } else if (*c == 'm') { - /*no need*/ - } - } - fclose(fp); - ay_do_info( "Import", "Successfully imported gaim BuddyList" ); + } + fclose(fp); + ay_do_info("Import", "Successfully imported gaim BuddyList"); } Index: import_gnomeicu.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/importers/import_gnomeicu.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import_gnomeicu.c 27 Jul 2009 16:42:03 -0000 1.9 +++ import_gnomeicu.c 17 Sep 2009 12:04:58 -0000 1.10 @@ -38,61 +38,67 @@ #include "plugin_api.h" #include "messages.h" - /******************************************************************************* * Begin Module Code ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info import_gnomeicu_LTX_plugin_info - #define plugin_init import_gnomeicu_LTX_plugin_init - #define plugin_finish import_gnomeicu_LTX_plugin_finish - #define module_version import_gnomeicu_LTX_module_version +#define plugin_info import_gnomeicu_LTX_plugin_info +#define plugin_init import_gnomeicu_LTX_plugin_init +#define plugin_finish import_gnomeicu_LTX_plugin_finish +#define module_version import_gnomeicu_LTX_module_version #endif - /* Function Prototypes */ void import_gnomeicu_accounts(ebmCallbackData *data); int plugin_init(); int plugin_finish(); -static int ref_count=0; +static int ref_count = 0; /* Module Exports */ PLUGIN_INFO plugin_info = { - PLUGIN_IMPORTER, - "GnomeICU Contact List", - "Imports your GnomeICU contact list into Ayttm", + PLUGIN_IMPORTER, + "GnomeICU Contact List", + "Imports your GnomeICU contact list into Ayttm", "$Revision$", "$Date$", &ref_count, plugin_init, plugin_finish }; + /* End Module Exports */ -static void *buddy_list_tag=NULL; +static void *buddy_list_tag = NULL; + +unsigned int module_version() +{ + return CORE_VERSION; +} -unsigned int module_version() {return CORE_VERSION;} int plugin_init() { eb_debug(DBG_MOD, "GnomeICU Contact List init\n"); - buddy_list_tag=eb_add_menu_item("GnomeICU Contact List", EB_IMPORT_MENU, import_gnomeicu_accounts, ebmIMPORTDATA, NULL); - if(!buddy_list_tag) - return(-1); - return(0); + buddy_list_tag = + eb_add_menu_item("GnomeICU Contact List", EB_IMPORT_MENU, + import_gnomeicu_accounts, ebmIMPORTDATA, NULL); + if (!buddy_list_tag) + return (-1); + return (0); } int plugin_finish() { int result; - result=eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); - if(result) { - g_warning("Unable to remove GnomeICU Contact List menu item from import menu!"); - return(-1); + result = eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); + if (result) { + g_warning + ("Unable to remove GnomeICU Contact List menu item from import menu!"); + return (-1); } - return(0); + return (0); } /******************************************************************************* @@ -101,63 +107,61 @@ void import_gnomeicu_accounts(ebmCallbackData *data) { - gchar buff[1024]; - gchar c[1024]; - gchar ** tokens = NULL; - gchar * uin = NULL, * nick = NULL; - gint ICQ_ID=-1; - FILE * fp; - - g_snprintf(buff, 1024, "%s/.gnome/GnomeICU", getenv("HOME")); - if( !(fp = fopen(buff, "r")) ) { - g_snprintf(c, 1024, "Unable to import GnomeICU accounts from %s: %s", buff, strerror(errno)); - ay_do_error( "Import Error", c ); - return; - } - ICQ_ID=get_service_id("ICQ"); - while(!feof(fp)) - { + gchar buff[1024]; + gchar c[1024]; + gchar **tokens = NULL; + gchar *uin = NULL, *nick = NULL; + gint ICQ_ID = -1; + FILE *fp; + + g_snprintf(buff, 1024, "%s/.gnome/GnomeICU", getenv("HOME")); + if (!(fp = fopen(buff, "r"))) { + g_snprintf(c, 1024, + "Unable to import GnomeICU accounts from %s: %s", buff, + strerror(errno)); + ay_do_error("Import Error", c); + return; + } + ICQ_ID = get_service_id("ICQ"); + while (!feof(fp)) { fgets(c, 1024, fp); g_strchomp(c); - if(!g_strncasecmp( c, "[NewContacts]", strlen("[NewContacts]")+1)) + if (!g_strncasecmp(c, "[NewContacts]", + strlen("[NewContacts]") + 1)) break; } - if(feof(fp)) - { + if (feof(fp)) { fclose(fp); - ay_do_warning( "Import Warning", "No GnomeICU contacts added" ); + ay_do_warning("Import Warning", "No GnomeICU contacts added"); return; } - if(!find_grouplist_by_name("GnomeICU Users")) + if (!find_grouplist_by_name("GnomeICU Users")) add_group("GnomeICU Users"); - while(!feof(fp)) - { - fgets(c, 1024, fp); - if(feof(fp)) + while (!feof(fp)) { + fgets(c, 1024, fp); + if (feof(fp)) break; - g_strchomp(c); + g_strchomp(c); - tokens = g_strsplit(c,"=",2); - uin = *tokens; - nick = *(tokens+1); - - if(find_account_by_handle(uin, ICQ_ID)) - { - continue; - } - if(!find_contact_by_nick(nick)) - { - add_new_contact( "GnomeICU Users", nick, ICQ_ID ); - } - if(!find_account_by_handle(uin, ICQ_ID)) - { - eb_account * ea = eb_services[ICQ_ID].sc->new_account(NULL,uin); - ea->service_id = ICQ_ID; - add_account( nick, ea ); + tokens = g_strsplit(c, "=", 2); + uin = *tokens; + nick = *(tokens + 1); + + if (find_account_by_handle(uin, ICQ_ID)) { + continue; + } + if (!find_contact_by_nick(nick)) { + add_new_contact("GnomeICU Users", nick, ICQ_ID); + } + if (!find_account_by_handle(uin, ICQ_ID)) { + eb_account *ea = + eb_services[ICQ_ID].sc->new_account(NULL, uin); + ea->service_id = ICQ_ID; + add_account(nick, ea); // RUN_SERVICE(ea)->add_user(ea); - } - g_strfreev (tokens); - } + } + g_strfreev(tokens); + } fclose(fp); - ay_do_info( "Import", "Successfully GnomeICU contacts list" ); + ay_do_info("Import", "Successfully GnomeICU contacts list"); } Index: importicq.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/importers/importicq.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- importicq.c 27 Jul 2009 16:42:03 -0000 1.9 +++ importicq.c 17 Sep 2009 12:04:58 -0000 1.10 @@ -21,7 +21,7 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#include <fcntl.h> +#include <fcntl.h> #include <gtk/gtk.h> #include <string.h> #ifdef __MINGW32__ @@ -41,23 +41,25 @@ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info importicq_LTX_plugin_info - #define module_version importicq_LTX_module_version +#define plugin_info importicq_LTX_plugin_info +#define module_version importicq_LTX_module_version #endif - /* Function Prototypes */ static int plugin_init(); static int plugin_finish(); -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} -static int ref_count=0; +static int ref_count = 0; /* Module Exports */ PLUGIN_INFO plugin_info = { - PLUGIN_IMPORTER, - "ICQ99 Contact List", - "Imports your ICQ99 contact list into Ayttm", + PLUGIN_IMPORTER, + "ICQ99 Contact List", + "Imports your ICQ99 contact list into Ayttm", "$Revision$", "$Date$", &ref_count, @@ -94,7 +96,7 @@ #define USERS_DATA 2000 #define LAST_FOLDER 998 -#define IGNORE_FOLDER 999 /*own definition */ +#define IGNORE_FOLDER 999 /*own definition */ #define FIRST_IDX 0 #define NEXT_IDX 1 @@ -108,29 +110,32 @@ guint32 uin; }; -static void import_icq99_contacts(ebmCallbackData * data); +static void import_icq99_contacts(ebmCallbackData *data); -static void *buddy_list_tag=NULL; +static void *buddy_list_tag = NULL; static int plugin_init() { - eb_debug(DBG_MOD,"ICQ99 Contact List init\n"); - buddy_list_tag=eb_add_menu_item("ICQ99 Contact List", EB_IMPORT_MENU, import_icq99_contacts, ebmIMPORTDATA, NULL); - if(!buddy_list_tag) - return(-1); - return(0); + eb_debug(DBG_MOD, "ICQ99 Contact List init\n"); + buddy_list_tag = + eb_add_menu_item("ICQ99 Contact List", EB_IMPORT_MENU, + import_icq99_contacts, ebmIMPORTDATA, NULL); + if (!buddy_list_tag) + return (-1); + return (0); } static int plugin_finish() { int result; - result=eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); - if(result) { - g_warning("Unable to remove ICQ99 Contact List menu item from import menu!"); - return(-1); + result = eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); + if (result) { + g_warning + ("Unable to remove ICQ99 Contact List menu item from import menu!"); + return (-1); } - return(0); + return (0); } /******************************************************************************* @@ -139,276 +144,273 @@ static int wrong_type(struct idxEntry *entry, long type) { - if(type==USERS_DATA) - { - if(entry->dat_number > type) - return 0; - } - else - { - if(entry->dat_number == type) - return 0; - } - return 1; + if (type == USERS_DATA) { + if (entry->dat_number > type) + return 0; + } else { + if (entry->dat_number == type) + return 0; + } + return 1; } -gint find_idx_entry(int handle, struct idxEntry * entry,guint32 type, gint mode) +gint find_idx_entry(int handle, struct idxEntry *entry, guint32 type, gint mode) { - if(mode==FIRST_IDX) - lseek(handle,225,SEEK_SET); - else - { - if(entry->next !=-1) - lseek(handle,entry->next,SEEK_SET); - entry->dat_number=0; - } - while(wrong_type(entry, type) && (entry->next != -1)) - { - read(handle, entry, 20); - while(entry->status != -2 && (entry->next != -1)) - { - read(handle, entry, 20); - if(entry->next !=-1) - lseek(handle,entry->next,SEEK_SET); + if (mode == FIRST_IDX) + lseek(handle, 225, SEEK_SET); + else { + if (entry->next != -1) + lseek(handle, entry->next, SEEK_SET); + entry->dat_number = 0; + } + while (wrong_type(entry, type) && (entry->next != -1)) { + read(handle, entry, 20); + while (entry->status != -2 && (entry->next != -1)) { + read(handle, entry, 20); + if (entry->next != -1) + lseek(handle, entry->next, SEEK_SET); } - if(entry->next !=-1) - lseek(handle,entry->next,SEEK_SET); + if (entry->next != -1) + lseek(handle, entry->next, SEEK_SET); } - if(!wrong_type(entry,type) && (entry->next == -1)) + if (!wrong_type(entry, type) && (entry->next == -1)) return -1; else return 1; } + void pass_strings(int handle, guint32 number, gint loop_pre_inc, gint post_inc) { - guint16 length, i; - for(i=0;i<number;i++) - { - lseek(handle,loop_pre_inc, SEEK_CUR); - read(handle, &length, 2); /*get the length of the string*/ - lseek(handle,length, SEEK_CUR); + guint16 length, i; + for (i = 0; i < number; i++) { + lseek(handle, loop_pre_inc, SEEK_CUR); + read(handle, &length, 2); /*get the length of the string */ + lseek(handle, length, SEEK_CUR); } - lseek(handle,post_inc, SEEK_CUR); + lseek(handle, post_inc, SEEK_CUR); } -void parse_my_details(int dat, struct my_details * my_details) + +void parse_my_details(int dat, struct my_details *my_details) { guint8 property_value; guint32 length; - lseek(dat,0x2a,SEEK_CUR); /*step to number of vaw entries 47*/ - read(dat,&length,4); - pass_strings(dat,length,10,40); - read(dat,&length,4); - for(;length>0;length--) - { - pass_strings(dat,1,0,0); - read(dat,&property_value,1); - switch (property_value) - { - case 'e': - lseek(dat,1,SEEK_CUR); - break; - case 'f': - case 'k': - lseek(dat,2,SEEK_CUR); - break; - case 'h': - case 'i': - lseek(dat,4,SEEK_CUR); - break; - default: - eb_debug(DBG_MOD,"oh-oh....we haven't seen this one before!\n"); - break; + lseek(dat, 0x2a, SEEK_CUR); /*step to number of vaw entries 47 */ + read(dat, &length, 4); + pass_strings(dat, length, 10, 40); + read(dat, &length, 4); + for (; length > 0; length--) { + pass_strings(dat, 1, 0, 0); + read(dat, &property_value, 1); + switch (property_value) { + case 'e': + lseek(dat, 1, SEEK_CUR); + break; + case 'f': + case 'k': + lseek(dat, 2, SEEK_CUR); + break; + case 'h': + case 'i': + lseek(dat, 4, SEEK_CUR); + break; + default: + eb_debug(DBG_MOD, + "oh-oh....we haven't seen this one before!\n"); + break; } } - read(dat,&length,2); - if(length==0) - my_details->user_name[0]='\0'; - read(dat,&my_details->user_name,length); - read(dat,&length,2); - if(length==0) - my_details->nick_name[0]='\0'; - read(dat,&my_details->nick_name,length); - pass_strings(dat,3,0,0); /*step over, first name, last name and primary e-mail*/ - read(dat,&my_details->uin,4); - lseek(dat,15,SEEK_CUR); /*gender, country and age*/ - pass_strings(dat,6,0,12); /*step over city, state, add. text, homepage, home phone, notes, zip code*/ - read(dat,&length,4); /*number of phonebook entries*/ - for(;length>0;length--) - { - pass_strings(dat,4,0,2); - pass_strings(dat,1,0,0); - } - lseek(dat,14,SEEK_CUR); /*unused and timestamp of my details*/ - pass_strings(dat,2,0,18); /*secondary and old e-mail, birth data, languages spoken*/ - pass_strings(dat,3,0,4); /*home address, fax and cellular*/ - pass_strings(dat,1,0,5); /*company, occupation*/ - pass_strings(dat,5,0,8); /*company position name and address, company zip and country*/ - pass_strings(dat,4,0,2); /*work phone fax and URL and past bkg*/ - pass_strings(dat,1,0,2); /*past bkg 2*/ - pass_strings(dat,1,0,2); /*past bkg 3*/ - pass_strings(dat,1,0,2); /*Affiliation*/ - pass_strings(dat,1,0,2); /*Affiliation 2*/ - pass_strings(dat,1,0,22); /*Affiliation 3*/ - pass_strings(dat,1,0,2); /*interest keyword*/ - pass_strings(dat,1,0,2); /*interest keyword 2*/ - pass_strings(dat,1,0,2); /*interest keyword 3*/ - pass_strings(dat,1,0,42); /*interest keyword 4*/ - -} -static gint icq_get_groups(int idx, int dat,struct groups group_array[], struct my_details * my_details) -{ - struct idxEntry entry={0,0,0,0,0}; - guint32 length=0; - guint16 i, group_length; - - if(!find_idx_entry(idx,&entry, MY_DETAILS,FIRST_IDX)) - { - eb_debug(DBG_MOD,"Can't find my details\n"); + read(dat, &length, 2); + if (length == 0) + my_details->user_name[0] = '\0'; + read(dat, &my_details->user_name, length); + read(dat, &length, 2); + if (length == 0) + my_details->nick_name[0] = '\0'; + read(dat, &my_details->nick_name, length); + pass_strings(dat, 3, 0, 0); /*step over, first name, last name and primary e-mail */ + read(dat, &my_details->uin, 4); + lseek(dat, 15, SEEK_CUR); /*gender, country and age */ + pass_strings(dat, 6, 0, 12); /*step over city, state, add. text, homepage, home phone, notes, zip code */ + read(dat, &length, 4); /*number of phonebook entries */ + for (; length > 0; length--) { + pass_strings(dat, 4, 0, 2); + pass_strings(dat, 1, 0, 0); + } + lseek(dat, 14, SEEK_CUR); /*unused and timestamp of my details */ + pass_strings(dat, 2, 0, 18); /*secondary and old e-mail, birth data, languages spoken */ + pass_strings(dat, 3, 0, 4); /*home address, fax and cellular */ + pass_strings(dat, 1, 0, 5); /*company, occupation */ + pass_strings(dat, 5, 0, 8); /*company position name and address, company zip and country */ + pass_strings(dat, 4, 0, 2); /*work phone fax and URL and past bkg */ + pass_strings(dat, 1, 0, 2); /*past bkg 2 */ + pass_strings(dat, 1, 0, 2); /*past bkg 3 */ + pass_strings(dat, 1, 0, 2); /*Affiliation */ + pass_strings(dat, 1, 0, 2); /*Affiliation 2 */ + pass_strings(dat, 1, 0, 22); /*Affiliation 3 */ + pass_strings(dat, 1, 0, 2); /*interest keyword */ + pass_strings(dat, 1, 0, 2); /*interest keyword 2 */ + pass_strings(dat, 1, 0, 2); /*interest keyword 3 */ + pass_strings(dat, 1, 0, 42); /*interest keyword 4 */ + +} + +static gint icq_get_groups(int idx, int dat, struct groups group_array[], + struct my_details *my_details) +{ + struct idxEntry entry = { 0, 0, 0, 0, 0 }; + guint32 length = 0; + guint16 i, group_length; + + if (!find_idx_entry(idx, &entry, MY_DETAILS, FIRST_IDX)) { + eb_debug(DBG_MOD, "Can't find my details\n"); return 0; } - lseek(dat,entry.dat_offset,SEEK_SET); - lseek(dat,12,SEEK_CUR); - read(dat,&length,1); - if(length!=0xe4) + lseek(dat, entry.dat_offset, SEEK_SET); + lseek(dat, 12, SEEK_CUR); + read(dat, &length, 1); + if (length != 0xe4) return 0; - - lseek(dat,29,SEEK_CUR); - parse_my_details(dat,my_details); - pass_strings(dat,1,0,18); /*PASSWORD!*/ - pass_strings(dat,3,0,21); /*???*/ - read(dat,&length,4); - for(i=0;length>0;length--) - { - read(dat,&group_array[i].number,4); - read(dat,&group_length,2); - read(dat,group_array[i].name,group_length); - lseek(dat,6,SEEK_CUR); /*unused and open/closed flag*/ + + lseek(dat, 29, SEEK_CUR); + parse_my_details(dat, my_details); + pass_strings(dat, 1, 0, 18); /*PASSWORD! */ + pass_strings(dat, 3, 0, 21); /*??? */ + read(dat, &length, 4); + for (i = 0; length > 0; length--) { + read(dat, &group_array[i].number, 4); + read(dat, &group_length, 2); + read(dat, group_array[i].name, group_length); + lseek(dat, 6, SEEK_CUR); /*unused and open/closed flag */ i++; } - group_array[i].number=IGNORE_FOLDER; - memcpy(group_array[i++].name,"Ignore\0",sizeof("Ignore\0")); - group_array[i].number=LAST_FOLDER; - group_array[i++].name[0]=0; - return 1; + group_array[i].number = IGNORE_FOLDER; + memcpy(group_array[i++].name, "Ignore\0", sizeof("Ignore\0")); + group_array[i].number = LAST_FOLDER; + group_array[i++].name[0] = 0; + return 1; } -char * match_group(struct groups groupies[], struct my_details * my_details) +char *match_group(struct groups groupies[], struct my_details *my_details) { - gint i=0; - while((groupies[i].number!=LAST_FOLDER) && (groupies[i].number!=my_details->folder)) + gint i = 0; + while ((groupies[i].number != LAST_FOLDER) + && (groupies[i].number != my_details->folder)) i++; return groupies[i].name; } -guint32 get_contact(int idx, int dat,struct groups groups[], struct my_details * my_details, struct idxEntry *entry) +guint32 get_contact(int idx, int dat, struct groups groups[], + struct my_details *my_details, struct idxEntry *entry) { - gchar* group_name; - guint8 type,i=0; - guint32 stored, folder, magic; - - if(my_details->uin==0) - find_idx_entry(idx,entry, USERS_DATA, FIRST_IDX); + gchar *group_name; + guint8 type, i = 0; + guint32 stored, folder, magic; + + if (my_details->uin == 0) + find_idx_entry(idx, entry, USERS_DATA, FIRST_IDX); else - find_idx_entry(idx,entry, USERS_DATA, NEXT_IDX); - while(entry->next!=-1) - { - lseek(dat,entry->dat_offset,SEEK_SET); - lseek(dat,4,SEEK_CUR); - read(dat,&stored,4); - if((stored==1) || (stored==2)) - { - lseek(dat,4,SEEK_CUR); - read(dat,&type,1); - if(type==0xe5) - { - lseek(dat,21,SEEK_CUR); - read(dat,&magic,4); /*status flag, 5==deleted???*/ - if((magic==2) || (magic==3) || (magic==12)) - { - read(dat,&folder,4); - my_details->folder=((stored==1)?folder:IGNORE_FOLDER); - parse_my_details(dat,my_details); - while((groups[i].number!=LAST_FOLDER) && (groups[i].number!=my_details->folder)) { + find_idx_entry(idx, entry, USERS_DATA, NEXT_IDX); + while (entry->next != -1) { + lseek(dat, entry->dat_offset, SEEK_SET); + lseek(dat, 4, SEEK_CUR); + read(dat, &stored, 4); + if ((stored == 1) || (stored == 2)) { + lseek(dat, 4, SEEK_CUR); + read(dat, &type, 1); + if (type == 0xe5) { + lseek(dat, 21, SEEK_CUR); + read(dat, &magic, 4); /*status flag, 5==deleted??? */ + if ((magic == 2) || (magic == 3) + || (magic == 12)) { + read(dat, &folder, 4); + my_details->folder = + ((stored == + 1) ? folder : + IGNORE_FOLDER); + parse_my_details(dat, my_details); + while ((groups[i].number != LAST_FOLDER) + && (groups[i].number != + my_details->folder)) { i++; } - - group_name=groups[i].name; - i=0; - while(group_name!=0 && i<30) { - my_details->group[i++]=*group_name++; + + group_name = groups[i].name; + i = 0; + while (group_name != 0 && i < 30) { + my_details->group[i++] = + *group_name++; } - my_details->group[i++]=0; + my_details->group[i++] = 0; return 1; - } + } } } - find_idx_entry(idx,entry, USERS_DATA,NEXT_IDX); + find_idx_entry(idx, entry, USERS_DATA, NEXT_IDX); } return entry->next; -} - +} -void import_icq99_ok( GtkFileChooser *fs ) +void import_icq99_ok(GtkFileChooser *fs) { - char * selected, *fileext, uin[11]; - gint dat,idx; + char *selected, *fileext, uin[11]; + gint dat, idx; struct groups *groups_ptr; - struct my_details contact; - struct idxEntry entry={0,0,0,0,0}; - eb_account * ea; - gint ICQ_ID=-1; - - ICQ_ID=get_service_id("ICQ"); + struct my_details contact; + struct idxEntry entry = { 0, 0, 0, 0, 0 }; + eb_account *ea; + gint ICQ_ID = -1; + + ICQ_ID = get_service_id("ICQ"); // Is there an ICQ service loaded? - if(ICQ_ID < 0) { + if (ICQ_ID < 0) { return; } - selected=(char *)gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fs)); - - fileext=strrchr(selected,'.'); - if(!fileext || strlen(fileext) !=3) + selected = (char *)gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)); + + fileext = strrchr(selected, '.'); + if (!fileext || strlen(fileext) != 3) return; - memcpy(fileext,".idx",4); - if( (idx = open(selected, O_RDONLY)) == -1 ) + memcpy(fileext, ".idx", 4); + if ((idx = open(selected, O_RDONLY)) == -1) return; - memcpy(fileext,".dat",4); - if( (dat = open(selected, O_RDONLY)) == -1 ) + memcpy(fileext, ".dat", 4); + if ((dat = open(selected, O_RDONLY)) == -1) return; - groups_ptr=g_malloc(sizeof(groups)*50); + groups_ptr = g_malloc(sizeof(groups) * 50); icq_get_groups(idx, dat, groups_ptr, &contact); - contact.uin=0; - while(get_contact(idx, dat, groups_ptr, &contact, &entry)!=-1) - { - g_snprintf(uin,11,"%i",contact.uin); - if(!find_grouplist_by_name(contact.group)) + contact.uin = 0; + while (get_contact(idx, dat, groups_ptr, &contact, &entry) != -1) { + g_snprintf(uin, 11, "%i", contact.uin); + if (!find_grouplist_by_name(contact.group)) add_group(contact.group); - if(find_account_by_handle(uin, ICQ_ID)) + if (find_account_by_handle(uin, ICQ_ID)) continue; - if((!find_contact_by_nick(contact.nick_name)) && (!find_contact_by_nick(contact.user_name))) - { - if(contact.nick_name[0]!=0) - add_new_contact(contact.group, contact.nick_name, ICQ_ID ); - else - { - if(contact.user_name[0]==0) - memcpy(contact.user_name,"NoName",7); - add_new_contact(contact.group, contact.user_name, ICQ_ID ); + if ((!find_contact_by_nick(contact.nick_name)) + && (!find_contact_by_nick(contact.user_name))) { + if (contact.nick_name[0] != 0) + add_new_contact(contact.group, + contact.nick_name, ICQ_ID); + else { + if (contact.user_name[0] == 0) + memcpy(contact.user_name, "NoName", 7); + add_new_contact(contact.group, + contact.user_name, ICQ_ID); } } - ea = eb_services[ICQ_ID].sc->new_account(NULL,uin); - - if(find_contact_by_nick(contact.user_name)) - add_account( contact.user_name, ea ); + ea = eb_services[ICQ_ID].sc->new_account(NULL, uin); + + if (find_contact_by_nick(contact.user_name)) + add_account(contact.user_name, ea); else - add_account( contact.nick_name, ea ); - + add_account(contact.nick_name, ea); + // RUN_SERVICE(ea)->add_user(ea); } - update_contact_list (); + update_contact_list(); write_contact_list(); g_free(groups_ptr); close(idx); @@ -417,19 +419,17 @@ void import_icq99_contacts(ebmCallbackData *data) { - GtkWidget *filew; + GtkWidget *filew; - filew = gtk_file_chooser_dialog_new ("ICQ99 IDX file to import", - NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL); - - if(gtk_dialog_run(GTK_DIALOG(filew)) == GTK_RESPONSE_ACCEPT) { - import_icq99_ok(GTK_FILE_CHOOSER(filew)); - } + filew = gtk_file_chooser_dialog_new("ICQ99 IDX file to import", + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - gtk_widget_destroy(filew); -} + if (gtk_dialog_run(GTK_DIALOG(filew)) == GTK_RESPONSE_ACCEPT) { + import_icq99_ok(GTK_FILE_CHOOSER(filew)); + } + gtk_widget_destroy(filew); +} Index: importlicq.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/importers/importlicq.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- importlicq.c 27 Jul 2009 16:42:03 -0000 1.8 +++ importlicq.c 17 Sep 2009 12:04:58 -0000 1.9 @@ -38,61 +38,65 @@ #include "service.h" #include "messages.h" - /******************************************************************************* * Begin Module Code ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info importlicq_LTX_plugin_info - #define module_version importlicq_LTX_module_version +#define plugin_info importlicq_LTX_plugin_info +#define module_version importlicq_LTX_module_version #endif - /* Function Prototypes */ void import_licq_accounts(ebmCallbackData *data); static int plugin_init(); static int plugin_finish(); -unsigned int module_version() {return CORE_VERSION;} - +unsigned int module_version() +{ + return CORE_VERSION; +} -static int ref_count=0; +static int ref_count = 0; /* Module Exports */ PLUGIN_INFO plugin_info = { - PLUGIN_IMPORTER, - "Licq Contact List", - "Imports your Licq contact list into Ayttm", + PLUGIN_IMPORTER, + "Licq Contact List", + "Imports your Licq contact list into Ayttm", "$Revision$", "$Date$", &ref_count, plugin_init, plugin_finish }; + /* End Module Exports */ -static void *buddy_list_tag=NULL; +static void *buddy_list_tag = NULL; static int plugin_init() { - eb_debug(DBG_MOD,"Licq Contact List init\n"); - buddy_list_tag=eb_add_menu_item("Licq Contact List", EB_IMPORT_MENU, import_licq_accounts, ebmIMPORTDATA, NULL); - if(!buddy_list_tag) - return(-1); - return(0); + eb_debug(DBG_MOD, "Licq Contact List init\n"); + buddy_list_tag = + eb_add_menu_item("Licq Contact List", EB_IMPORT_MENU, + import_licq_accounts, ebmIMPORTDATA, NULL); + if (!buddy_list_tag) + return (-1); + return (0); } static int plugin_finish() { int result; - result=eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); - if(result) { - g_warning("Unable to remove Licq Contact List menu item from import menu!"); - return(-1); + result = eb_remove_menu_item(EB_IMPORT_MENU, buddy_list_tag); + if (result) { + g_warning + ("Unable to remove Licq Contact List menu item from import menu!"); + return (-1); } - return(0); + return (0); } /******************************************************************************* @@ -100,144 +104,140 @@ ******************************************************************************/ /* Removes the spaces surrounding a token */ -char* remove_spaces(char* token) +char *remove_spaces(char *token) { - g_strchomp(token); /* Remove spaces at the end */ - while (*token == ' ') token++; /* Remove spaces at the beginning */ - return token; + g_strchomp(token); /* Remove spaces at the end */ + while (*token == ' ') + token++; /* Remove spaces at the beginning */ + return token; } /* Gets your nickname for an licq buddy */ -char* get_licq_nick(const char* uin, int licq_version) +char *get_licq_nick(const char *uin, int licq_version) { - gchar buff[1024]; - static gchar c[1024]; - FILE *fp; - char *token, *nick; - - g_snprintf(buff, 1024, "%s/.licq/%s/%s.uin", getenv("HOME"), - (licq_version < 7 ? "conf" : "users"), uin); - if (!(fp = fopen(buff, "r"))) - return NULL; - - while (!feof(fp)) - { - fgets(c, 1024, fp); - token = remove_spaces(strtok(c, "=")); - if (g_strcasecmp(token, "Alias")) - continue; - - nick = remove_spaces(strtok(NULL, "=")); - fclose(fp); - return nick; - } - fclose(fp); - return NULL; + gchar buff[1024]; + static gchar c[1024]; + FILE *fp; + char *token, *nick; + + g_snprintf(buff, 1024, "%s/.licq/%s/%s.uin", getenv("HOME"), + (licq_version < 7 ? "conf" : "users"), uin); + if (!(fp = fopen(buff, "r"))) + return NULL; + + while (!feof(fp)) { + fgets(c, 1024, fp); + token = remove_spaces(strtok(c, "=")); + if (g_strcasecmp(token, "Alias")) + continue; + + nick = remove_spaces(strtok(NULL, "=")); + fclose(fp); + return nick; + } + fclose(fp); + return NULL; } - /* Imports licq accounts * Supports newer and older contact list formats (0.7x and 0.6x) */ void import_licq_accounts(ebmCallbackData *data) { - gchar group_name[] = "Licq Users"; - int num_users; - int unused_num; - int licq_version; - int ICQ_ID=-1; - - gchar c[1024], msg[1024]; - char *nick, *uin, *token; - - FILE *fp; - - ICQ_ID=get_service_id("ICQ"); - - g_snprintf(c, 1024, "%s/.licq/users.conf", getenv("HOME")); - if ((fp = fopen(c, "r"))) - licq_version = 7; - else - { - g_snprintf(c, 1024, "%s/.licq/conf/users.conf", getenv("HOME")); - if (!(fp = fopen(c, "r"))) { - g_snprintf(msg, 1024, "Unable to import licq accounts from neither %s/.licq/users.conf, nor %s\n", getenv("HOME"), c); - ay_do_error( "Import Error", msg ); - return; + gchar group_name[] = "Licq Users"; + int num_users; + int unused_num; + int licq_version; + int ICQ_ID = -1; + + gchar c[1024], msg[1024]; + char *nick, *uin, *token; + + FILE *fp; + + ICQ_ID = get_service_id("ICQ"); + + g_snprintf(c, 1024, "%s/.licq/users.conf", getenv("HOME")); + if ((fp = fopen(c, "r"))) + licq_version = 7; + else { + g_snprintf(c, 1024, "%s/.licq/conf/users.conf", getenv("HOME")); + if (!(fp = fopen(c, "r"))) { + g_snprintf(msg, 1024, + "Unable to import licq accounts from neither %s/.licq/users.conf, nor %s\n", + getenv("HOME"), c); + ay_do_error("Import Error", msg); + return; } - licq_version = 6; - } + licq_version = 6; + } + + while (!feof(fp)) { + fgets(c, 1024, fp); + token = remove_spaces(c); + if (!g_strcasecmp(token, "[users]")) + break; + } + if (feof(fp)) { + fclose(fp); + ay_do_warning("Import Warning", + "No users found in licq file to import"); + return; + } - while(!feof(fp)) - { - fgets(c, 1024, fp); - token = remove_spaces(c); - if(!g_strcasecmp(token, "[users]")) - break; - } - if(feof(fp)) - { - fclose(fp); - ay_do_warning( "Import Warning", "No users found in licq file to import" ); - return; - } - - while (!feof(fp)) - { - fgets(c, 1024, fp); - token = remove_spaces(strtok(c, "=")); - if (!g_strncasecmp(token, "NumOfUsers", strlen("NumOfUsers") + 1)) - break; - } - if (feof(fp)) - { - fclose(fp); - ay_do_warning( "Import Warning", "No users found in licq file to import" ); - return; - } - - token = strtok(NULL, "="); - num_users = atoi(token); - if (num_users < 1) - { - fclose(fp); - ay_do_warning( "Import Warning", "No users found in licq file to import" ); - return; - } - - if(!find_grouplist_by_name(group_name)) - add_group(group_name); - - while(!feof(fp)) - { - fgets(c, 1024, fp); - if(feof(fp)) - break; - token = strtok(c, "="); - if (sscanf(token, "User%d", &unused_num) <= 0) - continue; - - uin = remove_spaces(strtok(NULL, "=")); - nick = get_licq_nick(uin, licq_version); - if (!nick) - nick = uin; - - if(find_account_by_handle(uin, ICQ_ID)) - { - continue; - } - if(!find_contact_by_nick(nick)) - { - add_new_contact(group_name, nick, ICQ_ID ); - } - if(!find_account_by_handle(uin, ICQ_ID)) - { - eb_account * ea = eb_services[ICQ_ID].sc->new_account(NULL,uin); - add_account( nick, ea ); + while (!feof(fp)) { + fgets(c, 1024, fp); + token = remove_spaces(strtok(c, "=")); + if (!g_strncasecmp(token, "NumOfUsers", + strlen("NumOfUsers") + 1)) + break; + } + if (feof(fp)) { + fclose(fp); + ay_do_warning("Import Warning", + "No users found in licq file to import"); + return; + } + + token = strtok(NULL, "="); + num_users = atoi(token); + if (num_users < 1) { + fclose(fp); + ay_do_warning("Import Warning", + "No users found in licq file to import"); + return; + } + + if (!find_grouplist_by_name(group_name)) + add_group(group_name); + + while (!feof(fp)) { + fgets(c, 1024, fp); + if (feof(fp)) + break; + token = strtok(c, "="); + if (sscanf(token, "User%d", &unused_num) <= 0) + continue; + + uin = remove_spaces(strtok(NULL, "=")); + nick = get_licq_nick(uin, licq_version); + if (!nick) + nick = uin; + + if (find_account_by_handle(uin, ICQ_ID)) { + continue; + } + if (!find_contact_by_nick(nick)) { + add_new_contact(group_name, nick, ICQ_ID); + } + if (!find_account_by_handle(uin, ICQ_ID)) { + eb_account *ea = + eb_services[ICQ_ID].sc->new_account(NULL, uin); + add_account(nick, ea); // RUN_SERVICE(ea)->add_user(ea); - } - } - fclose(fp); - - ay_do_info( "Import", "Successfully imported licq contact list" ); + } + } + fclose(fp); + + ay_do_info("Import", "Successfully imported licq contact list"); } |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:44
|
Update of /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/aim-oscar/libfaim/include Modified Files: aim.h aim_cbtypes.h aim_internal.h faimconfig.h md5.h Log Message: reformatted source code Index: aim.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/aim.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aim.h 2 Oct 2003 12:19:31 -0000 1.2 +++ aim.h 17 Sep 2009 12:04:57 -0000 1.3 @@ -40,14 +40,14 @@ #endif /* XXX adjust these based on autoconf-detected platform */ -typedef unsigned char fu8_t; -typedef unsigned short fu16_t; -typedef unsigned int fu32_t; -typedef fu32_t aim_snacid_t; -typedef fu16_t flap_seqnum_t; + typedef unsigned char fu8_t; + typedef unsigned short fu16_t; + typedef unsigned int fu32_t; [...1895 lines suppressed...] -faim_export int aimutil_putstr(char *, const char *, int); -faim_export fu16_t aimutil_iconsum(const fu8_t *buf, int buflen); -faim_export int aim_util_getlocalip(fu8_t *ip); -faim_export int aimutil_tokslen(char *toSearch, int theindex, char dl); -faim_export int aimutil_itemcnt(char *toSearch, char dl); -faim_export char *aimutil_itemindex(char *toSearch, int theindex, char dl); - -faim_export int aim_snlen(const char *sn); -faim_export int aim_sncmp(const char *sn1, const char *sn2); + faim_export int aim_snlen(const char *sn); + faim_export int aim_sncmp(const char *sn1, const char *sn2); #include <aim_internal.h> #ifdef __cplusplus } #endif - -#endif /* __AIM_H__ */ +#endif /* __AIM_H__ */ Index: aim_cbtypes.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/aim_cbtypes.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aim_cbtypes.h 2 Oct 2003 12:19:31 -0000 1.2 +++ aim_cbtypes.h 17 Sep 2009 12:04:57 -0000 1.3 @@ -21,16 +21,16 @@ #define AIM_CB_FAM_LOK 0x000a #define AIM_CB_FAM_STS 0x000b #define AIM_CB_FAM_TRN 0x000c -#define AIM_CB_FAM_CTN 0x000d /* ChatNav */ -#define AIM_CB_FAM_CHT 0x000e /* Chat */ -#define AIM_CB_FAM_SCH 0x000f /* "New" search */ -#define AIM_CB_FAM_ICO 0x0010 /* Used for uploading buddy icons */ -#define AIM_CB_FAM_SSI 0x0013 /* Server stored information */ +#define AIM_CB_FAM_CTN 0x000d /* ChatNav */ +#define AIM_CB_FAM_CHT 0x000e /* Chat */ +#define AIM_CB_FAM_SCH 0x000f /* "New" search */ +#define AIM_CB_FAM_ICO 0x0010 /* Used for uploading buddy icons */ +#define AIM_CB_FAM_SSI 0x0013 /* Server stored information */ #define AIM_CB_FAM_ICQ 0x0015 #define AIM_CB_FAM_ATH 0x0017 #define AIM_CB_FAM_EML 0x0018 -#define AIM_CB_FAM_OFT 0xfffe /* OFT/Rvous */ -#define AIM_CB_FAM_SPECIAL 0xffff /* Internal libfaim use */ +#define AIM_CB_FAM_OFT 0xfffe /* OFT/Rvous */ +#define AIM_CB_FAM_SPECIAL 0xffff /* Internal libfaim use */ /* * SNAC Family: Ack. @@ -43,7 +43,7 @@ /* * SNAC Family: General. - */ + */ #define AIM_CB_GEN_ERROR 0x0001 #define AIM_CB_GEN_CLIENTREADY 0x0002 #define AIM_CB_GEN_SERVERREADY 0x0003 @@ -68,7 +68,7 @@ /* * SNAC Family: Location Services. - */ + */ #define AIM_CB_LOC_ERROR 0x0001 #define AIM_CB_LOC_REQRIGHTS 0x0002 #define AIM_CB_LOC_RIGHTSINFO 0x0003 @@ -81,7 +81,7 @@ /* * SNAC Family: Buddy List Management Services. - */ + */ #define AIM_CB_BUD_ERROR 0x0001 #define AIM_CB_BUD_REQRIGHTS 0x0002 #define AIM_CB_BUD_RIGHTSINFO 0x0003 @@ -94,7 +94,7 @@ /* * SNAC Family: Messeging Services. - */ + */ #define AIM_CB_MSG_ERROR 0x0001 #define AIM_CB_MSG_PARAMINFO 0x0005 #define AIM_CB_MSG_INCOMING 0x0007 @@ -107,32 +107,32 @@ /* * SNAC Family: Advertisement Services - */ + */ #define AIM_CB_ADS_ERROR 0x0001 #define AIM_CB_ADS_DEFAULT 0xffff /* * SNAC Family: Invitation Services. - */ + */ #define AIM_CB_INV_ERROR 0x0001 #define AIM_CB_INV_DEFAULT 0xffff /* * SNAC Family: Administrative Services. - */ + */ #define AIM_CB_ADM_ERROR 0x0001 #define AIM_CB_ADM_INFOCHANGE_REPLY 0x0005 #define AIM_CB_ADM_DEFAULT 0xffff /* * SNAC Family: Popup Messages - */ + */ #define AIM_CB_POP_ERROR 0x0001 #define AIM_CB_POP_DEFAULT 0xffff /* * SNAC Family: Misc BOS Services. - */ + */ #define AIM_CB_BOS_ERROR 0x0001 #define AIM_CB_BOS_RIGHTSQUERY 0x0002 #define AIM_CB_BOS_RIGHTS 0x0003 @@ -140,13 +140,13 @@ /* * SNAC Family: User Lookup Services - */ + */ #define AIM_CB_LOK_ERROR 0x0001 #define AIM_CB_LOK_DEFAULT 0xffff /* * SNAC Family: User Status Services - */ + */ #define AIM_CB_STS_ERROR 0x0001 #define AIM_CB_STS_SETREPORTINTERVAL 0x0002 #define AIM_CB_STS_REPORTACK 0x0004 @@ -154,13 +154,13 @@ /* * SNAC Family: Translation Services - */ + */ #define AIM_CB_TRN_ERROR 0x0001 #define AIM_CB_TRN_DEFAULT 0xffff /* * SNAC Family: Chat Navigation Services - */ + */ #define AIM_CB_CTN_ERROR 0x0001 #define AIM_CB_CTN_CREATE 0x0008 #define AIM_CB_CTN_INFO 0x0009 @@ -168,7 +168,7 @@ /* * SNAC Family: Chat Services - */ + */ #define AIM_CB_CHT_ERROR 0x0001 #define AIM_CB_CHT_ROOMINFOUPDATE 0x0002 #define AIM_CB_CHT_USERJOIN 0x0003 @@ -179,14 +179,14 @@ /* * SNAC Family: "New" Search - */ + */ #define AIM_CB_SCH_ERROR 0x0001 #define AIM_CB_SCH_SEARCH 0x0002 #define AIM_CB_SCH_RESULTS 0x0003 /* * SNAC Family: Buddy icons - */ + */ #define AIM_CB_ICO_ERROR 0x0001 #define AIM_CB_ICO_REQUEST 0x0004 #define AIM_CB_ICO_RESPONSE 0x0005 @@ -195,7 +195,7 @@ * SNAC Family: ICQ * * Most of these are actually special. - */ + */ #define AIM_CB_ICQ_ERROR 0x0001 #define AIM_CB_ICQ_OFFLINEMSG 0x00f0 #define AIM_CB_ICQ_OFFLINEMSGCOMPLETE 0x00f1 @@ -269,20 +269,20 @@ #define AIM_CB_OFT_DIRECTIMTYPING 0x0004 #define AIM_CB_OFT_DIRECTIM_ESTABLISHED 0x0005 -#define AIM_CB_OFT_PROMPT 0x0101 /* "I am going to send you this file, is that ok?" */ +#define AIM_CB_OFT_PROMPT 0x0101 /* "I am going to send you this file, is that ok?" */ #define AIM_CB_OFT_RESUMESOMETHING 0x0106 /* I really don't know */ -#define AIM_CB_OFT_ACK 0x0202 /* "Yes, it is ok for you to send me that file" */ -#define AIM_CB_OFT_DONE 0x0204 /* "I received that file with no problems, thanks a bunch" */ -#define AIM_CB_OFT_RESUME 0x0205 /* Resume transferring, sent by whoever paused? */ -#define AIM_CB_OFT_RESUMEACK 0x0207 /* Not really sure */ - -#define AIM_CB_OFT_GETFILE_REQUESTLISTING 0x1108 /* "I have a listing.txt file, do you want it?" */ -#define AIM_CB_OFT_GETFILE_RECEIVELISTING 0x1209 /* "Yes, please send me your listing.txt file" */ -#define AIM_CB_OFT_GETFILE_RECEIVEDLISTING 0x120a /* received corrupt listing.txt file? */ /* I'm just guessing about this one... */ +#define AIM_CB_OFT_ACK 0x0202 /* "Yes, it is ok for you to send me that file" */ +#define AIM_CB_OFT_DONE 0x0204 /* "I received that file with no problems, thanks a bunch" */ +#define AIM_CB_OFT_RESUME 0x0205 /* Resume transferring, sent by whoever paused? */ +#define AIM_CB_OFT_RESUMEACK 0x0207 /* Not really sure */ + +#define AIM_CB_OFT_GETFILE_REQUESTLISTING 0x1108 /* "I have a listing.txt file, do you want it?" */ +#define AIM_CB_OFT_GETFILE_RECEIVELISTING 0x1209 /* "Yes, please send me your listing.txt file" */ +#define AIM_CB_OFT_GETFILE_RECEIVEDLISTING 0x120a /* received corrupt listing.txt file? */ /* I'm just guessing about this one... */ #define AIM_CB_OFT_GETFILE_ACKLISTING 0x120b /* "I received the listing.txt file successfully" */ #define AIM_CB_OFT_GETFILE_REQUESTFILE 0x120c /* "Please send me this file" */ -#define AIM_CB_OFT_ESTABLISHED 0xFFFF /* connection to buddy initiated */ +#define AIM_CB_OFT_ESTABLISHED 0xFFFF /* connection to buddy initiated */ /* * SNAC Family: Internal Messages @@ -291,7 +291,7 @@ * these, we can integrated non-SNAC services into * the SNAC-centered libfaim callback structure. * - */ + */ #define AIM_CB_SPECIAL_AUTHSUCCESS 0x0001 #define AIM_CB_SPECIAL_AUTHOTHER 0x0002 #define AIM_CB_SPECIAL_CONNERR 0x0003 Index: aim_internal.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/aim_internal.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aim_internal.h 2 Oct 2003 12:19:31 -0000 1.2 +++ aim_internal.h 17 Sep 2009 12:04:57 -0000 1.3 @@ -22,18 +22,22 @@ fu16_t toolid; fu16_t toolversion; fu16_t flags; - char name[AIM_MODULENAME_MAXLEN+1]; - int (*snachandler)(aim_session_t *sess, struct aim_module_s *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs); + char name[AIM_MODULENAME_MAXLEN + 1]; + int (*snachandler) (aim_session_t *sess, struct aim_module_s *mod, + aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs); - void (*shutdown)(aim_session_t *sess, struct aim_module_s *mod); + void (*shutdown) (aim_session_t *sess, struct aim_module_s *mod); void *priv; struct aim_module_s *next; } aim_module_t; -faim_internal int aim__registermodule(aim_session_t *sess, int (*modfirst)(aim_session_t *, aim_module_t *)); +faim_internal int aim__registermodule(aim_session_t *sess, + int (*modfirst) (aim_session_t *, aim_module_t *)); faim_internal void aim__shutdownmodules(aim_session_t *sess); -faim_internal aim_module_t *aim__findmodulebygroup(aim_session_t *sess, fu16_t group); -faim_internal aim_module_t *aim__findmodule(aim_session_t *sess, const char *name); +faim_internal aim_module_t *aim__findmodulebygroup(aim_session_t *sess, + fu16_t group); +faim_internal aim_module_t *aim__findmodule(aim_session_t *sess, + const char *name); faim_internal int admin_modfirst(aim_session_t *sess, aim_module_t *mod); faim_internal int buddylist_modfirst(aim_session_t *sess, aim_module_t *mod); @@ -57,10 +61,14 @@ faim_internal int icq_modfirst(aim_session_t *sess, aim_module_t *mod); faim_internal int email_modfirst(aim_session_t *sess, aim_module_t *mod); -faim_internal int aim_genericreq_n(aim_session_t *, aim_conn_t *conn, fu16_t family, fu16_t subtype); -faim_internal int aim_genericreq_n_snacid(aim_session_t *, aim_conn_t *conn, fu16_t family, fu16_t subtype); -faim_internal int aim_genericreq_l(aim_session_t *, aim_conn_t *conn, fu16_t family, fu16_t subtype, fu32_t *); -faim_internal int aim_genericreq_s(aim_session_t *, aim_conn_t *conn, fu16_t family, fu16_t subtype, fu16_t *); +faim_internal int aim_genericreq_n(aim_session_t *, aim_conn_t *conn, + fu16_t family, fu16_t subtype); +faim_internal int aim_genericreq_n_snacid(aim_session_t *, aim_conn_t *conn, + fu16_t family, fu16_t subtype); +faim_internal int aim_genericreq_l(aim_session_t *, aim_conn_t *conn, + fu16_t family, fu16_t subtype, fu32_t *); +faim_internal int aim_genericreq_s(aim_session_t *, aim_conn_t *conn, + fu16_t family, fu16_t subtype, fu16_t *); #define AIMBS_CURPOSPAIR(x) ((x)->data + (x)->offset), ((x)->len - (x)->offset) @@ -93,22 +101,28 @@ faim_internal aim_conn_t *aim_cloneconn(aim_session_t *sess, aim_conn_t *src); /* ft.c */ -faim_internal int aim_rxdispatch_rendezvous(aim_session_t *sess, aim_frame_t *fr); +faim_internal int aim_rxdispatch_rendezvous(aim_session_t *sess, + aim_frame_t *fr); /* rxhandlers.c */ -faim_internal aim_rxcallback_t aim_callhandler(aim_session_t *sess, aim_conn_t *conn, fu16_t family, fu16_t type); -faim_internal int aim_callhandler_noparam(aim_session_t *sess, aim_conn_t *conn, fu16_t family, fu16_t type, aim_frame_t *ptr); +faim_internal aim_rxcallback_t aim_callhandler(aim_session_t *sess, + aim_conn_t *conn, fu16_t family, fu16_t type); +faim_internal int aim_callhandler_noparam(aim_session_t *sess, aim_conn_t *conn, + fu16_t family, fu16_t type, aim_frame_t *ptr); faim_internal int aim_parse_unknown(aim_session_t *, aim_frame_t *, ...); -faim_internal void aim_clonehandlers(aim_session_t *sess, aim_conn_t *dest, aim_conn_t *src); +faim_internal void aim_clonehandlers(aim_session_t *sess, aim_conn_t *dest, + aim_conn_t *src); /* rxqueue.c */ faim_internal int aim_recv(int fd, void *buf, size_t count); faim_internal int aim_bstream_recv(aim_bstream_t *bs, int fd, size_t count); -faim_internal void aim_rxqueue_cleanbyconn(aim_session_t *sess, aim_conn_t *conn); +faim_internal void aim_rxqueue_cleanbyconn(aim_session_t *sess, + aim_conn_t *conn); faim_internal void aim_frame_destroy(aim_frame_t *); /* txqueue.c */ -faim_internal aim_frame_t *aim_tx_new(aim_session_t *sess, aim_conn_t *conn, fu8_t framing, fu16_t chan, int datalen); +faim_internal aim_frame_t *aim_tx_new(aim_session_t *sess, aim_conn_t *conn, + fu8_t framing, fu16_t chan, int datalen); faim_internal int aim_tx_enqueue(aim_session_t *, aim_frame_t *); faim_internal flap_seqnum_t aim_get_next_txseqnum(aim_conn_t *); faim_internal int aim_tx_sendframe(aim_session_t *sess, aim_frame_t *cur); @@ -132,9 +146,12 @@ /* snac.c */ faim_internal void aim_initsnachash(aim_session_t *sess); faim_internal aim_snacid_t aim_newsnac(aim_session_t *, aim_snac_t *newsnac); -faim_internal aim_snacid_t aim_cachesnac(aim_session_t *sess, const fu16_t family, const fu16_t type, const fu16_t flags, const void *data, const int datalen); +faim_internal aim_snacid_t aim_cachesnac(aim_session_t *sess, + const fu16_t family, const fu16_t type, const fu16_t flags, + const void *data, const int datalen); faim_internal aim_snac_t *aim_remsnac(aim_session_t *, aim_snacid_t id); -faim_internal int aim_putsnac(aim_bstream_t *, fu16_t family, fu16_t type, fu16_t flags, aim_snacid_t id); +faim_internal int aim_putsnac(aim_bstream_t *, fu16_t family, fu16_t type, + fu16_t flags, aim_snacid_t id); /* Stored in ->priv of the service request SNAC for chats. */ struct chatsnacinfo { @@ -168,11 +185,11 @@ fu32_t disconnect; fu32_t current; fu32_t max; - fu8_t unknown[5]; /* only present in versions >= 3 */ + fu8_t unknown[5]; /* only present in versions >= 3 */ struct snacpair *members; struct rateclass *next; }; -#endif /* FAIM_NEED_CONN_INTERNAL */ +#endif /* FAIM_NEED_CONN_INTERNAL */ /* * This is inside every connection. But it is a void * to anything @@ -189,22 +206,28 @@ faim_internal void aim_conn_addgroup(aim_conn_t *conn, fu16_t group); faim_internal int aim_cachecookie(aim_session_t *sess, aim_msgcookie_t *cookie); -faim_internal aim_msgcookie_t *aim_uncachecookie(aim_session_t *sess, fu8_t *cookie, int type); +faim_internal aim_msgcookie_t *aim_uncachecookie(aim_session_t *sess, + fu8_t *cookie, int type); faim_internal aim_msgcookie_t *aim_mkcookie(fu8_t *, int, void *); -faim_internal aim_msgcookie_t *aim_checkcookie(aim_session_t *, const unsigned char *, const int); +faim_internal aim_msgcookie_t *aim_checkcookie(aim_session_t *, + const unsigned char *, const int); faim_internal int aim_freecookie(aim_session_t *sess, aim_msgcookie_t *cookie); faim_internal int aim_msgcookie_gettype(int reqclass); faim_internal int aim_cookie_free(aim_session_t *sess, aim_msgcookie_t *cookie); /* 0x0002 - locate.c */ -faim_internal void aim_locate_requestuserinfo(aim_session_t *sess, const char *sn); -faim_internal fu32_t aim_getcap(aim_session_t *sess, aim_bstream_t *bs, int len); +faim_internal void aim_locate_requestuserinfo(aim_session_t *sess, + const char *sn); +faim_internal fu32_t aim_getcap(aim_session_t *sess, aim_bstream_t *bs, + int len); faim_internal int aim_putcap(aim_bstream_t *bs, fu32_t caps); faim_internal void aim_info_free(aim_userinfo_t *); -faim_internal int aim_info_extract(aim_session_t *sess, aim_bstream_t *bs, aim_userinfo_t *); +faim_internal int aim_info_extract(aim_session_t *sess, aim_bstream_t *bs, + aim_userinfo_t *); faim_internal int aim_putuserinfo(aim_bstream_t *bs, aim_userinfo_t *info); -faim_internal int aim_chat_readroominfo(aim_bstream_t *bs, struct aim_chat_roominfo *outinfo); +faim_internal int aim_chat_readroominfo(aim_bstream_t *bs, + struct aim_chat_roominfo *outinfo); faim_internal void aim_conn_kill_chat(aim_session_t *sess, aim_conn_t *conn); @@ -214,12 +237,13 @@ faim_internal int aim_rates_addparam(aim_session_t *, aim_conn_t *); faim_internal int aim_rates_delparam(aim_session_t *, aim_conn_t *); -faim_internal void faimdprintf(aim_session_t *sess, int dlevel, const char *format, ...); +faim_internal void faimdprintf(aim_session_t *sess, int dlevel, + const char *format, ...); #ifndef FAIM_INTERNAL_INSANE #define printf() printf called inside libfaim #define sprintf() unbounded sprintf used inside libfaim #endif -#endif /* __AIM_INTERNAL_H__ */ -#endif /* FAIM_INTERNAL */ +#endif /* __AIM_INTERNAL_H__ */ +#endif /* FAIM_INTERNAL */ Index: faimconfig.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/faimconfig.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- faimconfig.h 29 Sep 2003 20:37:53 -0000 1.1 +++ faimconfig.h 17 Sep 2009 12:04:57 -0000 1.2 @@ -54,6 +54,4 @@ */ #define WIN32_STATIC -#endif /* __FAIMCONFIG_H__ */ - - +#endif /* __FAIMCONFIG_H__ */ Index: md5.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/libfaim/include/md5.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- md5.h 29 Sep 2003 20:37:53 -0000 1.1 +++ md5.h 17 Sep 2009 12:04:57 -0000 1.2 @@ -50,44 +50,43 @@ * ARCH_IS_BIG_ENDIAN. */ -typedef unsigned char md5_byte_t; /* 8-bit byte */ -typedef unsigned int md5_word_t; /* 32-bit word */ +typedef unsigned char md5_byte_t; /* 8-bit byte */ +typedef unsigned int md5_word_t; /* 32-bit word */ /* Define the state of the MD5 Algorithm. */ typedef struct md5_state_s { - md5_word_t count[2]; /* message length in bits, lsw first */ - md5_word_t abcd[4]; /* digest buffer */ - md5_byte_t buf[64]; /* accumulate block */ + md5_word_t count[2]; /* message length in bits, lsw first */ + md5_word_t abcd[4]; /* digest buffer */ + md5_byte_t buf[64]; /* accumulate block */ } md5_state_t; #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Initialize the algorithm. */ #ifdef P1 -void md5_init(P1(md5_state_t *pms)); + void md5_init(P1(md5_state_t *pms)); #else -void md5_init(md5_state_t *pms); + void md5_init(md5_state_t *pms); #endif /* Append a string to the message. */ #ifdef P3 -void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, int nbytes)); + void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, + int nbytes)); #else -void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); + void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); #endif /* Finish the message and return the digest. */ #ifdef P2 -void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16])); + void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16])); #else -void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); + void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); #endif #ifdef __cplusplus -} /* end extern "C" */ +} /* end extern "C" */ #endif - -#endif /* md5_INCLUDED */ +#endif /* md5_INCLUDED */ |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:42
|
Update of /cvsroot/ayttm/ayttm/modules/icq In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/icq Modified Files: icq.c icq_mod.h Log Message: reformatted source code Index: icq.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/icq.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- icq.c 27 Jul 2009 16:42:03 -0000 1.12 +++ icq.c 17 Sep 2009 12:04:58 -0000 1.13 @@ -27,11 +27,15 @@ * ICQ implementation */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} + #ifdef __MINGW32__ #define __IN_PLUGIN__ [...2206 lines suppressed...] - struct service_callbacks * sc; + struct service_callbacks *sc; - sc = g_new0( struct service_callbacks, 1 ); + sc = g_new0(struct service_callbacks, 1); sc->query_connected = icq_query_connected; sc->login = icq_login; sc->logout = icq_logout; @@ -1587,9 +1531,8 @@ sc->read_prefs_config = eb_icq_read_prefs_config; sc->write_prefs_config = eb_icq_write_prefs_config; - sc->get_color=eb_icq_get_color; - sc->get_smileys=eb_default_smileys; + sc->get_color = eb_icq_get_color; + sc->get_smileys = eb_default_smileys; return sc; } - Index: icq_mod.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/icq_mod.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- icq_mod.h 1 Apr 2003 07:24:28 -0000 1.1.1.1 +++ icq_mod.h 17 Sep 2009 12:04:58 -0000 1.2 @@ -29,10 +29,9 @@ #ifndef __ICQ_H__ #define __ICQ_H__ - -#include "service.h" -struct service_callbacks * icq_query_callbacks(); +#include "service.h" +struct service_callbacks *icq_query_callbacks(); #endif /*__ICQ_H__*/ |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:41
|
Update of /cvsroot/ayttm/ayttm/modules/smileys In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/smileys Modified Files: giles_smiles.c smiley-themer.c smileysc.c Log Message: reformatted source code Index: giles_smiles.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/smileys/giles_smiles.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- giles_smiles.c 27 Jul 2009 16:42:04 -0000 1.2 +++ giles_smiles.c 17 Sep 2009 12:04:59 -0000 1.3 @@ -36,20 +36,18 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info giles_smiles_LTX_plugin_info - #define module_version giles_smiles_LTX_module_version +#define plugin_info giles_smiles_LTX_plugin_info +#define module_version giles_smiles_LTX_module_version #endif - /* Function Prototypes */ static void init_alt_smileys(void); static void enable_smileys(ebmCallbackData *data); static int plugin_init(); static int plugin_finish(); -static int ref_count=0; -static LList *my_smileys=NULL; - +static int ref_count = 0; +static LList *my_smileys = NULL; /* Module Exports */ PLUGIN_INFO plugin_info = { @@ -63,25 +61,33 @@ plugin_finish, NULL }; + /* End Module Exports */ static void *smiley_tag = NULL; -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} + static int plugin_init() { - eb_debug(DBG_MOD,"giles Smilies init\n"); + eb_debug(DBG_MOD, "giles Smilies init\n"); - if(!my_smileys) + if (!my_smileys) init_alt_smileys(); - - smiley_tag=eb_add_menu_item("Giles Smilies", EB_IMPORT_MENU, enable_smileys, ebmIMPORTDATA, NULL); - if(!smiley_tag) { - eb_debug(DBG_MOD,"Error! Unable to add Giles Smiley menu to import menu\n"); + + smiley_tag = + eb_add_menu_item("Giles Smilies", EB_IMPORT_MENU, + enable_smileys, ebmIMPORTDATA, NULL); + if (!smiley_tag) { + eb_debug(DBG_MOD, + "Error! Unable to add Giles Smiley menu to import menu\n"); return -1; } - ay_add_smiley_set( plugin_info.module_name, my_smileys ); + ay_add_smiley_set(plugin_info.module_name, my_smileys); return 0; } @@ -89,10 +95,10 @@ static int plugin_finish() { int result = 0; - - ay_remove_smiley_set( plugin_info.module_name ); - if(smiley_tag) + ay_remove_smiley_set(plugin_info.module_name); + + if (smiley_tag) result = eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); /* @@ -100,18 +106,19 @@ * default to avoid references to freed memory * otherwise, leave it as it is */ - if(smileys == my_smileys) + if (smileys == my_smileys) smileys = eb_smileys(); l_list_free(my_smileys); - my_smileys=NULL; + my_smileys = NULL; - if(smiley_tag && result) { - g_warning("Unable to remove Giles Smiley menu item from import menu!"); + if (smiley_tag && result) { + g_warning + ("Unable to remove Giles Smiley menu item from import menu!"); return -1; } - smiley_tag=NULL; + smiley_tag = NULL; return 0; } @@ -136,20 +143,20 @@ static void init_alt_smileys() { - my_smileys=add_smiley(my_smileys, "dead", dead20_xpm); - my_smileys=add_smiley(my_smileys, "blank", embarrased20_xpm); - my_smileys=add_smiley(my_smileys, "blush", embarrased20_xpm); - my_smileys=add_smiley(my_smileys, "grin", grin20_xpm); - my_smileys=add_smiley(my_smileys, "worried", indifferent20_xpm); - my_smileys=add_smiley(my_smileys, "lovey", kiss20_xpm); - my_smileys=add_smiley(my_smileys, "quiet", quiet20_xpm); - my_smileys=add_smiley(my_smileys, "sad", sad20_xpm); - my_smileys=add_smiley(my_smileys, "cooldude", shades20_xpm); - my_smileys=add_smiley(my_smileys, "oh", shocked20_xpm); - my_smileys=add_smiley(my_smileys, "smile", smile20_xpm); - my_smileys=add_smiley(my_smileys, "sob", tears20_xpm); - my_smileys=add_smiley(my_smileys, "tongue", tongue20_xpm); - my_smileys=add_smiley(my_smileys, "wink", wink20_xpm); + my_smileys = add_smiley(my_smileys, "dead", dead20_xpm); + my_smileys = add_smiley(my_smileys, "blank", embarrased20_xpm); + my_smileys = add_smiley(my_smileys, "blush", embarrased20_xpm); + my_smileys = add_smiley(my_smileys, "grin", grin20_xpm); + my_smileys = add_smiley(my_smileys, "worried", indifferent20_xpm); + my_smileys = add_smiley(my_smileys, "lovey", kiss20_xpm); + my_smileys = add_smiley(my_smileys, "quiet", quiet20_xpm); + my_smileys = add_smiley(my_smileys, "sad", sad20_xpm); + my_smileys = add_smiley(my_smileys, "cooldude", shades20_xpm); + my_smileys = add_smiley(my_smileys, "oh", shocked20_xpm); + my_smileys = add_smiley(my_smileys, "smile", smile20_xpm); + my_smileys = add_smiley(my_smileys, "sob", tears20_xpm); + my_smileys = add_smiley(my_smileys, "tongue", tongue20_xpm); + my_smileys = add_smiley(my_smileys, "wink", wink20_xpm); } static void reset_smileys(ebmCallbackData *data) @@ -158,17 +165,20 @@ smileys = eb_smileys(); eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); - smiley_tag=eb_add_menu_item("Giles Smilies", EB_IMPORT_MENU, enable_smileys, ebmIMPORTDATA, NULL); + smiley_tag = + eb_add_menu_item("Giles Smilies", EB_IMPORT_MENU, + enable_smileys, ebmIMPORTDATA, NULL); } static void enable_smileys(ebmCallbackData *data) { - if(!my_smileys) + if (!my_smileys) return; smileys = my_smileys; eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); - smiley_tag=eb_add_menu_item("Default Smilies", EB_IMPORT_MENU, reset_smileys, ebmIMPORTDATA, NULL); + smiley_tag = + eb_add_menu_item("Default Smilies", EB_IMPORT_MENU, + reset_smileys, ebmIMPORTDATA, NULL); } - Index: smiley-themer.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/smileys/smiley-themer.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- smiley-themer.c 27 Jul 2009 16:42:04 -0000 1.17 +++ smiley-themer.c 17 Sep 2009 12:04:59 -0000 1.18 @@ -41,34 +41,31 @@ #include <noX/xpm.h> #endif - /******************************************************************************* * Begin Module Code ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info smiley_themer_LTX_plugin_info - #define module_version smiley_themer_LTX_module_version +#define plugin_info smiley_themer_LTX_plugin_info +#define module_version smiley_themer_LTX_module_version #endif - static int plugin_init(); static int plugin_finish(); static int reload_prefs(); -static int is_setting_state=1; -static int ref_count=0; -static char smiley_directory[MAX_PREF_LEN]=AYTTM_SMILEY_DIR; -static char last_selected[MAX_PREF_LEN]=""; +static int is_setting_state = 1; +static int ref_count = 0; +static char smiley_directory[MAX_PREF_LEN] = AYTTM_SMILEY_DIR; +static char last_selected[MAX_PREF_LEN] = ""; static int do_smiley_debug = 0; -static char rcfilename[]="aysmile.rc"; +static char rcfilename[] = "aysmile.rc"; #ifndef FREE # define FREE(x) if(x){free(x); x=NULL;} #endif - /* Module Exports */ PLUGIN_INFO plugin_info = { PLUGIN_SMILEY, @@ -82,9 +79,13 @@ reload_prefs, NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static void load_themes(); static void unload_themes(); @@ -95,7 +96,7 @@ { input_list *il; - if(!smiley_directory[0]) + if (!smiley_directory[0]) return -1; il = g_new0(input_list, 1); @@ -103,21 +104,21 @@ plugin_info.prefs = il; il->widget.entry.value = smiley_directory; il->name = "smiley_directory"; - il->label= _("Smiley Directory:"); + il->label = _("Smiley Directory:"); il->type = EB_INPUT_ENTRY; il->next = g_new0(input_list, 1); il = il->next; il->widget.entry.value = last_selected; il->name = "last_selected"; - il->label= _("Last Selected:"); + il->label = _("Last Selected:"); il->type = EB_INPUT_ENTRY; il->next = g_new0(input_list, 1); il = il->next; il->widget.checkbox.value = &do_smiley_debug; il->name = "do_smiley_debug"; - il->label= _("Enable debugging"); + il->label = _("Enable debugging"); il->type = EB_INPUT_CHECKBOX; load_themes(); @@ -127,7 +128,7 @@ static int plugin_finish() { - while(plugin_info.prefs) { + while (plugin_info.prefs) { input_list *il = plugin_info.prefs->next; g_free(plugin_info.prefs); plugin_info.prefs = il; @@ -140,7 +141,7 @@ static int reload_prefs() { - is_setting_state=0; + is_setting_state = 0; unload_themes(); load_themes(); activate_theme_by_name(last_selected); @@ -151,9 +152,9 @@ * End Module Code ******************************************************************************/ -static int smiley_log(char *fmt,...) +static int smiley_log(char *fmt, ...) { - if(do_smiley_debug) { + if (do_smiley_debug) { va_list ap; va_start(ap, fmt); @@ -183,31 +184,32 @@ int core; }; -static LList *themes=NULL; +static LList *themes = NULL; -static void unload_theme(struct smiley_theme * theme) +static void unload_theme(struct smiley_theme *theme) { - if(theme->core) { + if (theme->core) { ay_remove_smiley_set(theme->name); - if(theme->menu_tag) + if (theme->menu_tag) eb_remove_menu_item(EB_SMILEY_MENU, theme->menu_tag); return; } - if(smileys == theme->smileys) + if (smileys == theme->smileys) smileys = eb_smileys(); - if(theme->name) + if (theme->name) ay_remove_smiley_set(theme->name); - if(theme->menu_tag) + if (theme->menu_tag) eb_remove_menu_item(EB_SMILEY_MENU, theme->menu_tag); - while(theme->smileys) { + while (theme->smileys) { struct smiley_struct *smiley = theme->smileys->data; XpmFree(smiley->pixmap); FREE(smiley->service); FREE(smiley); - theme->smileys = l_list_remove_link(theme->smileys, theme->smileys); + theme->smileys = + l_list_remove_link(theme->smileys, theme->smileys); } FREE(theme->name); @@ -221,14 +223,14 @@ static void unload_themes() { - while(themes) { + while (themes) { struct smiley_theme *theme = themes->data; unload_theme(theme); themes = l_list_remove_link(themes, themes); } } -static int smiley_readline(char *ptr, int maxlen, FILE * fp) +static int smiley_readline(char *ptr, int maxlen, FILE *fp) { int n; int c; @@ -237,8 +239,8 @@ c = fgetc(fp); - if(c!=EOF) { - if(c == '\r') /* get rid of \r */ + if (c != EOF) { + if (c == '\r') /* get rid of \r */ continue; *ptr = (char)c; if (c == '\n') @@ -246,9 +248,9 @@ ptr++; } else { if (n == 1) - return (0); /* EOF, no data */ + return (0); /* EOF, no data */ else - break; /* EOF, w/ data */ + break; /* EOF, w/ data */ } } @@ -260,108 +262,109 @@ { char *tmp; - if(!buff[0] || buff[0] == '#') + if (!buff[0] || buff[0] == '#') return 0; - if(strchr(buff, '=') <= buff) + if (strchr(buff, '=') <= buff) return 0; /* remove leading spaces */ - for(; *buff && isspace(*buff); buff++) - ; + for (; *buff && isspace(*buff); buff++) ; - if(!*buff) /* empty key */ + if (!*buff) /* empty key */ return 0; *key = buff; *value = strchr(buff, '='); - **value='\0'; + **value = '\0'; /* remove trailing spaces */ - for(tmp=buff; *tmp && !isspace(*tmp); tmp++) - ; - if(*tmp) - *tmp='\0'; + for (tmp = buff; *tmp && !isspace(*tmp); tmp++) ; + if (*tmp) + *tmp = '\0'; - buff = (*value)+1; + buff = (*value) + 1; /* remove leading spaces of value */ - for(; *buff && isspace(*buff); buff++) - ; + for (; *buff && isspace(*buff); buff++) ; - if(!*buff) /* empty value */ + if (!*buff) /* empty value */ return 0; *value = buff; /* remove trailing spaces */ - for(tmp=buff+strlen(buff)-1; tmp >= buff && isspace(*tmp); tmp--) - *tmp='\0'; + for (tmp = buff + strlen(buff) - 1; tmp >= buff && isspace(*tmp); tmp--) + *tmp = '\0'; return 1; } -static struct smiley_theme * load_theme(const char *theme_name) +static struct smiley_theme *load_theme(const char *theme_name) { FILE *themerc; char buff[1024]; struct smiley_theme *theme; - char *curr_protocol=NULL; + char *curr_protocol = NULL; snprintf(buff, sizeof(buff), "%s/%s/%s", - smiley_directory, theme_name, rcfilename); + smiley_directory, theme_name, rcfilename); - if(!(themerc = fopen(buff, "rt"))) { - LOG(("Could not find/open %s error %d: %s", rcfilename, errno, strerror(errno))); + if (!(themerc = fopen(buff, "rt"))) { + LOG(("Could not find/open %s error %d: %s", rcfilename, errno, + strerror(errno))); return NULL; } theme = calloc(1, sizeof(struct smiley_theme)); - while((smiley_readline(buff, sizeof(buff), themerc))>0) { + while ((smiley_readline(buff, sizeof(buff), themerc)) > 0) { const char **smiley_data; char filepath[1024]; char *key, *value; - if(!splitline(buff, &key, &value)) + if (!splitline(buff, &key, &value)) continue; - if(key[0] == '%') { + if (key[0] == '%') { key++; - if(!strcmp(key, "name")) + if (!strcmp(key, "name")) theme->name = strdup(value); - else if(!strcmp(key, "desc")) + else if (!strcmp(key, "desc")) theme->description = strdup(value); - else if(!strcmp(key, "author")) + else if (!strcmp(key, "author")) theme->author = strdup(value); - else if(!strcmp(key, "date")) + else if (!strcmp(key, "date")) theme->date = strdup(value); - else if(!strcmp(key, "revision")) + else if (!strcmp(key, "revision")) theme->revision = strdup(value); - else if(!strcmp(key, "protocol")) { + else if (!strcmp(key, "protocol")) { FREE(curr_protocol); curr_protocol = strdup(value); } } else { snprintf(filepath, sizeof(filepath), "%s/%s/%s", - smiley_directory, theme_name, value); + smiley_directory, theme_name, value); - if(XpmReadFileToData(filepath, &smiley_data) != XpmSuccess) { + if (XpmReadFileToData(filepath, + &smiley_data) != XpmSuccess) { LOG(("Could not read xpm file %s", filepath)); continue; } - theme->smileys = add_smiley(theme->smileys, key, smiley_data, curr_protocol); + theme->smileys = + add_smiley(theme->smileys, key, smiley_data, + curr_protocol); } } - + fclose(themerc); - if(!theme->smileys) { + if (!theme->smileys) { unload_theme(theme); return NULL; } - if(!theme->name) + if (!theme->name) theme->name = strdup(theme_name); return theme; @@ -371,7 +374,7 @@ { struct smiley_theme *theme = (struct smiley_theme *)data; - if(is_setting_state || !theme || !theme->smileys) + if (is_setting_state || !theme || !theme->smileys) return; is_setting_state = 1; @@ -379,7 +382,7 @@ eb_activate_menu_item(EB_SMILEY_MENU, theme->menu_tag); - strncpy(last_selected, theme->name, sizeof(last_selected)-1); + strncpy(last_selected, theme->name, sizeof(last_selected) - 1); is_setting_state = 0; } @@ -388,42 +391,48 @@ struct smiley_theme *theme; struct dirent *entry; DIR *theme_dir = opendir(smiley_directory); - if(!theme_dir) { + if (!theme_dir) { LOG(("Unable to open smiley directory %s", smiley_directory)); return; } - LOG(("Opened smileydirectory %s\n",smiley_directory)); - + LOG(("Opened smileydirectory %s\n", smiley_directory)); + theme = calloc(1, sizeof(struct smiley_theme)); theme->name = _("Default"); theme->smileys = eb_smileys(); theme->core = 1; - theme->menu_tag=eb_add_menu_item(theme->name, EB_SMILEY_MENU, enable_smileys, ebmSMILEYDATA, theme); - if(!theme->menu_tag) { - eb_debug(DBG_MOD,"Error! Unable to add Smiley menu to smiley menu\n"); + theme->menu_tag = + eb_add_menu_item(theme->name, EB_SMILEY_MENU, enable_smileys, + ebmSMILEYDATA, theme); + if (!theme->menu_tag) { + eb_debug(DBG_MOD, + "Error! Unable to add Smiley menu to smiley menu\n"); free(theme); } else themes = l_list_prepend(themes, theme); - while((entry=readdir(theme_dir))) { - if(entry->d_name[0]=='.') + while ((entry = readdir(theme_dir))) { + if (entry->d_name[0] == '.') continue; - if(!(theme = load_theme(entry->d_name))) { + if (!(theme = load_theme(entry->d_name))) { LOG(("Could not load theme %s", entry->d_name)); continue; } - theme->menu_tag=eb_add_menu_item(theme->name, EB_SMILEY_MENU, enable_smileys, ebmSMILEYDATA, theme); - if(!theme->menu_tag) { - eb_debug(DBG_MOD,"Error! Unable to add Smiley menu to smiley menu\n"); + theme->menu_tag = + eb_add_menu_item(theme->name, EB_SMILEY_MENU, + enable_smileys, ebmSMILEYDATA, theme); + if (!theme->menu_tag) { + eb_debug(DBG_MOD, + "Error! Unable to add Smiley menu to smiley menu\n"); unload_theme(theme); continue; } - ay_add_smiley_set( theme->name, theme->smileys ); + ay_add_smiley_set(theme->name, theme->smileys); themes = l_list_prepend(themes, theme); } @@ -433,13 +442,12 @@ static void activate_theme_by_name(const char *name) { - LList * l; - for(l=themes; l; l=l_list_next(l)) { + LList *l; + for (l = themes; l; l = l_list_next(l)) { struct smiley_theme *theme = l->data; - if(!strcmp(theme->name, name)) { + if (!strcmp(theme->name, name)) { enable_smileys((ebmCallbackData *)theme); return; } } } - Index: smileysc.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/smileys/smileysc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- smileysc.c 27 Jul 2009 16:42:04 -0000 1.2 +++ smileysc.c 17 Sep 2009 12:04:59 -0000 1.3 @@ -34,20 +34,18 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info smileysc_LTX_plugin_info - #define module_version smileysc_LTX_module_version +#define plugin_info smileysc_LTX_plugin_info +#define module_version smileysc_LTX_module_version #endif - /* Function Prototypes */ static void init_alt_smileys(void); static void enable_smileys(ebmCallbackData *data); static int plugin_init(); static int plugin_finish(); -static int ref_count=0; -static LList *my_smileys=NULL; - +static int ref_count = 0; +static LList *my_smileys = NULL; /* Module Exports */ PLUGIN_INFO plugin_info = { @@ -61,55 +59,63 @@ plugin_finish, NULL }; + /* End Module Exports */ static void *smiley_tag = NULL; -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static int plugin_init() { - eb_debug(DBG_MOD,"console smileys init\n"); + eb_debug(DBG_MOD, "console smileys init\n"); - if(!my_smileys) + if (!my_smileys) init_alt_smileys(); - - smiley_tag=eb_add_menu_item("Console Smilies", EB_IMPORT_MENU, enable_smileys, ebmIMPORTDATA, NULL); - if(!smiley_tag) { - eb_debug(DBG_MOD,"Error! Unable to add Console Smiley menu to import menu\n"); + + smiley_tag = + eb_add_menu_item("Console Smilies", EB_IMPORT_MENU, + enable_smileys, ebmIMPORTDATA, NULL); + if (!smiley_tag) { + eb_debug(DBG_MOD, + "Error! Unable to add Console Smiley menu to import menu\n"); return -1; } - ay_add_smiley_set( plugin_info.module_name, my_smileys ); - + ay_add_smiley_set(plugin_info.module_name, my_smileys); + return 0; } static int plugin_finish() { int result = 0; - - ay_remove_smiley_set( plugin_info.module_name ); - if(smiley_tag) + ay_remove_smiley_set(plugin_info.module_name); + + if (smiley_tag) result = eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); /* * if we're using these smileys, then reset to * default to avoid references to freed memory * otherwise, leave it as it is */ - if(smileys == my_smileys) + if (smileys == my_smileys) smileys = eb_smileys(); l_list_free(my_smileys); - my_smileys=NULL; + my_smileys = NULL; - if(smiley_tag && result) { - g_warning("Unable to remove Console Smiley menu item from import menu!"); + if (smiley_tag && result) { + g_warning + ("Unable to remove Console Smiley menu item from import menu!"); return -1; } - smiley_tag=NULL; + smiley_tag = NULL; return 0; } @@ -136,23 +142,23 @@ static void init_alt_smileys() { - my_smileys=add_smiley(my_smileys, "smile", smile_xpm); - my_smileys=add_smiley(my_smileys, "sad", sad_xpm); - my_smileys=add_smiley(my_smileys, "wink", wink_xpm); - my_smileys=add_smiley(my_smileys, "laugh", laugh_xpm); - my_smileys=add_smiley(my_smileys, "cry", sob_xpm); - my_smileys=add_smiley(my_smileys, "biglaugh", laugh_xpm); - my_smileys=add_smiley(my_smileys, "tongue", tongue_xpm); - my_smileys=add_smiley(my_smileys, "cooldude", cooldude_xpm); - my_smileys=add_smiley(my_smileys, "worried", worried_xpm); - my_smileys=add_smiley(my_smileys, "grin", grin_xpm); - my_smileys=add_smiley(my_smileys, "blank", blank_xpm); - my_smileys=add_smiley(my_smileys, "oh", oh_xpm); - my_smileys=add_smiley(my_smileys, "confused", confused_xpm); - my_smileys=add_smiley(my_smileys, "lovey", kiss_xpm); - my_smileys=add_smiley(my_smileys, "kiss", kiss_xpm); - my_smileys=add_smiley(my_smileys, "heyy", heyy_xpm); - my_smileys=add_smiley(my_smileys, "blush", blush_xpm); + my_smileys = add_smiley(my_smileys, "smile", smile_xpm); + my_smileys = add_smiley(my_smileys, "sad", sad_xpm); + my_smileys = add_smiley(my_smileys, "wink", wink_xpm); + my_smileys = add_smiley(my_smileys, "laugh", laugh_xpm); + my_smileys = add_smiley(my_smileys, "cry", sob_xpm); + my_smileys = add_smiley(my_smileys, "biglaugh", laugh_xpm); + my_smileys = add_smiley(my_smileys, "tongue", tongue_xpm); + my_smileys = add_smiley(my_smileys, "cooldude", cooldude_xpm); + my_smileys = add_smiley(my_smileys, "worried", worried_xpm); + my_smileys = add_smiley(my_smileys, "grin", grin_xpm); + my_smileys = add_smiley(my_smileys, "blank", blank_xpm); + my_smileys = add_smiley(my_smileys, "oh", oh_xpm); + my_smileys = add_smiley(my_smileys, "confused", confused_xpm); + my_smileys = add_smiley(my_smileys, "lovey", kiss_xpm); + my_smileys = add_smiley(my_smileys, "kiss", kiss_xpm); + my_smileys = add_smiley(my_smileys, "heyy", heyy_xpm); + my_smileys = add_smiley(my_smileys, "blush", blush_xpm); } static void reset_smileys(ebmCallbackData *data) @@ -161,17 +167,20 @@ smileys = eb_smileys(); eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); - smiley_tag=eb_add_menu_item("Console Smilies", EB_IMPORT_MENU, enable_smileys, ebmIMPORTDATA, NULL); + smiley_tag = + eb_add_menu_item("Console Smilies", EB_IMPORT_MENU, + enable_smileys, ebmIMPORTDATA, NULL); } static void enable_smileys(ebmCallbackData *data) { - if(!my_smileys) + if (!my_smileys) return; smileys = my_smileys; eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); - smiley_tag=eb_add_menu_item("Default Smilies", EB_IMPORT_MENU, reset_smileys, ebmIMPORTDATA, NULL); + smiley_tag = + eb_add_menu_item("Default Smilies", EB_IMPORT_MENU, + reset_smileys, ebmIMPORTDATA, NULL); } - |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/utility In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/utility Modified Files: autotrans.c custom_message.c middle.c notes.c rainbow.c Log Message: reformatted source code Index: autotrans.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/utility/autotrans.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- autotrans.c 19 Aug 2009 04:07:04 -0000 1.16 +++ autotrans.c 17 Sep 2009 12:04:59 -0000 1.17 @@ -41,29 +41,26 @@ #include "llist.h" #include "platform_defs.h" - /* already declared in dialog.h - but that uses gtk */ -void do_list_dialog(char * message, char * title, char **list, - void (*action) (char *text, gpointer data), - gpointer data); - +void do_list_dialog(char *message, char *title, char **list, + void (*action) (char *text, gpointer data), gpointer data); + /******************************************************************************* * Begin Module Code ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info autotrans_LTX_plugin_info - #define module_version autotrans_LTX_module_version +#define plugin_info autotrans_LTX_plugin_info +#define module_version autotrans_LTX_module_version #endif - /* Function Prototypes */ -static char *translate_out(const eb_local_account * local, const eb_account * remote, - const struct contact *contact, const char * s); +static char *translate_out(const eb_local_account *local, + const eb_account *remote, const struct contact *contact, const char *s); static int trans_init(); static int trans_finish(); -static void language_select(ebmCallbackData * data); +static void language_select(ebmCallbackData *data); static int doTrans = 0; static int myLanguage = 0; @@ -74,7 +71,6 @@ static int ref_count = 0; - /* Module Exports */ PLUGIN_INFO plugin_info = { PLUGIN_FILTER, @@ -87,9 +83,13 @@ trans_finish, NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static int trans_init() { @@ -119,9 +119,9 @@ il->name = "myLanguage"; il->label = _("My language code:"); { - LList *l=NULL; + LList *l = NULL; int i; - for(i=0; languages[i]; i++) + for (i = 0; languages[i]; i++) l = l_list_append(l, languages[i]); il->widget.listbox.list = l; @@ -130,21 +130,27 @@ eb_debug(DBG_MOD, "Auto-trans initialised\n"); - outgoing_message_filters = l_list_prepend(outgoing_message_filters, &translate_out); - incoming_message_filters = l_list_append(incoming_message_filters, &translate_out); + outgoing_message_filters = + l_list_prepend(outgoing_message_filters, &translate_out); + incoming_message_filters = + l_list_append(incoming_message_filters, &translate_out); /* the following is adapted from notes.c */ if ((tag1 = eb_add_menu_item(_("Set Language"), EB_CHAT_WINDOW_MENU, - language_select, ebmCONTACTDATA, NULL)) == NULL) { - eb_debug(DBG_MOD, "Error! Unable to add Language menu to chat window menu\n"); + language_select, ebmCONTACTDATA, + NULL)) == NULL) { + eb_debug(DBG_MOD, + "Error! Unable to add Language menu to chat window menu\n"); return (-1); } if ((tag2 = eb_add_menu_item(_("Set Language"), EB_CONTACT_MENU, - language_select, ebmCONTACTDATA, NULL)) == NULL) { + language_select, ebmCONTACTDATA, + NULL)) == NULL) { eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag1); - eb_debug(DBG_MOD, "Error! Unable to add Language menu to contact menu\n"); + eb_debug(DBG_MOD, + "Error! Unable to add Language menu to contact menu\n"); return (-1); } @@ -156,12 +162,14 @@ int result = 0; eb_debug(DBG_MOD, "Auto-trans shutting down\n"); - outgoing_message_filters = l_list_remove(outgoing_message_filters, &translate_out); - incoming_message_filters = l_list_remove(incoming_message_filters, &translate_out); - - while(plugin_info.prefs) { + outgoing_message_filters = + l_list_remove(outgoing_message_filters, &translate_out); + incoming_message_filters = + l_list_remove(incoming_message_filters, &translate_out); + + while (plugin_info.prefs) { input_list *il = plugin_info.prefs->next; - if(il && il->type==EB_INPUT_LIST) + if (il && il->type == EB_INPUT_LIST) l_list_free(il->widget.listbox.list); free(plugin_info.prefs); plugin_info.prefs = il; @@ -171,12 +179,14 @@ result = eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag1); if (result) { - g_warning("Unable to remove Language menu item from chat window menu!"); + g_warning + ("Unable to remove Language menu item from chat window menu!"); return (-1); } result = eb_remove_menu_item(EB_CONTACT_MENU, tag2); if (result) { - g_warning("Unable to remove Language menu item from chat window menu!"); + g_warning + ("Unable to remove Language menu item from chat window menu!"); return (-1); } @@ -188,7 +198,7 @@ ******************************************************************************/ static void language_selected(char *text, gpointer data) { - struct contact *cont = (struct contact *) data; + struct contact *cont = (struct contact *)data; cont->language[0] = text[0]; cont->language[1] = text[1]; @@ -197,19 +207,20 @@ write_contact_list(); if (!doTrans) { - ay_do_warning( _("Auto-Translation Warning"), _("You have just selected a language " - "with which to talk to a buddy. This will " - "only affect you if you have the auto-translator" - "plugin turned on. If you do, beware that it will" - "hang each time you send or receive a message, for" - "the time it takes to contact BabelFish. This can" - "take several seconds.") ); + ay_do_warning(_("Auto-Translation Warning"), + _("You have just selected a language " + "with which to talk to a buddy. This will " + "only affect you if you have the auto-translator" + "plugin turned on. If you do, beware that it will" + "hang each time you send or receive a message, for" + "the time it takes to contact BabelFish. This can" + "take several seconds.")); } } -static void language_select(ebmCallbackData * data) +static void language_select(ebmCallbackData *data) { - ebmContactData *ecd = (ebmContactData *) data; + ebmContactData *ecd = (ebmContactData *)data; struct contact *cont; char buf[1024]; @@ -219,11 +230,12 @@ return; } - g_snprintf(buf, 1024, _("Select the code for the language to use when talking to %s"), - cont->nick); + g_snprintf(buf, 1024, + _("Select the code for the language to use when talking to %s"), + cont->nick); do_list_dialog(buf, _("Select Language"), languages, - &language_selected, (gpointer) cont); + &language_selected, (gpointer) cont); } /* @@ -237,14 +249,14 @@ int i = 0; unsigned int n; char *result = NULL; - result = (char *) malloc(strlen(in) + 1); + result = (char *)malloc(strlen(in) + 1); /* convert a string from UTF-8 Format */ for (n = 0; n < strlen(in); n++) { unsigned char c = in[n]; if (c < 128) { - result[i++] = (char) c; + result[i++] = (char)c; } else { result[i++] = (c << 6) | (in[++n] & 63); } @@ -260,35 +272,36 @@ static char *trans_urlencode(const char *instr) { - int ipos=0, bpos=0; + int ipos = 0, bpos = 0; char *str = NULL; int len = strlen(instr); - if(!(str = malloc(sizeof(char) * (3*len + 1)) )) + if (!(str = malloc(sizeof(char) * (3 * len + 1)))) return strdup(""); - while(instr[ipos]) { - while(isurlchar(instr[ipos])) + while (instr[ipos]) { + while (isurlchar(instr[ipos])) str[bpos++] = instr[ipos++]; - if(!instr[ipos]) + if (!instr[ipos]) break; - - snprintf(&str[bpos], 4, "%%%.2x", - (instr[ipos]=='\r' || instr[ipos]=='\n'? - ' ':instr[ipos])); - bpos+=3; + + snprintf(&str[bpos], 4, "%%%.2x", + (instr[ipos] == '\r' || instr[ipos] == '\n' ? + ' ' : instr[ipos])); + bpos += 3; ipos++; } - str[bpos]='\0'; + str[bpos] = '\0'; /* free extra alloc'ed mem. */ len = strlen(str); - str = realloc(str, sizeof(char) * (len+1)); + str = realloc(str, sizeof(char) * (len + 1)); return str; } -static int do_http_post(const char *host, const char *path, const char *enc_data) +static int do_http_post(const char *host, const char *path, + const char *enc_data) { char buff[1024]; int fd; @@ -297,13 +310,12 @@ if (fd > 0) { snprintf(buff, sizeof(buff), - "POST %s HTTP/1.1\r\n" - "Host: %s\r\n" - "User-Agent: Mozilla/4.5 [en] (%s/%s)\r\n" - "Content-type: application/x-www-form-urlencoded\r\n" - "Content-length: %d\r\n" - "\r\n", - path, host, PACKAGE, VERSION, strlen(enc_data)); + "POST %s HTTP/1.1\r\n" + "Host: %s\r\n" + "User-Agent: Mozilla/4.5 [en] (%s/%s)\r\n" + "Content-type: application/x-www-form-urlencoded\r\n" + "Content-length: %d\r\n" + "\r\n", path, host, PACKAGE, VERSION, strlen(enc_data)); write(fd, buff, strlen(buff)); write(fd, enc_data, strlen(enc_data)); @@ -314,40 +326,39 @@ #define START_POS "<input type=hidden name=\"q\" value=\"" #define END_POS "\">" -static char *doTranslate(const char * ostring, const char * from, const char * to) +static char *doTranslate(const char *ostring, const char *from, const char *to) { char buf[2048]; int fd; - int offset=0; + int offset = 0; char *string; char *result; string = trans_urlencode(ostring); - snprintf(buf, 2048, "tt=urltext&lp=%s_%s&urltext=%s", - from, to, string); + snprintf(buf, 2048, "tt=urltext&lp=%s_%s&urltext=%s", from, to, string); free(string); fd = do_http_post("babelfish.altavista.com", "/babelfish/tr", buf); - while((ay_tcp_readline(buf+offset, sizeof(buf)-offset, fd)) > 0) { + while ((ay_tcp_readline(buf + offset, sizeof(buf) - offset, fd)) > 0) { char *end, *start = strstr(buf, START_POS); - offset=0; - if(!start) + offset = 0; + if (!start) continue; - + start += strlen(START_POS); end = strstr(start, END_POS); - if(end) { - *end='\0'; + if (end) { + *end = '\0'; string = start; break; } else { /* append next line */ offset = strlen(buf); } - + } - + eb_debug(DBG_MOD, "Translated %s to %s\n", ostring, string); result = Utf8ToStr(string); @@ -355,8 +366,8 @@ return result; } -static char *translate_out(const eb_local_account * local, const eb_account * remote, - const struct contact *contact, const char * s) +static char *translate_out(const eb_local_account *local, + const eb_account *remote, const struct contact *contact, const char *s) { char *p; char l[3]; @@ -369,7 +380,7 @@ } // no translation strncpy(l, languages[myLanguage], 2); - l[2]=0; + l[2] = 0; if (!strcmp(contact->language, l)) { return strdup(s); } // speak same language Index: custom_message.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/utility/custom_message.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- custom_message.c 27 Jul 2009 16:42:04 -0000 1.3 +++ custom_message.c 17 Sep 2009 12:04:59 -0000 1.4 @@ -42,26 +42,25 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info custmsg_LTX_plugin_info - #define plugin_init custmsg_LTX_plugin_init - #define plugin_finish custmsg_LTX_plugin_finish - #define module_version custmsg_LTX_module_version +#define plugin_info custmsg_LTX_plugin_info +#define plugin_init custmsg_LTX_plugin_init +#define plugin_finish custmsg_LTX_plugin_finish +#define module_version custmsg_LTX_module_version #endif - /* Function Prototypes */ /* ebmCallbackData is a parent struct, the child of which will be an ebmContactData */ static int plugin_init(); static int plugin_finish(); -static int eb_custom_msg_timeout_callback(void * data); +static int eb_custom_msg_timeout_callback(void *data); -static int ref_count=0; +static int ref_count = 0; /* Module Exports */ PLUGIN_INFO plugin_info = { - PLUGIN_UTILITY, - "Custom Message", - "Pick a custom away message from a file", + PLUGIN_UTILITY, + "Custom Message", + "Pick a custom away message from a file", "$Revision$", "$Date$", &ref_count, @@ -69,17 +68,21 @@ plugin_finish, NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static char custom_away_msg[MAX_PREF_LEN]; -static int enable_plugin=0; -static int custom_msg_tag=0; +static int enable_plugin = 0; +static int custom_msg_tag = 0; static int plugin_init() { - input_list * il = calloc(1, sizeof(input_list)); + input_list *il = calloc(1, sizeof(input_list)); plugin_info.prefs = il; il->widget.entry.value = custom_away_msg; @@ -91,22 +94,22 @@ il = il->next; il->widget.checkbox.value = &enable_plugin; il->name = "enable_plugin"; - il->label= _("_Automatically update status:"); + il->label = _("_Automatically update status:"); il->type = EB_INPUT_CHECKBOX; - custom_msg_tag = eb_timeout_add(5 * 1000, - (void *) eb_custom_msg_timeout_callback, 0); + custom_msg_tag = eb_timeout_add(5 * 1000, + (void *)eb_custom_msg_timeout_callback, 0); return 0; } static int plugin_finish() { - if(custom_msg_tag) { + if (custom_msg_tag) { eb_timeout_remove(custom_msg_tag); - custom_msg_tag=0; + custom_msg_tag = 0; } - while(plugin_info.prefs) { + while (plugin_info.prefs) { input_list *il = plugin_info.prefs->next; free(plugin_info.prefs); plugin_info.prefs = il; @@ -123,12 +126,12 @@ { LList *list; - for (list = accounts; list; list = list->next) - { + for (list = accounts; list; list = list->next) { eb_local_account *ela = list->data; /* Only change state for those accounts which are connected */ - if(ela->connected) - eb_services[ela->service_id].sc->set_away(ela, a_message, 0); + if (ela->connected) + eb_services[ela->service_id].sc->set_away(ela, + a_message, 0); } } @@ -139,24 +142,24 @@ int fd, n, i; char buf[1024]; - if(!enable_plugin) - return 1; + if (!enable_plugin) + return 1; - if( !custom_away_msg[0] ) + if (!custom_away_msg[0]) return 1; stat(custom_away_msg, &s); - if(file_time >= s.st_mtime) + if (file_time >= s.st_mtime) return 1; file_time = s.st_mtime; fd = open(custom_away_msg, O_RDONLY); - n=read(fd, buf, sizeof(buf)-1); - buf[n]=0; - for(i=n-1; buf[i]=='\n'; i--) - buf[i]=0; + n = read(fd, buf, sizeof(buf) - 1); + buf[n] = 0; + for (i = n - 1; buf[i] == '\n'; i--) + buf[i] = 0; close(fd); @@ -164,5 +167,3 @@ return 1; } - - Index: middle.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/utility/middle.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- middle.c 27 Jul 2009 16:42:04 -0000 1.11 +++ middle.c 17 Sep 2009 12:04:59 -0000 1.12 @@ -42,27 +42,25 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info middle_LTX_plugin_info - #define plugin_init middle_LTX_plugin_init - #define plugin_finish middle_LTX_plugin_finish - #define module_version middle_LTX_module_version +#define plugin_info middle_LTX_plugin_info +#define plugin_init middle_LTX_plugin_init +#define plugin_finish middle_LTX_plugin_finish +#define module_version middle_LTX_module_version #endif - /* Function Prototypes */ -static char *plstripHTML(const eb_local_account * local, const eb_account * remote, - const struct contact *contact, const char *s); -static int middle_init( void ); -static int middle_finish( void ); +static char *plstripHTML(const eb_local_account *local, + const eb_account *remote, const struct contact *contact, const char *s); +static int middle_init(void); +static int middle_finish(void); -static int s_doLeet = 0; -static int s_doExtremeLeet = 0; +static int s_doLeet = 0; +static int s_doExtremeLeet = 0; -static int s_ref_count = 0; +static int s_ref_count = 0; /* Module Exports */ -PLUGIN_INFO plugin_info = -{ +PLUGIN_INFO plugin_info = { PLUGIN_FILTER, "L33t-o-matic", "Turns all incoming and outgoing messages into l33t-speak", @@ -73,161 +71,177 @@ middle_finish, NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} -static int middle_init( void ) +static int middle_init(void) { - input_list *il = calloc( 1, sizeof(input_list) ); + input_list *il = calloc(1, sizeof(input_list)); plugin_info.prefs = il; il->widget.checkbox.value = &s_doLeet; il->name = "s_doLeet"; - il->label = strdup( _("Enable L33t-speak conversion") ); + il->label = strdup(_("Enable L33t-speak conversion")); il->type = EB_INPUT_CHECKBOX; - - il->next = calloc( 1, sizeof(input_list) ); + + il->next = calloc(1, sizeof(input_list)); il = il->next; il->widget.checkbox.value = &s_doExtremeLeet; il->name = "s_doExtremeLeet"; - il->label = strdup( _("Enable 3x7r3m3 L33t-speak [implies previous]") ); + il->label = strdup(_("Enable 3x7r3m3 L33t-speak [implies previous]")); il->type = EB_INPUT_CHECKBOX; eb_debug(DBG_MOD, "L33tSp33k initialised\n"); - outgoing_message_filters = l_list_prepend( outgoing_message_filters, &plstripHTML ); - incoming_message_filters = l_list_append( incoming_message_filters, &plstripHTML ); + outgoing_message_filters = + l_list_prepend(outgoing_message_filters, &plstripHTML); + incoming_message_filters = + l_list_append(incoming_message_filters, &plstripHTML); - return( 0 ); + return (0); } -static int middle_finish( void ) +static int middle_finish(void) { eb_debug(DBG_MOD, "L33tSp33k shutting down\n"); - outgoing_message_filters = l_list_remove( outgoing_message_filters, &plstripHTML ); - incoming_message_filters = l_list_remove( incoming_message_filters, &plstripHTML ); - - while( plugin_info.prefs ) - { + outgoing_message_filters = + l_list_remove(outgoing_message_filters, &plstripHTML); + incoming_message_filters = + l_list_remove(incoming_message_filters, &plstripHTML); + + while (plugin_info.prefs) { input_list *il = plugin_info.prefs->next; - free( plugin_info.prefs ); + free(plugin_info.prefs); plugin_info.prefs = il; } - return( 0 ); + return (0); } /******************************************************************************* * End Module Code ******************************************************************************/ -static char *plstripHTML(const eb_local_account * local, const eb_account * remote, - const struct contact *contact, const char *in) +static char *plstripHTML(const eb_local_account *local, + const eb_account *remote, const struct contact *contact, const char *in) { - int pos = 0; - int post = 0; - char *s = strdup(in); - char *t = NULL; - - - if ( !s_doLeet && !s_doExtremeLeet ) - return( s ); - - t = calloc( 3, strlen( s ) ); - - while ( s[pos] != '\0' ) - { - switch ( s[pos] ) - { - case 'a': case 'A': - t[post] = '4'; - break; - - case 'c': case 'C': - t[post] = '('; - break; - - case 'e': case 'E': - t[post] = '3'; - break; - - case 'l': case 'L': - t[post] = '1'; - break; - - case 's': case 'S': - t[post] = '5'; - break; - - case 't': case 'T': - t[post] = '7'; + int pos = 0; + int post = 0; + char *s = strdup(in); + char *t = NULL; + + if (!s_doLeet && !s_doExtremeLeet) + return (s); + + t = calloc(3, strlen(s)); + + while (s[pos] != '\0') { + switch (s[pos]) { + case 'a': + case 'A': + t[post] = '4'; + break; + + case 'c': + case 'C': + t[post] = '('; + break; + + case 'e': + case 'E': + t[post] = '3'; + break; + + case 'l': + case 'L': + t[post] = '1'; + break; + + case 's': + case 'S': + t[post] = '5'; + break; + + case 't': + case 'T': + t[post] = '7'; + break; + + default: + t[post] = s[pos]; + break; + } + + if (s_doExtremeLeet) { + switch (s[pos]) { + case 'd': + case 'D': + t[post++] = '|'; + t[post] = ')'; break; - - default: - t[post] = s[pos]; + + case 'h': + case 'H': + t[post++] = '|'; + t[post++] = '-'; + t[post] = '|'; + break; + + case 'k': + case 'K': + t[post++] = '|'; + t[post] = '<'; + break; + + case 'm': + case 'M': + t[post++] = '/'; + t[post++] = 'v'; + t[post] = '\\'; + break; + + case 'n': + case 'N': + t[post++] = '|'; + t[post++] = '\\'; + t[post] = '|'; + break; + + case 'o': + case 'O': + t[post++] = '('; + t[post] = ')'; + break; + + case 'v': + case 'V': + t[post++] = '\\'; + t[post] = '/'; break; - } - - if ( s_doExtremeLeet ) - { - switch ( s[pos] ) - { - case 'd': case 'D': - t[post++] = '|'; - t[post] = ')'; - break; - - case 'h': case 'H': - t[post++] = '|'; - t[post++] ='-'; - t[post] ='|'; - break; - - case 'k': case 'K': - t[post++] = '|'; - t[post] ='<'; - break; - - case 'm': case 'M': - t[post++] = '/'; - t[post++] = 'v'; - t[post] = '\\'; - break; - - case 'n': case 'N': - t[post++] = '|'; - t[post++] = '\\'; - t[post] = '|'; - break; - - case 'o': case 'O': - t[post++] = '('; - t[post] = ')'; - break; - - case 'v': case 'V': - t[post++] = '\\'; - t[post] = '/'; - break; - - case 'w': case 'W': - t[post++] = '\\'; - t[post++] = '^'; - t[post] = '/'; - break; - default: - break; + case 'w': + case 'W': + t[post++] = '\\'; + t[post++] = '^'; + t[post] = '/'; + break; + + default: + break; } } - + pos++; post++; } - + t[post] = '\0'; - - free( s ); - - return( t ); + + free(s); + + return (t); } Index: notes.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/utility/notes.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- notes.c 27 Jul 2009 16:42:04 -0000 1.14 +++ notes.c 17 Sep 2009 12:04:59 -0000 1.15 @@ -43,12 +43,11 @@ #define NAME_MAX 512 #endif - static char notes_dir[NAME_MAX]; #ifdef __MINGW32__ -static char notes_editor[MAX_PREF_LEN]="notepad"; +static char notes_editor[MAX_PREF_LEN] = "notepad"; #else -static char notes_editor[MAX_PREF_LEN]="xedit"; +static char notes_editor[MAX_PREF_LEN] = "xedit"; #endif /******************************************************************************* @@ -56,26 +55,25 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info notes_LTX_plugin_info - #define plugin_init notes_LTX_plugin_init - #define plugin_finish notes_LTX_plugin_finish - #define module_version notes_LTX_module_version +#define plugin_info notes_LTX_plugin_info +#define plugin_init notes_LTX_plugin_init +#define plugin_finish notes_LTX_plugin_finish +#define module_version notes_LTX_module_version #endif - /* Function Prototypes */ /* ebmCallbackData is a parent struct, the child of which will be an ebmContactData */ static void notes_feature(ebmCallbackData *data); static int plugin_init(); static int plugin_finish(); -static int ref_count=0; +static int ref_count = 0; /* Module Exports */ PLUGIN_INFO plugin_info = { - PLUGIN_UTILITY, - "Notes", - "Store notes about your contacts and buddies", + PLUGIN_UTILITY, + "Notes", + "Store notes about your contacts and buddies", "$Revision$", "$Date$", &ref_count, @@ -83,19 +81,23 @@ plugin_finish, NULL }; + /* End Module Exports */ -static void *notes_tag1=NULL; -static void *notes_tag2=NULL; +static void *notes_tag1 = NULL; +static void *notes_tag2 = NULL; -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} /* 929347 */ static void rename_notes(char *onick, char *nnick) { char cmd1[1024]; char cmd2[1024]; - if (strcmp(onick,nnick) == 0) + if (strcmp(onick, nnick) == 0) return; eb_debug(DBG_MOD, "> Rename %s to %s\n", onick, nnick); snprintf(cmd1, 1024, "%s/%s", notes_dir, onick); @@ -106,20 +108,26 @@ static int plugin_init() { - input_list * il = calloc(1, sizeof(input_list)); - int result=0; + input_list *il = calloc(1, sizeof(input_list)); + int result = 0; eb_debug(DBG_MOD, "notes init\n"); - notes_tag1=eb_add_menu_item("Notes", EB_CHAT_WINDOW_MENU, notes_feature, ebmCONTACTDATA, NULL); - if(!notes_tag1) { - eb_debug(DBG_MOD, "Error! Unable to add Notes menu to chat window menu\n"); - return(-1); - } - notes_tag2=eb_add_menu_item("Notes", EB_CONTACT_MENU, notes_feature, ebmCONTACTDATA, NULL); - if(!notes_tag2) { - result=eb_remove_menu_item(EB_CHAT_WINDOW_MENU, notes_tag1); - eb_debug(DBG_MOD, "Error! Unable to add Notes menu to contact menu\n"); - return(-1); + notes_tag1 = + eb_add_menu_item("Notes", EB_CHAT_WINDOW_MENU, notes_feature, + ebmCONTACTDATA, NULL); + if (!notes_tag1) { + eb_debug(DBG_MOD, + "Error! Unable to add Notes menu to chat window menu\n"); + return (-1); + } + notes_tag2 = + eb_add_menu_item("Notes", EB_CONTACT_MENU, notes_feature, + ebmCONTACTDATA, NULL); + if (!notes_tag2) { + result = eb_remove_menu_item(EB_CHAT_WINDOW_MENU, notes_tag1); + eb_debug(DBG_MOD, + "Error! Unable to add Notes menu to contact menu\n"); + return (-1); } snprintf(notes_dir, NAME_MAX, "%s/notes", eb_config_dir()); mkdir(notes_dir, 0700); @@ -130,33 +138,35 @@ il->label = _("Notes Editor:"); il->type = EB_INPUT_ENTRY; /* 929347 */ - nick_modify_utility = l_list_append(nick_modify_utility,&rename_notes); - return(0); + nick_modify_utility = l_list_append(nick_modify_utility, &rename_notes); + return (0); } static int plugin_finish() { - int result=0; - - while(plugin_info.prefs) { + int result = 0; + + while (plugin_info.prefs) { input_list *il = plugin_info.prefs->next; free(plugin_info.prefs); plugin_info.prefs = il; } - result=eb_remove_menu_item(EB_CHAT_WINDOW_MENU, notes_tag1); - if(result) { - eb_debug(DBG_MOD, "Unable to remove Notes menu item from chat window menu!\n"); - return(-1); - } - result=eb_remove_menu_item(EB_CONTACT_MENU, notes_tag2); - if(result) { - eb_debug(DBG_MOD, "Unable to remove Notes menu item from chat window menu!\n"); - return(-1); + result = eb_remove_menu_item(EB_CHAT_WINDOW_MENU, notes_tag1); + if (result) { + eb_debug(DBG_MOD, + "Unable to remove Notes menu item from chat window menu!\n"); + return (-1); + } + result = eb_remove_menu_item(EB_CONTACT_MENU, notes_tag2); + if (result) { + eb_debug(DBG_MOD, + "Unable to remove Notes menu item from chat window menu!\n"); + return (-1); } /* 929347 */ - nick_modify_utility = l_list_remove(nick_modify_utility,&rename_notes); - return(0); + nick_modify_utility = l_list_remove(nick_modify_utility, &rename_notes); + return (0); } /******************************************************************************* @@ -166,7 +176,7 @@ /* We're really going to get back an ebmContactData object */ static void notes_feature(ebmCallbackData *data) { - ebmContactData *ecd=NULL; + ebmContactData *ecd = NULL; char buff[256]; char cmd_buff[1024]; #ifndef __MINGW32__ @@ -174,13 +184,15 @@ #endif eb_debug(DBG_MOD, ">\n"); - if(IS_ebmContactData(data)) - ecd=(ebmContactData *)data; - else { /* This should never happen, unless something is horribly wrong */ - eb_debug(DBG_MOD, "*** Warning *** Unexpected ebmCallbackData type returned!\n"); + if (IS_ebmContactData(data)) + ecd = (ebmContactData *)data; + else { /* This should never happen, unless something is horribly wrong */ + eb_debug(DBG_MOD, + "*** Warning *** Unexpected ebmCallbackData type returned!\n"); return; } - eb_debug(DBG_MOD, "contact: %s remote_account: %s\n", ecd->contact, ecd->remote_account); + eb_debug(DBG_MOD, "contact: %s remote_account: %s\n", ecd->contact, + ecd->remote_account); snprintf(buff, 255, "Notes on %s", ecd->contact); snprintf(cmd_buff, 1023, "%s/%s", notes_dir, ecd->contact); Index: rainbow.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/utility/rainbow.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rainbow.c 27 Jul 2009 16:42:04 -0000 1.9 +++ rainbow.c 17 Sep 2009 12:04:59 -0000 1.10 @@ -36,24 +36,21 @@ #include "prefs.h" #include "platform_defs.h" - /******************************************************************************* * Begin Module Code ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info rainbow_LTX_plugin_info - #define plugin_init rainbow_LTX_plugin_init - #define plugin_finish rainbow_LTX_plugin_finish - #define module_version rainbow_LTX_module_version +#define plugin_info rainbow_LTX_plugin_info +#define plugin_init rainbow_LTX_plugin_init +#define plugin_finish rainbow_LTX_plugin_finish +#define module_version rainbow_LTX_module_version #endif - /* Function Prototypes */ /* ebmCallbackData is a parent struct, the child of which will be an ebmContactData */ -static char *dorainbow(const eb_local_account * local, - const eb_account * remote, - const struct contact *contact, const char *s); +static char *dorainbow(const eb_local_account *local, + const eb_account *remote, const struct contact *contact, const char *s); static int rainbow_init(); static int rainbow_finish(); @@ -68,8 +65,10 @@ static char send_b[MAX_PREF_LEN] = "255"; static char *html_tags[] = - { "html", "body", "font", "p", "i", "b", "u", "img", "a", "br", "hr", -"head" }; + { "html", "body", "font", "p", "i", "b", "u", "img", "a", "br", "hr", + "head" +}; + static int num_tags = 12; static int ref_count = 0; @@ -86,9 +85,13 @@ rainbow_finish, NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static int rainbow_init() { @@ -141,7 +144,7 @@ eb_debug(DBG_MOD, "Rainbow initialised\n"); outgoing_message_filters = - l_list_append(outgoing_message_filters, &dorainbow); + l_list_append(outgoing_message_filters, &dorainbow); return 0; } @@ -150,9 +153,9 @@ { eb_debug(DBG_MOD, "Rainbow shutting down\n"); outgoing_message_filters = - l_list_remove(outgoing_message_filters, &dorainbow); - - while(plugin_info.prefs) { + l_list_remove(outgoing_message_filters, &dorainbow); + + while (plugin_info.prefs) { input_list *il = plugin_info.prefs->next; free(plugin_info.prefs); plugin_info.prefs = il; @@ -164,9 +167,8 @@ /******************************************************************************* * End Module Code ******************************************************************************/ -static char *dorainbow(const eb_local_account * local, - const eb_account * remote, - const struct contact *contact, const char *s) +static char *dorainbow(const eb_local_account *local, + const eb_account *remote, const struct contact *contact, const char *s) { char *retval; char *wptr; @@ -214,8 +216,8 @@ } // strip space before HTML tag for (a = 0; a < num_tags; a++) { if (!strncasecmp - (s + p2, html_tags[a], - strlen(html_tags[a]))) { + (s + p2, html_tags[a], + strlen(html_tags[a]))) { found = 1; break; } @@ -225,7 +227,7 @@ while (1) { *(wptr++) = s[pos++]; if (s[pos - 1] == '\0' - || s[pos - 1] == '>') { + || s[pos - 1] == '>') { break; } } @@ -235,16 +237,13 @@ } } - wptr += - snprintf(wptr, 22 * (len - pos), - "<font color=#%02x%02x%02x>%c", - (pos * end_r + (len - pos) * start_r) / len, - (pos * end_g + (len - pos) * start_g) / len, - (pos * end_b + (len - pos) * start_b) / len, - s[pos]); + wptr += snprintf(wptr, 22 * (len - pos), + "<font color=#%02x%02x%02x>%c", + (pos * end_r + (len - pos) * start_r) / len, + (pos * end_g + (len - pos) * start_g) / len, + (pos * end_b + (len - pos) * start_b) / len, s[pos]); pos++; } - return retval; } |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/icq/libicq In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/icq/libicq Modified Files: config.c icq.h icqconfig.h icqfile.c libicq.c libicq.h receive.c receive.h send.c send.h tcp.c tcp.h util.c util.h Log Message: reformatted source code Index: config.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/config.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- config.c 1 Apr 2003 07:24:28 -0000 1.1.1.1 +++ config.c 17 Sep 2009 12:04:58 -0000 1.2 @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -39,230 +38,219 @@ int Get_Config_Info() { - char path[300]; + char path[300]; #if 0 #warning "Crashes" - ICQ_Debug(ICQ_VERB_INFO, "LIBICQ> Get_Config_Info"); + ICQ_Debug(ICQ_VERB_INFO, "LIBICQ> Get_Config_Info"); #endif #if defined( _WIN32 ) - strcpy( path, "C:" ); + strcpy(path, "C:"); #else - strcpy(path, getenv("HOME")); + strcpy(path, getenv("HOME")); #endif - strcat(path, "/.icq"); - mkdir(path, S_IRWXU); + strcat(path, "/.icq"); + mkdir(path, S_IRWXU); - strcpy(icq_rc, path); - strcat(icq_rc, "/icq.rc"); - if(Verbose & ICQ_VERB_INFO) - printf("ICQ.RC: %s\n", icq_rc); - - strcpy(contacts_rc, path); - strcat(contacts_rc, "/contacts.rc"); - if(Verbose & ICQ_VERB_INFO) - printf("CONTACTS.RC: %s\n", contacts_rc); - - if(!Read_ICQ_RC(icq_rc)) return 0; - Read_Contacts_RC(contacts_rc); - - return 1; -} + strcpy(icq_rc, path); + strcat(icq_rc, "/icq.rc"); + if (Verbose & ICQ_VERB_INFO) + printf("ICQ.RC: %s\n", icq_rc); + + strcpy(contacts_rc, path); + strcat(contacts_rc, "/contacts.rc"); + if (Verbose & ICQ_VERB_INFO) + printf("CONTACTS.RC: %s\n", contacts_rc); + + if (!Read_ICQ_RC(icq_rc)) + return 0; + Read_Contacts_RC(contacts_rc); + return 1; +} -int Read_ICQ_RC(char* filename) +int Read_ICQ_RC(char *filename) { - /* CfgVersion doesn't exist in older configuration files, but they should - still be read fine. It will add "Version 1" to them when saving them as - Version 1 is considered the version with a version tag. Enough of that. */ - - int CfgVersion = 0; - FILE* fp; - char buf[100], c; + /* CfgVersion doesn't exist in older configuration files, but they should + still be read fine. It will add "Version 1" to them when saving them as + Version 1 is considered the version with a version tag. Enough of that. */ + + int CfgVersion = 0; + FILE *fp; + char buf[100], c; #if 0 #warning "Crashes!" - ICQ_Debug(ICQ_VERB_INFO, "\nLIBICQ> Get_ICQ_RC"); + ICQ_Debug(ICQ_VERB_INFO, "\nLIBICQ> Get_ICQ_RC"); #endif - if(!(fp = fopen(filename, "rt"))) - { - if(UIN == 0) return 0; - - set_status = STATUS_ONLINE; - strcpy(server, "icq.mirabilis.com"); - remote_port = 4000; - - Write_ICQ_RC(filename); - return 1; - } - - while(!feof(fp)) - { - c = fgetc(fp); - if(c == '#') /* Comment */ - { - while(!feof(fp) && fgetc(fp) != '\n'); - continue; - } - else if(c == '\n') /* Blank line */ - { - continue; - } - else - { - ungetc(c, fp); - } - - fscanf(fp, "%s ", buf); - - if(CfgVersion >= 0) - { - /* In all cases, check for the following: */ - if (!strcmp(buf, "Version")) fscanf(fp, "%d\n", &CfgVersion); - else if(!strcmp(buf, "UIN")) fscanf(fp, "%d\n", &UIN); - else if(!strcmp(buf, "Password")) fscanf(fp, "%s\n", passwd); - else if(!strcmp(buf, "Status")) fscanf(fp, "%d\n", &set_status); - else if(!strcmp(buf, "Server")) fscanf(fp, "%s\n", server); - else if(!strcmp(buf, "Port")) fscanf(fp, "%d\n", &remote_port); - } - - if(CfgVersion > 0) - { - /* VER 1 This is the first version with the "Version" number */ - /* No features added with version 1 */ - } - - if(CfgVersion > 1) - { - /* Put new config information for version 2 in here */ - /* if (!strcmp(buf, "Whatever")) ... */ - } - } - - if(fclose(fp) != 0) - { - if(Verbose & ICQ_VERB_ERR) - printf("\nfclose (%s) failed.\n", filename); - return 0; - } + if (!(fp = fopen(filename, "rt"))) { + if (UIN == 0) + return 0; + + set_status = STATUS_ONLINE; + strcpy(server, "icq.mirabilis.com"); + remote_port = 4000; + + Write_ICQ_RC(filename); + return 1; + } + + while (!feof(fp)) { + c = fgetc(fp); + if (c == '#') { /* Comment */ + while (!feof(fp) && fgetc(fp) != '\n') ; + continue; + } else if (c == '\n') { /* Blank line */ + continue; + } else { + ungetc(c, fp); + } + + fscanf(fp, "%s ", buf); + + if (CfgVersion >= 0) { + /* In all cases, check for the following: */ + if (!strcmp(buf, "Version")) + fscanf(fp, "%d\n", &CfgVersion); + else if (!strcmp(buf, "UIN")) + fscanf(fp, "%d\n", &UIN); + else if (!strcmp(buf, "Password")) + fscanf(fp, "%s\n", passwd); + else if (!strcmp(buf, "Status")) + fscanf(fp, "%d\n", &set_status); + else if (!strcmp(buf, "Server")) + fscanf(fp, "%s\n", server); + else if (!strcmp(buf, "Port")) + fscanf(fp, "%d\n", &remote_port); + } + + if (CfgVersion > 0) { + /* VER 1 This is the first version with the "Version" number */ + /* No features added with version 1 */ + } + + if (CfgVersion > 1) { + /* Put new config information for version 2 in here */ + /* if (!strcmp(buf, "Whatever")) ... */ + } + } + + if (fclose(fp) != 0) { + if (Verbose & ICQ_VERB_ERR) + printf("\nfclose (%s) failed.\n", filename); + return 0; + } - return 1; + return 1; } - -void Write_ICQ_RC(char* filename) +void Write_ICQ_RC(char *filename) { - int CfgVersion = 1; // Current version - FILE* fp; + int CfgVersion = 1; // Current version + FILE *fp; - ICQ_Debug(ICQ_VERB_INFO, "\nLIBICQ> Write_ICQ_RC"); + ICQ_Debug(ICQ_VERB_INFO, "\nLIBICQ> Write_ICQ_RC"); - if(!(fp = fopen(filename, "wt"))) - { - ICQ_Debug(ICQ_VERB_ERR, "LIBICQ> failed to open file."); + if (!(fp = fopen(filename, "wt"))) { + ICQ_Debug(ICQ_VERB_ERR, "LIBICQ> failed to open file."); /*win32--#warning "FIXME: ... but we should return a value to know if we failed."*/ - return; - } + return; + } - fprintf(fp, "# ICQ connection settings\n\n"); - fprintf(fp, "Version %d\n", CfgVersion); - fprintf(fp, "UIN %d\n", UIN); - fprintf(fp, "Password %s\n", passwd); - fprintf(fp, "Status %d\n", set_status); - fprintf(fp, "Server %s\n", server); - fprintf(fp, "Port %d\n", remote_port); - - if (fclose (fp) != 0) - { - if(Verbose & ICQ_VERB_ERR) - printf("\nfclose (%s) failed.\n", filename); + fprintf(fp, "# ICQ connection settings\n\n"); + fprintf(fp, "Version %d\n", CfgVersion); + fprintf(fp, "UIN %d\n", UIN); + fprintf(fp, "Password %s\n", passwd); + fprintf(fp, "Status %d\n", set_status); + fprintf(fp, "Server %s\n", server); + fprintf(fp, "Port %d\n", remote_port); + + if (fclose(fp) != 0) { + if (Verbose & ICQ_VERB_ERR) + printf("\nfclose (%s) failed.\n", filename); /* Void Function ... but we should return a value to know if we failed. return PROBLEM!; */ - } + } } - -int Read_Contacts_RC(char* filename) +int Read_Contacts_RC(char *filename) { - FILE* fp; - char buf[100], c; + FILE *fp; + char buf[100], c; - Num_Contacts = 0; + Num_Contacts = 0; #if 0 #warning "Crashes!" - ICQ_Debug(ICQ_VERB_INFO, "LIBICQ> Read_Contacts_RC"); + ICQ_Debug(ICQ_VERB_INFO, "LIBICQ> Read_Contacts_RC"); #endif - if(!(fp = fopen(filename, "rt"))) return 0; + if (!(fp = fopen(filename, "rt"))) + return 0; - while(!feof(fp)) - { - c = fgetc(fp); - if(c == '#') - { - fgets(buf, 100, fp); - continue; - } - else if(feof(fp)) - break; - else if(c == '\n') - continue; - else - ungetc(c, fp); - - fscanf(fp, "%d ", &Contacts[Num_Contacts].uin); - fgets(buf, 100, fp); - buf[strlen(buf) - 1] = '\0'; - strncpy(Contacts[Num_Contacts].nick, buf, 20); - Contacts[Num_Contacts].status = STATUS_OFFLINE; - Contacts[Num_Contacts].last_time = -1L; - Contacts[Num_Contacts].current_ip = -1L; - Contacts[Num_Contacts].tcp_sok = -1L; - Contacts[Num_Contacts].tcp_port = 0; - Contacts[Num_Contacts].tcp_status = TCP_NOT_CONNECTED; - Contacts[Num_Contacts].chat_sok = -1L; - Contacts[Num_Contacts].chat_port = 0; - Contacts[Num_Contacts].chat_status = TCP_NOT_CONNECTED; - Contacts[Num_Contacts].chat_active = FALSE; - Contacts[Num_Contacts].chat_active2 = FALSE; - Num_Contacts++; - } - - if(fclose(fp) != 0) - { - if(Verbose & ICQ_VERB_ERR) - printf("\nfclose (%s) failed.\n", filename); - return 0; - } - - return 1; -} + while (!feof(fp)) { + c = fgetc(fp); + if (c == '#') { + fgets(buf, 100, fp); + continue; + } else if (feof(fp)) + break; + else if (c == '\n') + continue; + else + ungetc(c, fp); + + fscanf(fp, "%d ", &Contacts[Num_Contacts].uin); + fgets(buf, 100, fp); + buf[strlen(buf) - 1] = '\0'; + strncpy(Contacts[Num_Contacts].nick, buf, 20); + Contacts[Num_Contacts].status = STATUS_OFFLINE; + Contacts[Num_Contacts].last_time = -1L; + Contacts[Num_Contacts].current_ip = -1L; + Contacts[Num_Contacts].tcp_sok = -1L; + Contacts[Num_Contacts].tcp_port = 0; + Contacts[Num_Contacts].tcp_status = TCP_NOT_CONNECTED; + Contacts[Num_Contacts].chat_sok = -1L; + Contacts[Num_Contacts].chat_port = 0; + Contacts[Num_Contacts].chat_status = TCP_NOT_CONNECTED; + Contacts[Num_Contacts].chat_active = FALSE; + Contacts[Num_Contacts].chat_active2 = FALSE; + Num_Contacts++; + } + + if (fclose(fp) != 0) { + if (Verbose & ICQ_VERB_ERR) + printf("\nfclose (%s) failed.\n", filename); + return 0; + } + return 1; +} -void Write_Contacts_RC(char* filename) +void Write_Contacts_RC(char *filename) { - FILE* fp; - int x; - - ICQ_Debug(ICQ_VERB_INFO, "LIBICQ> Write_Contacts_RC"); - - if(!(fp = fopen(filename, "wt"))) return; - - fprintf(fp, "# ICQ contact list\n\n"); - - for(x = 0; x < Num_Contacts; x++) - if((Contacts[x].uin > 0) && (strlen(Contacts[x].nick) > 0) - && (Contacts[x].status != STATUS_NOT_IN_LIST)) - fprintf(fp, "%d %s\n", Contacts[x].uin, Contacts[x].nick); - - if(fclose (fp) != 0) - { - if(Verbose & ICQ_VERB_ERR) - printf("\nfclose (%s) failed.\n", filename); + FILE *fp; + int x; + + ICQ_Debug(ICQ_VERB_INFO, "LIBICQ> Write_Contacts_RC"); + + if (!(fp = fopen(filename, "wt"))) + return; + + fprintf(fp, "# ICQ contact list\n\n"); + + for (x = 0; x < Num_Contacts; x++) + if ((Contacts[x].uin > 0) && (strlen(Contacts[x].nick) > 0) + && (Contacts[x].status != STATUS_NOT_IN_LIST)) + fprintf(fp, "%d %s\n", Contacts[x].uin, + Contacts[x].nick); + + if (fclose(fp) != 0) { + if (Verbose & ICQ_VERB_ERR) + printf("\nfclose (%s) failed.\n", filename); // Void function ... but we should return a value to know if we failed // return 0; - } + } } Index: icq.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/icq.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- icq.h 1 Apr 2003 07:24:28 -0000 1.1.1.1 +++ icq.h 17 Sep 2009 12:04:58 -0000 1.2 @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #ifndef __ICQ_H__ #define __ICQ_H__ @@ -37,50 +36,44 @@ #define PACKET_DIRECTION_SEND 4 #define PACKET_DIRECTION_RECEIVE 8 - -typedef struct -{ - guint8 dummy[2]; /* to fix alignment problem */ - guint8 ver[2]; - guint8 rand[2]; - guint8 zero[2]; - guint8 cmd[2]; - guint8 seq[2]; - guint8 seq2[2]; - guint8 UIN[4]; - guint8 checkcode[4]; +typedef struct { + guint8 dummy[2]; /* to fix alignment problem */ + guint8 ver[2]; + guint8 rand[2]; + guint8 zero[2]; + guint8 cmd[2]; + guint8 seq[2]; + guint8 seq2[2]; + guint8 UIN[4]; + guint8 checkcode[4]; } ICQ_pak, *ICQ_PAK_PTR; -typedef struct -{ - guint16 dummy; /* to fix alignment problem */ - guint8 ver[2]; - guint8 cmd[2]; - guint8 seq[2]; - guint8 seq2[2]; - guint8 UIN[4]; - guint8 check[4]; +typedef struct { + guint16 dummy; /* to fix alignment problem */ + guint8 ver[2]; + guint8 cmd[2]; + guint8 seq[2]; + guint8 seq2[2]; + guint8 UIN[4]; + guint8 check[4]; } SRV_ICQ_pak, *SRV_ICQ_PAK_PTR; - -typedef struct -{ - ICQ_pak head; - unsigned char data[1024]; +typedef struct { + ICQ_pak head; + unsigned char data[1024]; } net_icq_pak, *NET_ICQ_PTR; -typedef struct -{ - SRV_ICQ_pak head; - unsigned char data[1024]; +typedef struct { + SRV_ICQ_pak head; + unsigned char data[1024]; } srv_net_icq_pak, *SRV_NET_ICQ_PTR; -#define CMD_ACK 0x000A /* Just an acknowledgement */ +#define CMD_ACK 0x000A /* Just an acknowledgement */ #define CMD_SENDM 0x010E #define CMD_LOGIN 0x03E8 /* Send password and port to server */ #define CMD_REG_NEW_USER 0x03FC /* Send password (after 04EC) for new */ #define CMD_NEW_USER_REG 0x03FC -#define CMD_CONT_LIST 0x0406 /* Send list of users for status check*/ +#define CMD_CONT_LIST 0x0406 /* Send list of users for status check */ #define CMD_SEARCH_UIN 0x041a #define CMD_SEARCH_USER 0x0424 #define CMD_KEEP_ALIVE 0x042e /* Keep alive */ @@ -93,7 +86,7 @@ #define CMD_CHANGE_PW 0x049c #define CMD_ACK_MESSAGES 0x0442 #define CMD_NEW_USER_INFO 0x04A6 /* Request info on a new user */ -#define CMD_UPDATE_EXT_INFO 0x04B0 /* Rest of info (new user) after 00B4*/ +#define CMD_UPDATE_EXT_INFO 0x04B0 /* Rest of info (new user) after 00B4 */ #define CMD_QUERY_SERVERS 0x04BA /* Send after 04C4 when creating new */ #define CMD_QUERY_ADDONS 0x04C4 /* Send after 044C when creating new */ #define CMD_STATUS_CHANGE 0x04D8 @@ -128,27 +121,25 @@ #define SRV_STATUS_UPDATE 0x01A4 #define SRV_SYSTEM_MESSAGE 0x01C2 #define SRV_UPDATE 0x01E0 -#define SRV_X1 0x021C /* Received after 0212 when create ID*/ +#define SRV_X1 0x021C /* Received after 0212 when create ID */ #define SRV_MULTI_PACKET 0x0212 /* Full / user / app info receive */ #define SRV_RND_USER_INFO 0x024E /* Receive info on random user */ #define SRV_BAD_PASS 0x6400 -typedef struct -{ - guint8 time[4]; - guint8 port[4]; - guint8 len[2]; +typedef struct { + guint8 time[4]; + guint8 port[4]; + guint8 len[2]; } login_1, *LOGIN_1_PTR; -typedef struct -{ - guint8 X1[4]; - guint8 ip[4]; - guint8 X2[1]; - guint8 status[4]; - guint8 X3[4]; - guint8 X4[4]; - guint8 X5[4]; +typedef struct { + guint8 X1[4]; + guint8 ip[4]; + guint8 X2[1]; + guint8 status[4]; + guint8 X3[4]; + guint8 X4[4]; + guint8 X5[4]; } login_2, *LOGIN_2_PTR; #define LOGIN_X1_DEF 0x00000098 @@ -158,24 +149,21 @@ //#define LOGIN_X5_DEF 0x00980000 #define LOGIN_X5_DEF 0x00980010 - -typedef struct -{ - guint8 uin[4]; - guint8 year[2]; - guint8 month; - guint8 day; - guint8 hour; - guint8 minute; - guint8 type[2]; - guint8 len[2]; +typedef struct { + guint8 uin[4]; + guint8 year[2]; + guint8 month; + guint8 day; + guint8 hour; + guint8 minute; + guint8 type[2]; + guint8 len[2]; } RECV_MESSAGE, *RECV_MESSAGE_PTR; -typedef struct -{ - guint8 uin[4]; - guint8 type[2]; - guint8 len[2]; +typedef struct { + guint8 uin[4]; + guint8 type[2]; + guint8 len[2]; } SIMPLE_MESSAGE, *SIMPLE_MESSAGE_PTR; -#endif /* __ICQ_H__ */ +#endif /* __ICQ_H__ */ Index: icqconfig.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/icqconfig.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- icqconfig.h 1 Apr 2003 07:24:30 -0000 1.1.1.1 +++ icqconfig.h 17 Sep 2009 12:04:58 -0000 1.2 @@ -14,14 +14,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #ifndef __FILE_IO_H__ #define __FILE_IO_H__ int Get_Config_Info(); -int Read_ICQ_RC(char* filename); -void Write_ICQ_RC(char* filename); -int Read_Contacts_RC(char* filename); -void Write_Contacts_RC(char* filename); +int Read_ICQ_RC(char *filename); +void Write_ICQ_RC(char *filename); +int Read_Contacts_RC(char *filename); +void Write_Contacts_RC(char *filename); -#endif /* __FILE_IO_H__ */ +#endif /* __FILE_IO_H__ */ Index: icqfile.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/icqfile.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- icqfile.c 1 Apr 2003 07:24:29 -0000 1.1.1.1 +++ icqfile.c 17 Sep 2009 12:04:58 -0000 1.2 @@ -55,10 +55,9 @@ #define ICQ_FILE_VERSION htons(0x0300) #define COMMAND_SENDFILE htons(0xee07) -typedef struct _ICQPacket -{ +typedef struct _ICQPacket { /* Packet 2 Header */ - unsigned long SourceUIN; + unsigned long SourceUIN; unsigned short ICQVersion; unsigned long Command; unsigned short CommentLength; @@ -67,55 +66,56 @@ unsigned long Unknown1b; unsigned long Unknown2b; unsigned long FileNameLength; - unsigned char Unknown4b; + unsigned char Unknown4b; unsigned long FileSize; unsigned long Unknown1c; - unsigned long Unknown2c; /* Sender status ?*/ + unsigned long Unknown2c; /* Sender status ? */ short FirstHeaderSize; unsigned short SecondHeaderSize; unsigned short DestinationPort; - - char header[8]; + + char header[8]; char header2[3]; char intPad[4]; char shortPad[2]; char charPad[1]; - + char fileName[1024]; char comment[1024]; } ICQPacket; - - void exchangeName(ICQPacket * this, int sock ); - void writePacket( ICQPacket * this, int sock ); - void readResponse( ICQPacket * this, int sock, ICQPacket* pPkt ); - void readNameExchange( ICQPacket * this, int sock, ICQPacket* pPkt ); - void sendFilePreamble( ICQPacket * this, int sock ); - void readFilePreamble (ICQPacket * this, int sock); - void sendFile( ICQPacket * this, int sock ); -void initilizePKT(ICQPacket * pkt ) +void exchangeName(ICQPacket *this, int sock); +void writePacket(ICQPacket *this, int sock); +void readResponse(ICQPacket *this, int sock, ICQPacket *pPkt); +void readNameExchange(ICQPacket *this, int sock, ICQPacket *pPkt); +void sendFilePreamble(ICQPacket *this, int sock); +void readFilePreamble(ICQPacket *this, int sock); +void sendFile(ICQPacket *this, int sock); + +void initilizePKT(ICQPacket *pkt) { pkt->FirstHeaderSize = 0x1a; pkt->header[0] = 0xff; pkt->header[1] = 0x03; pkt->header[2] = 0x00; - pkt->header[3] = pkt->header[4] = pkt->header[5] - = pkt->header[6] = pkt->header[7] - = pkt->header[8] = 0x00; + pkt->header[3] = pkt->header[4] = pkt->header[5] + = pkt->header[6] = pkt->header[7] + = pkt->header[8] = 0x00; pkt->header2[0] = 0x04; pkt->header2[1] = pkt->header2[2] = 0x00; - pkt->intPad[0] = pkt->intPad[1] = pkt->intPad[2] = pkt->intPad[3] = 0x00; + pkt->intPad[0] = pkt->intPad[1] = pkt->intPad[2] = pkt->intPad[3] = + 0x00; pkt->shortPad[0] = pkt->shortPad[1] = 0x00; pkt->charPad[0] = 0x00; } -void writePacket(ICQPacket * this, int sock) +void writePacket(ICQPacket *this, int sock) { char buffer[65537]; int offset = 0; - + memcpy(buffer, this->header, 9); offset += 9; memcpy(buffer + offset, &(this->SourceUIN), sizeof(unsigned long)); @@ -128,9 +128,9 @@ offset += sizeof(unsigned short); memcpy(buffer + offset, &(this->header2), 3); offset += 3; - + offset += sizeof(unsigned short); - + memcpy(buffer + offset, &(this->SourceUIN), sizeof(unsigned long)); offset += sizeof(unsigned long); memcpy(buffer + offset, &(this->ICQVersion), sizeof(unsigned short)); @@ -143,11 +143,11 @@ offset += sizeof(unsigned short); memcpy(buffer + offset, &(this->CommentLength), sizeof(unsigned short)); offset += sizeof(unsigned short); - + memcpy(buffer + offset, this->comment, strlen(this->comment)); offset += strlen(this->comment); - buffer[offset++] = 0x0; - + buffer[offset++] = 0x0; + memcpy(buffer + offset, &(this->SenderIP), sizeof(unsigned long)); offset += sizeof(unsigned long); memcpy(buffer + offset, &(this->SenderIP), sizeof(unsigned long)); @@ -162,53 +162,56 @@ offset += sizeof(unsigned long); memcpy(buffer + offset, &(this->Unknown4b), sizeof(unsigned char)); offset += sizeof(unsigned char); - + memcpy(buffer + offset, this->fileName, strlen(this->fileName)); offset += strlen(this->fileName); - buffer[offset++] = 0x0; - + buffer[offset++] = 0x0; + memcpy(buffer + offset, &(this->FileSize), sizeof(unsigned long)); offset += sizeof(unsigned long); memcpy(buffer + offset, &(this->Unknown1c), sizeof(unsigned long)); offset += sizeof(unsigned long); memcpy(buffer + offset, &(this->Unknown2c), sizeof(unsigned long)); offset += sizeof(unsigned long); - + this->SecondHeaderSize = offset - this->FirstHeaderSize - 2; - memcpy(buffer + 0x1a, &(this->SecondHeaderSize), sizeof(unsigned short)); - - write(sock, (void const *)&(this->FirstHeaderSize), sizeof(unsigned short)); + memcpy(buffer + 0x1a, &(this->SecondHeaderSize), + sizeof(unsigned short)); + + write(sock, (void const *)&(this->FirstHeaderSize), + sizeof(unsigned short)); write(sock, (void const *)buffer, offset); - + } -void exchangeName( ICQPacket * this, int sock ) +void exchangeName(ICQPacket *this, int sock) { - char local_header[] = {0xff, 0x03, 0x00, 0x00, 0x00}; - char local_header2[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00}; - char local_header3[] = {0x64, 0x00, 0x00, 0x00}; + char local_header[] = { 0xff, 0x03, 0x00, 0x00, 0x00 }; + char local_header2[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 }; + char local_header3[] = { 0x64, 0x00, 0x00, 0x00 }; // local_this->header3 is the speed in percent (0 - 100) // bytes 6 thru 9 of local_this->header2 is the number of files to send. - + char buffer[65537]; int offset = 0; - + // make username equal to UIN char userName[1024]; unsigned short userNameLength; this->FirstHeaderSize = 0x1a; - + memcpy(buffer, &local_header, 5); offset += 5; - this->SenderPort --; + this->SenderPort--; memcpy(buffer + offset, &(this->SenderPort), sizeof(unsigned short)); offset += sizeof(unsigned short); - offset += 2; // skip over 0x00, 0x00 - + offset += 2; // skip over 0x00, 0x00 + memcpy(buffer + offset, &(this->SourceUIN), sizeof(unsigned long)); offset += sizeof(unsigned long); memcpy(buffer + offset, &(this->SenderIP), sizeof(unsigned long)); @@ -220,10 +223,10 @@ memcpy(buffer + offset, &(this->header2), 3); offset += 3; - this->SenderPort ++; // set senderport back to actual port + this->SenderPort++; // set senderport back to actual port + + offset += 2; // skip over rest of file length. - offset += 2; // skip over rest of file length. - memcpy(buffer + offset, &local_header2, 9); offset += 9; memcpy(buffer + offset, &(this->FileSize), sizeof(unsigned long)); @@ -231,19 +234,21 @@ memcpy(buffer + offset, &local_header3, 4); offset += 4; - sprintf(userName, "%ld", this->SourceUIN); + sprintf(userName, "%ld", this->SourceUIN); userNameLength = strlen(userName); - + memcpy(buffer + offset, &userNameLength, sizeof(unsigned short)); offset += sizeof(unsigned short); memcpy(buffer + offset, &userName, userNameLength); offset += userNameLength; buffer[offset++] = 0x0; - + this->SecondHeaderSize = offset - this->FirstHeaderSize - 2; - memcpy(buffer + 0x1a, &(this->SecondHeaderSize), sizeof(unsigned short)); - - write(sock, (void const *)&(this->FirstHeaderSize), sizeof(unsigned short)); + memcpy(buffer + 0x1a, &(this->SecondHeaderSize), + sizeof(unsigned short)); + + write(sock, (void const *)&(this->FirstHeaderSize), + sizeof(unsigned short)); write(sock, (void const *)buffer, offset); @@ -252,12 +257,13 @@ /* Set up this->fileName, fileSize, * */ -void sendFilePreamble( ICQPacket * this, int sock ) +void sendFilePreamble(ICQPacket *this, int sock) { - char local_header[] = {0x02, 0x00}; - char local_header2[] = {0x01, 0x00, 0x00}; // file number? + char local_header[] = { 0x02, 0x00 }; + char local_header2[] = { 0x01, 0x00, 0x00 }; // file number? char buffer[65537]; - unsigned long offset = 0, speed = 100, fileNameLength = strlen(this->fileName) + 1; + unsigned long offset = 0, speed = 100, fileNameLength = + strlen(this->fileName) + 1; unsigned long Unknown1 = 0x0; unsigned short nextPacketSize; @@ -268,7 +274,7 @@ memcpy(buffer + offset, &(this->fileName), fileNameLength - 1); offset += fileNameLength - 1; buffer[offset++] = 0x0; - memcpy (buffer+offset, local_header2, 3); + memcpy(buffer + offset, local_header2, 3); offset += 3; memcpy(buffer + offset, &(this->FileSize), sizeof(unsigned long)); offset += sizeof(unsigned long); @@ -276,350 +282,338 @@ offset += sizeof(unsigned long); memcpy(buffer + offset, &speed, sizeof(unsigned long)); offset += sizeof(unsigned long); - - nextPacketSize = (unsigned short)offset; - write(sock, (void*)&nextPacketSize, sizeof(unsigned short)); - write(sock, (void*)buffer, nextPacketSize); - + + nextPacketSize = (unsigned short)offset; + write(sock, (void *)&nextPacketSize, sizeof(unsigned short)); + write(sock, (void *)buffer, nextPacketSize); + } -void readNameExchange( ICQPacket * this, int sock, ICQPacket* pPkt ) +void readNameExchange(ICQPacket *this, int sock, ICQPacket *pPkt) { unsigned short nextPacketSize; int offset = 0; int connectionSpeed = 0; char constant; - char *buffer; - read(sock, (void*)&nextPacketSize, sizeof(unsigned short)); + char *buffer; + read(sock, (void *)&nextPacketSize, sizeof(unsigned short)); buffer = malloc(nextPacketSize); - if(buffer){ - read(sock, (void*)buffer, nextPacketSize); - + if (buffer) { + read(sock, (void *)buffer, nextPacketSize); + memcpy(&constant, buffer + offset, 1); offset += 1; - - memcpy(&connectionSpeed, buffer + offset, sizeof(unsigned long)); + + memcpy(&connectionSpeed, buffer + offset, + sizeof(unsigned long)); offset += sizeof(unsigned long); - memcpy(&pPkt->CommentLength, buffer + offset, sizeof(unsigned short)); + memcpy(&pPkt->CommentLength, buffer + offset, + sizeof(unsigned short)); offset += sizeof(unsigned short); memcpy(&pPkt->comment, buffer + offset, pPkt->CommentLength); offset += pPkt->CommentLength; pPkt->comment[pPkt->CommentLength] = 0x0; - + printf("Sending file to %s:", pPkt->comment); fflush(stdout); - + free(buffer); + } else { + printf("Error allocating buffer in readNameExchange.\n"); } - else - { - printf("Error allocating buffer in readNameExchange.\n"); - } } -void readFilePreamble (ICQPacket * this, int sock) +void readFilePreamble(ICQPacket *this, int sock) { unsigned short nextPacketSize; unsigned long unknown1, unknown2; int offset = 0; int connectionSpeed = 0; char constant; - char *buffer; - read(sock, (void*)&nextPacketSize, sizeof(unsigned short)); + char *buffer; + read(sock, (void *)&nextPacketSize, sizeof(unsigned short)); buffer = malloc(nextPacketSize); - if(buffer){ - read(sock, (void*)buffer, nextPacketSize); - + if (buffer) { + read(sock, (void *)buffer, nextPacketSize); + memcpy(&constant, buffer + offset, 1); offset += 1; - + memcpy(&unknown1, buffer + offset, sizeof(unsigned long)); offset += sizeof(unsigned long); memcpy(&unknown2, buffer + offset, sizeof(unsigned long)); offset += sizeof(unsigned short); - memcpy(&connectionSpeed, buffer + offset, sizeof(unsigned long)); + memcpy(&connectionSpeed, buffer + offset, + sizeof(unsigned long)); offset += sizeof(unsigned long); - + free(buffer); - } - else{ + } else { printf("Error allocating buffer in readNameExchange.\n"); } - - + } -void sendFile(ICQPacket * this, int sock ) +void sendFile(ICQPacket *this, int sock) { char *fileBuffer = malloc(this->FileSize); unsigned char constant = 0x06; int remainingBytes = this->FileSize, offset = 0; unsigned short nextPacketSize; - - if( fileBuffer ) - { - int fd = open( this->fileName, O_RDONLY); - if ( fd == -1 ) - { + + if (fileBuffer) { + int fd = open(this->fileName, O_RDONLY); + if (fd == -1) { perror("open in sendFile"); - } - else - { - int status = read( fd, fileBuffer, this->FileSize ); - if( status == -1 ) - { + } else { + int status = read(fd, fileBuffer, this->FileSize); + if (status == -1) { perror("read in sendfile"); - } - else - { + } else { int firstPacket = 1; fflush(stdout); - do - { + do { char b[2051]; unsigned short temp; - - if(remainingBytes < 2048) + + if (remainingBytes < 2048) nextPacketSize = remainingBytes; else nextPacketSize = 2048; - if( firstPacket ) - { + if (firstPacket) { firstPacket = 0; temp = nextPacketSize + 1; - write(sock, &temp, sizeof(unsigned short)); + write(sock, &temp, + sizeof(unsigned short)); b[0] = constant; - memcpy(&b[1], fileBuffer + offset, nextPacketSize); + memcpy(&b[1], + fileBuffer + offset, + nextPacketSize); offset += nextPacketSize; - remainingBytes -= nextPacketSize; - write(sock, b, nextPacketSize + 1); - } - else - { + remainingBytes -= + nextPacketSize; + write(sock, b, + nextPacketSize + 1); + } else { temp = nextPacketSize + 1; - memcpy(b, &temp, sizeof(unsigned short)); + memcpy(b, &temp, + sizeof(unsigned short)); b[2] = constant; - memcpy(&b[3], fileBuffer + offset, nextPacketSize); + memcpy(&b[3], + fileBuffer + offset, + nextPacketSize); offset += nextPacketSize; - remainingBytes -= nextPacketSize; - write(sock, b, nextPacketSize + 3); + remainingBytes -= + nextPacketSize; + write(sock, b, + nextPacketSize + 3); } printf("."); fflush(stdout); - } while ( remainingBytes ); + } while (remainingBytes); printf("\nFile sent.\n"); - + } - free(fileBuffer); + free(fileBuffer); } - } - else - { + } else { printf("Error allocating memory for fileBuffer in sendFile.\n"); } } -void readResponse( ICQPacket * this, int sock, ICQPacket* pPkt ) +void readResponse(ICQPacket *this, int sock, ICQPacket *pPkt) { unsigned short nextPacketSize; int offset = 0; - char *buf; + char *buf; unsigned short FileLength; read(sock, (void *)&nextPacketSize, sizeof(unsigned short)); - + buf = malloc(nextPacketSize); - if(buf) { + if (buf) { unsigned long reject; - + read(sock, (void *)buf, nextPacketSize); - + memcpy(&pPkt->SourceUIN, &buf[offset], sizeof(unsigned long)); offset += sizeof(unsigned long); memcpy(&pPkt->ICQVersion, &buf[offset], sizeof(unsigned short)); offset += sizeof(unsigned short); - if(pPkt->ICQVersion != ICQ_FILE_VERSION) + if (pPkt->ICQVersion != ICQ_FILE_VERSION) printf("Version differences: target 0x%x, actual 0x%x.\n", ICQ_FILE_VERSION, pPkt->ICQVersion); memcpy(&pPkt->Command, &buf[offset], sizeof(unsigned long)); offset += sizeof(unsigned long); - offset += sizeof(unsigned long); // skip over the 2nd UIN - offset += sizeof(unsigned short); // skip over the 2nd version - memcpy(&pPkt->CommentLength, &buf[offset], sizeof(unsigned short)); + offset += sizeof(unsigned long); // skip over the 2nd UIN + offset += sizeof(unsigned short); // skip over the 2nd version + memcpy(&pPkt->CommentLength, &buf[offset], + sizeof(unsigned short)); offset += sizeof(unsigned short); memcpy(&pPkt->comment, &buf[offset], pPkt->CommentLength); offset += pPkt->CommentLength; - - + memcpy(&pPkt->SenderIP, &buf[offset], sizeof(unsigned long)); offset += sizeof(unsigned long); - offset += sizeof(unsigned long); // skip over 2nd IP + offset += sizeof(unsigned long); // skip over 2nd IP memcpy(&pPkt->SenderPort, &buf[offset], sizeof(unsigned short)); offset += sizeof(unsigned short); - offset += 3; // skip junk 0x00, 0x00, 0x04 + offset += 3; // skip junk 0x00, 0x00, 0x04 memcpy(&reject, &buf[offset], sizeof(unsigned long)); offset += sizeof(unsigned long); - - if(!reject) + + if (!reject) printf("Connection accepted.\n"); - else - { + else { printf("Connection REJECTED.\n"); printf("Comment: %s\n", pPkt->comment); } - offset += sizeof(unsigned short); // skip over dest port - - offset += sizeof(unsigned short); // skip 2 bytes 0x00, 0x00 - + offset += sizeof(unsigned short); // skip over dest port + + offset += sizeof(unsigned short); // skip 2 bytes 0x00, 0x00 + //memcpy(&pPkt->FileNameLength, &buf[offset], sizeof(unsigned short)); memcpy(&FileLength, &buf[offset], sizeof(unsigned short)); pPkt->FileNameLength = FileLength; offset += sizeof(unsigned short); - fprintf(stderr, "Copying %ld bytes to copy %s\n", pPkt->FileNameLength, - &buf[offset] ); - + fprintf(stderr, "Copying %ld bytes to copy %s\n", + pPkt->FileNameLength, &buf[offset]); + memcpy(&pPkt->fileName, &buf[offset], pPkt->FileNameLength); offset += pPkt->FileNameLength; - - offset += sizeof(unsigned long); // skip 4 bytes 0x00, 0x00, 0x00, 0x00 - - memcpy(&pPkt->DestinationPort, &buf[offset], sizeof(unsigned short)); + + offset += sizeof(unsigned long); // skip 4 bytes 0x00, 0x00, 0x00, 0x00 + + memcpy(&pPkt->DestinationPort, &buf[offset], + sizeof(unsigned short)); offset += sizeof(unsigned short); - + free(buf); - - } - else { + + } else { printf("Error allocating memory.\n"); - } + } } - -int ICQSendFile(const char * ip, const char * port, const char * uin, const char * fileName, const char * comment) +int ICQSendFile(const char *ip, const char *port, const char *uin, + const char *fileName, const char *comment) { - struct sockaddr_in sin, sout, sin2, sout2; + struct sockaddr_in sin, sout, sin2, sout2; struct stat st; - - + int sock, x; int nameSize; - int fileSize=0; + int fileSize = 0; int sock2; ICQPacket pkt, pkt2, pkt3; initilizePKT(&pkt); initilizePKT(&pkt2); initilizePKT(&pkt3); - fprintf( stderr, "ip = %s port = %s\n", ip, port ); + fprintf(stderr, "ip = %s port = %s\n", ip, port); //comment[0] = 0; -// { -// printf(" ICQ File Spoofer\n"); -// printf("usage: %s ip port SpoofedUIN file \"comment\"\n", argv[0]); +// { +// printf(" ICQ File Spoofer\n"); +// printf("usage: %s ip port SpoofedUIN file \"comment\"\n", argv[0]); // } - - if( stat(fileName, &st) != -1) - { - fileSize = st.st_size; - } - else - { - perror("stat"); - /* exit(1); */ - } - + + if (stat(fileName, &st) != -1) { + fileSize = st.st_size; + } else { + perror("stat"); + /* exit(1); */ + } + /* make a socket */ if (!(sock = socket(AF_INET, SOCK_STREAM, 0))) { perror("socket"); return (0); } - + /* set some stuff up */ sin.sin_family = AF_INET; sin.sin_addr.s_addr = inet_addr(ip); sin.sin_port = htons(atol(port)); - + /* connect to the victim */ - if (connect(sock, (struct sockaddr*)&sin,sizeof(sin))==-1) { + if (connect(sock, (struct sockaddr *)&sin, sizeof(sin)) == -1) { perror("connect"); return (0); } nameSize = sizeof(struct sockaddr); - getsockname(sock, (struct sockaddr*)&sout, &nameSize); - + getsockname(sock, (struct sockaddr *)&sout, &nameSize); + /* make our payload */ x = -1; - - - pkt.SourceUIN = atoi(uin); + + pkt.SourceUIN = atoi(uin); pkt.ICQVersion = ICQ_FILE_VERSION; pkt.Command = COMMAND_SENDFILE; pkt.CommentLength = strlen(comment) + 1; - pkt.Unknown1b = 0x00040000; pkt.Unknown2b = 0x00001000; pkt.FileNameLength = htonl(strlen(fileName) + 1); pkt.Unknown4b = 0x00; - + pkt.FileSize = fileSize; pkt.Unknown1c = 0x0000; pkt.Unknown2c = 0xFFFFFFA0; strcpy(pkt.fileName, fileName); strcpy(pkt.comment, comment); - + writePacket(&pkt, sock); printf("Waiting for acceptance.\n"); readResponse(&pkt, sock, &pkt2); - - /* make a socket */ + /* make a socket */ if (!(sock2 = socket(AF_INET, SOCK_STREAM, 0))) { perror("socket2"); return (0); } - + /* set some stuff up */ sin2.sin_family = AF_INET; sin2.sin_addr.s_addr = inet_addr(ip); sin2.sin_port = htons(pkt2.DestinationPort); - + /* connect to the victim */ - if (connect(sock2, (struct sockaddr*)&sin2,sizeof(sin2))==-1) { + if (connect(sock2, (struct sockaddr *)&sin2, sizeof(sin2)) == -1) { perror("connect"); return (0); } nameSize = sizeof(struct sockaddr); - getsockname(sock2, (struct sockaddr*)&sout2, &nameSize); + getsockname(sock2, (struct sockaddr *)&sout2, &nameSize); pkt3.SenderIP = sout2.sin_addr.s_addr; - pkt3.SenderPort = ntohs( sout2.sin_port ); + pkt3.SenderPort = ntohs(sout2.sin_port); pkt3.SourceUIN = atoi(uin); pkt3.FileSize = fileSize; - exchangeName(&pkt3, sock2 ); + exchangeName(&pkt3, sock2); - readNameExchange(&pkt3, sock2, &pkt2 ); + readNameExchange(&pkt3, sock2, &pkt2); pkt3.FileSize = fileSize; strcpy(pkt3.fileName, fileName); - sendFilePreamble(&pkt3, sock2 ); + sendFilePreamble(&pkt3, sock2); - readFilePreamble(&pkt3, sock2 ); + readFilePreamble(&pkt3, sock2); + + sendFile(&pkt3, sock2); - sendFile (&pkt3, sock2 ); - close(sock2); - - close(sock); - return (0); + + close(sock); + return (0); } Index: libicq.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/libicq.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- libicq.c 1 Apr 2003 07:24:29 -0000 1.1.1.1 +++ libicq.c 17 Sep 2009 12:04:58 -0000 1.2 @@ -18,7 +18,7 @@ #include "config.h" #endif -#include <errno.h> +#include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -31,7 +31,7 @@ #include <io.h> #include <time.h> [...1184 lines suppressed...] + if (curr_msg->type == MSG_MESS) + Send_Message(c->uin, curr_msg->text); + else if (curr_msg->type == URL_MESS) + Send_URL(c->uin, curr_msg->url, curr_msg->text); - g_free(curr_msg->text); - g_free(curr_msg->url); - g_free(curr_msg); + g_free(curr_msg->text); + g_free(curr_msg->url); + g_free(curr_msg); - c->messages = g_list_remove_link(c->messages, g_list_first(c->messages)); - } + c->messages = + g_list_remove_link(c->messages, + g_list_first(c->messages)); + } } - Index: libicq.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/libicq.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- libicq.h 1 Apr 2003 07:24:29 -0000 1.1.1.1 +++ libicq.h 17 Sep 2009 12:04:58 -0000 1.2 @@ -14,11 +14,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #ifndef __LIBICQ_H__ #define __LIBICQ_H__ -#define STATUS_NOT_IN_LIST (guint32)(-3L) /* This is a made-up number */ +#define STATUS_NOT_IN_LIST (guint32)(-3L) /* This is a made-up number */ #define STATUS_OFFLINE (guint32)(-1L) #define STATUS_ONLINE 0x0000 #define STATUS_INVISIBLE 0x0100 @@ -35,12 +34,10 @@ #define USER_ADDED_MESS 0x000C #define CONTACT_MESS 0x0013 - -#define AWAY_MESS 0x1001 /* These are made-up numbers */ +#define AWAY_MESS 0x1001 /* These are made-up numbers */ #define CHAT_MESS 0x1002 #define FILE_MESS 0x1003 - /* to go with the new int version of Verbose */ #define ICQ_VERB_NONE 0 // show no messages #define ICQ_VERB_ERR (1<<0) // show only errors @@ -62,99 +59,91 @@ #define ICQ_MAX_CONTACTS 255 // maximum contacts -typedef struct -{ - guint32 uin; - gint year; - gint month; - gint day; - gint hour; - gint minute; - gint type; - gint32 len; - gchar* msg; - gchar* url; - gchar* filename; - guint32 file_size; - guint32 seq; +typedef struct { + guint32 uin; + gint year; + gint month; + gint day; + gint hour; + gint minute; + gint type; + gint32 len; + gchar *msg; + gchar *url; + gchar *filename; + guint32 file_size; + guint32 seq; } CLIENT_MESSAGE, *CLIENT_MESSAGE_PTR; -typedef struct -{ - guint32 uin; - gchar nick[20]; - guint32 status; +typedef struct { + guint32 uin; + gchar nick[20]; + guint32 status; } USER_UPDATE, *USER_UPDATE_PTR; -typedef struct -{ - guint32 uin; - gchar nick[20]; - gchar first[50]; - gchar last[50]; - gchar email[50]; - gint auth_required; +typedef struct { + guint32 uin; + gchar nick[20]; + gchar first[50]; + gchar last[50]; + gchar email[50]; + gint auth_required; } USER_INFO, *USER_INFO_PTR; -typedef struct -{ - guint32 uin; - gchar city[50]; - gchar country[50]; - gint country_code; - gint country_status; - gchar state[50]; - gchar age[15]; - gchar sex[15]; - gchar phone[15]; - gchar url[150]; - gchar about[1000]; +typedef struct { + guint32 uin; + gchar city[50]; + gchar country[50]; + gint country_code; + gint country_status; + gchar state[50]; + gchar age[15]; + gchar sex[15]; + gchar phone[15]; + gchar url[150]; + gchar about[1000]; } USER_EXT_INFO, *USER_EXT_INFO_PTR; -typedef struct -{ - guint32 uin; - guint32 status; - guint32 last_time; /* last time online or when came online */ - guint32 current_ip; - gint tcp_sok; - guint32 tcp_port; - gint tcp_status; /* can we get some stats on this one */ - gint chat_sok; - guint32 chat_port; - gint chat_status; - gint chat_active; - gint chat_active2; - guint32 chat_seq; - guint32 file_gdk_input; - gchar nick[20]; - GList* messages; +typedef struct { + guint32 uin; + guint32 status; + guint32 last_time; /* last time online or when came online */ + guint32 current_ip; + gint tcp_sok; + guint32 tcp_port; + gint tcp_status; /* can we get some stats on this one */ + gint chat_sok; + guint32 chat_port; + gint chat_status; + gint chat_active; + gint chat_active2; + guint32 chat_seq; + guint32 file_gdk_input; + gchar nick[20]; + GList *messages; } Contact_Member, *CONTACT_PTR; -typedef struct -{ - guint32 uin; - gchar nick[20]; - gchar first[50]; - gchar last[50]; - gchar email[50]; - gint auth_required; +typedef struct { + guint32 uin; + gchar nick[20]; + gchar first[50]; + gchar last[50]; + gchar email[50]; + gint auth_required; } SEARCH_RESULT, *SEARCH_RESULT_PTR; -typedef struct -{ - gint type; - gchar* text; - gchar* url; +typedef struct { + gint type; + gchar *text; + gchar *url; } MESSAGE_DATA, *MESSAGE_DATA_PTR; -typedef struct -{ - guint32 uin; - gchar c; +typedef struct { + guint32 uin; + gchar c; } CHAT_DATA, *CHAT_DATA_PTR; -extern Contact_Member Contacts[ ICQ_MAX_CONTACTS ]; +extern Contact_Member Contacts[ICQ_MAX_CONTACTS]; extern gint Num_Contacts; extern guint32 UIN; @@ -166,16 +155,17 @@ /* To make dealing with function pointers a LOT easier... */ /* CALLBACK is a reserved word in Win32 code for FAR PASCAL functions * instead lets use FUNC_CALLBACK */ -typedef void (*FUNC_CALLBACK)( void * ); +typedef void (*FUNC_CALLBACK) (void *); /* Types of server messages */ -enum { EVENT_LOGIN, EVENT_MESSAGE, EVENT_INFO, EVENT_EXT_INFO, +enum { EVENT_LOGIN, EVENT_MESSAGE, EVENT_INFO, EVENT_EXT_INFO, EVENT_OFFLINE, EVENT_ONLINE, EVENT_STATUS_UPDATE, EVENT_SEARCH_RESULTS, EVENT_DISCONNECT, EVENT_CHAT_CONNECT, - EVENT_CHAT_DISCONNECT, EVENT_CHAT_READ, EVENT_RTNSTATUS, NUM_EVENTS }; + EVENT_CHAT_DISCONNECT, EVENT_CHAT_READ, EVENT_RTNSTATUS, NUM_EVENTS +}; /* An array of function pointers to store the callbacks */ -void (*event[NUM_EVENTS])(void* data); +void (*event[NUM_EVENTS]) (void *data); /* Assigns "func" to the appropriate "event" pointer */ void ICQ_Register_Callback(gint event_type, FUNC_CALLBACK func); @@ -192,21 +182,20 @@ gint ICQ_Connect(); void ICQ_Disconnect(); void ICQ_Change_Status(guint32 new_status); -void ICQ_Send_Message(guint32 uin, gchar* text); -void ICQ_Send_URL(guint32 uin, gchar* url, gchar* text); -void ICQ_Request_Chat(guint32 uin, gchar* text); +void ICQ_Send_Message(guint32 uin, gchar *text); +void ICQ_Send_URL(guint32 uin, gchar *url, gchar *text); +void ICQ_Request_Chat(guint32 uin, gchar *text); void ICQ_Accept_Chat(guint32 uin); void ICQ_Refuse_Chat(guint32 uin); -void ICQ_Send_Chat(guint32 uin, gchar* text); -void ICQ_Search(gchar *email, gchar *nick, gchar* first, gchar* last); +void ICQ_Send_Chat(guint32 uin, gchar *text); +void ICQ_Search(gchar *email, gchar *nick, gchar *first, gchar *last); void ICQ_Get_Info(guint32 uin); void ICQ_Get_Ext_Info(guint32 uin); void ICQ_Get_Away_Message(guint32 uin); void ICQ_Add_User(guint32 uin, gchar *name); void ICQ_Rename_User(guint32 uin, gchar *name); void ICQ_Delete_User(guint32 uin); -int ICQSendFile(char * ip, char * port, char * uin, char * fileName, char * comment); - +int ICQSendFile(char *ip, char *port, char *uin, char *fileName, char *comment); void ICQ_SetLogging(gint logging); void ICQ_Debug(gint level, const gchar *debug_message); @@ -215,5 +204,4 @@ void DW_2_Chars(unsigned char *buf, guint32 num); void Word_2_Chars(unsigned char *buf, guint16 num); -#endif /* __LIBICQ_H__ */ - +#endif /* __LIBICQ_H__ */ Index: receive.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/receive.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- receive.c 1 Apr 2003 07:24:29 -0000 1.1.1.1 +++ receive.c 17 Sep 2009 12:04:58 -0000 1.2 @@ -29,7 +29,7 @@ #if defined( _WIN32 ) && !defined(__MINGW32__) #include <windows.h> #include <io.h> -#else /* !_WIN32 */ +#else /* !_WIN32 */ #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif @@ -49,7 +49,6 @@ #include "util.h" #include "tcp.h" [...1165 lines suppressed...] + current_search_result->auth_required = *tmp; + + Search_Results = + g_list_append(Search_Results, (gpointer) current_search_result); +} void Rec_EndOfSearch(srv_net_icq_pak pak) { - ICQ_Debug(ICQ_VERB_INFO, "LIBICQ> Rec_EndOfSearch"); + ICQ_Debug(ICQ_VERB_INFO, "LIBICQ> Rec_EndOfSearch"); - Send_Ack(Chars_2_Word( pak.head.seq ) ); + Send_Ack(Chars_2_Word(pak.head.seq)); - if(event[EVENT_SEARCH_RESULTS] != NULL) - (*event[EVENT_SEARCH_RESULTS])((void*)Search_Results); + if (event[EVENT_SEARCH_RESULTS] != NULL) + (*event[EVENT_SEARCH_RESULTS]) ((void *)Search_Results); } - Index: receive.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/receive.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- receive.h 1 Apr 2003 07:24:29 -0000 1.1.1.1 +++ receive.h 17 Sep 2009 12:04:58 -0000 1.2 @@ -14,14 +14,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #ifndef __RECEIVE_H__ #define __RECEIVE_H__ void Rec_Packet(); -void Process_Packet(srv_net_icq_pak pak, guint32 len, guint16 cmd, guint16 ver, guint16 seq, guint32 uin); +void Process_Packet(srv_net_icq_pak pak, guint32 len, guint16 cmd, guint16 ver, + guint16 seq, guint32 uin); -void Rec_Multi_Packet(guint8* pdata); +void Rec_Multi_Packet(guint8 *pdata); void Rec_Login(srv_net_icq_pak pak); void Rec_X1(srv_net_icq_pak pak); void Rec_X2(srv_net_icq_pak pak); @@ -36,6 +36,6 @@ void Rec_GoAway(srv_net_icq_pak pak); void Rec_UserFound(srv_net_icq_pak pak); void Rec_EndOfSearch(srv_net_icq_pak pak); -void Rec_AwayMessage(guint32 uin, char* msg); +void Rec_AwayMessage(guint32 uin, char *msg); -#endif /* __RECEIVE_H__ */ +#endif /* __RECEIVE_H__ */ Index: send.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/send.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- send.c 1 Apr 2003 07:24:29 -0000 1.1.1.1 +++ send.c 17 Sep 2009 12:04:58 -0000 1.2 @@ -14,8 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -24,7 +22,7 @@ #include <winbase.h> #define sleep( x ) Sleep( x ) [...1212 lines suppressed...] + (gpointer) Contacts[cindex].tcp_sok); + close(Contacts[cindex].tcp_sok); + } + + if (Contacts[cindex].chat_sok > 0) { + open_sockets = g_list_remove(open_sockets, + (gpointer) Contacts[cindex].chat_sok); + close(Contacts[cindex].chat_sok); + } + + Contacts[cindex].status = STATUS_OFFLINE; + Contacts[cindex].current_ip = -1L; + Contacts[cindex].tcp_sok = 0; + Contacts[cindex].tcp_port = -1L; + Contacts[cindex].tcp_status = TCP_NOT_CONNECTED; + Contacts[cindex].chat_sok = 0; + Contacts[cindex].chat_port = -1L; + Contacts[cindex].chat_status = TCP_NOT_CONNECTED; + } +} Index: send.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/send.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- send.h 1 Apr 2003 07:24:29 -0000 1.1.1.1 +++ send.h 17 Sep 2009 12:04:58 -0000 1.2 @@ -14,14 +14,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #ifndef __SEND_H__ #define __SEND_H__ -int Connect_Remote(char* hostname, guint32 port); +int Connect_Remote(char *hostname, guint32 port); void Send_Ack(gint seq); -void Send_BeginLogin(guint32 UIN, char* pass, guint32 ip, guint32 port); +void Send_BeginLogin(guint32 UIN, char *pass, guint32 ip, guint32 port); void Send_FinishLogin(); void Send_KeepAlive(); void Send_GotMessages(); @@ -31,8 +30,8 @@ void Send_ChangeStatus(guint32 status); void Send_InfoRequest(guint32 uin); void Send_ExtInfoRequest(guint32 uin); -void Send_SearchRequest(char* email, char* nick, char* first, char* last); -void Send_RegisterNewUser(char* pass); +void Send_SearchRequest(char *email, char *nick, char *first, char *last); +void Send_RegisterNewUser(char *pass); void Send_Disconnect(); -void Send_URL(guint32 uin, char* url, char *text); -#endif /* __SEND_H__ */ +void Send_URL(guint32 uin, char *url, char *text); +#endif /* __SEND_H__ */ Index: tcp.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/tcp.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- tcp.c 1 Apr 2003 07:24:30 -0000 1.1.1.1 +++ tcp.c 17 Sep 2009 12:04:58 -0000 1.2 @@ -30,7 +30,7 @@ #if defined( _WIN32 ) && !defined(__MINGW32__) #include <winsock2.h> #include <io.h> -#else /* !_WIN32 */ +#else /* !_WIN32 */ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -49,7 +49,6 @@ #include "libproxy.h" #include "plugin_api.h" [...3507 lines suppressed...] - DW_2_Chars( pack_tail.seq, seq ); - if( sock != -1 ) - { - intsize = sizeof( tcp_head ) + sizeof( tcp_tail ) + 1; - buffer = (guint8*)g_malloc( intsize + 2 ); - - Word_2_Chars (buffer, intsize); - memcpy( buffer+2, &pack_head, sizeof( pack_head ) ); - buffer[2 + sizeof( pack_head )] = 0x00; - memcpy( buffer+2 + sizeof( pack_head ) + 1, - &pack_tail, sizeof( pack_tail ) ); - write( sock, buffer, intsize + 2 ); - } - else - return -1; + return 1; - return 1; - } Index: tcp.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/tcp.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- tcp.h 1 Apr 2003 07:24:30 -0000 1.1.1.1 +++ tcp.h 17 Sep 2009 12:04:58 -0000 1.2 @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #ifndef __TCP_H__ #define __TCP_H__ @@ -62,25 +61,23 @@ gint TCP_Ack(gint sock, guint16 cmd, gint seq); void TCP_SendHelloPacket(gint sock); -void TCP_ProcessPacket(guint8* packet, gint packet_length, gint sock); +void TCP_ProcessPacket(guint8 *packet, gint packet_length, gint sock); gint TCP_ReadPacket(gint sock); gint TCP_Connect(guint32 ip, guint32 port); -gint TCP_SendMessage(guint32 uin, char* msg); -gint TCP_SendURL(guint32 uin, char* url, char *text); +gint TCP_SendMessage(guint32 uin, char *msg); +gint TCP_SendURL(guint32 uin, char *url, char *text); gint TCP_GetAwayMessage(guint32 uin); gint TCP_ChatServerHandshake(gint sock); gint TCP_ChatClientHandshake(gint sock); gint TCP_ChatReadClient(gint sock); gint TCP_ChatReadServer(gint sock); -gint TCP_SendChatRequest(guint32 uin, gchar* text); +gint TCP_SendChatRequest(guint32 uin, gchar *text); gint TCP_AcceptChat(guint32 uin); gint TCP_RefuseChat(guint32 uin); -gint TCP_ChatSend(guint32 uin, gchar* text); +gint TCP_ChatSend(guint32 uin, gchar *text); gint TCP_ConnectChat(guint32 port, guint32 uin); gint TCP_TerminateChat(guint32 uin); -gint TCP_AcceptFile( int sock, int uin, guint32 seq); - - -#endif /* __TCP_H__ */ +gint TCP_AcceptFile(int sock, int uin, guint32 seq); +#endif /* __TCP_H__ */ Index: util.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/util.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- util.c 1 Apr 2003 07:24:30 -0000 1.1.1.1 +++ util.c 17 Sep 2009 12:04:58 -0000 1.2 @@ -41,7 +41,6 @@ #include "icq.h" #include "libicq.h" - extern Contact_Member Contacts[]; extern int Num_Contacts; @@ -51,188 +50,178 @@ The following data constitutes fair use for compatibility. *********************************************************/ unsigned char icq_check_data[257] = { - 0x0a, 0x5b, 0x31, 0x5d, 0x20, 0x59, 0x6f, 0x75, - 0x20, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x6f, 0x64, - 0x69, 0x66, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x73, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x20, 0x49, - 0x43, 0x51, 0x20, 0x6d, 0x61, 0x6b, 0x65, 0x73, - 0x2e, 0x20, 0x4a, 0x75, 0x73, 0x74, 0x20, 0x73, - 0x65, 0x6c, 0x65, 0x63, 0x74, 0x20, 0x22, 0x53, - 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x22, 0x20, 0x66, - 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, - 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x6d, 0x69, 0x73, - 0x63, 0x22, 0x20, 0x69, 0x6e, 0x20, 0x49, 0x43, - 0x51, 0x20, 0x6f, 0x72, 0x20, 0x66, 0x72, 0x6f, - 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, 0x22, 0x53, - 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x22, 0x20, 0x69, - 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x20, 0x70, 0x61, - 0x6e, 0x65, 0x6c, 0x2e, 0x20, 0x43, 0x72, 0x65, - 0x64, 0x69, 0x74, 0x3a, 0x20, 0x45, 0x72, 0x61, - 0x6e, 0x0a, 0x5b, 0x32, 0x5d, 0x20, 0x43, 0x61, - 0x6e, 0x27, 0x74, 0x20, 0x72, 0x65, 0x6d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x20, 0x77, 0x68, 0x61, - 0x74, 0x20, 0x77, 0x61, 0x73, 0x20, 0x73, 0x61, - 0x69, 0x64, 0x3f, 0x20, 0x20, 0x44, 0x6f, 0x75, - 0x62, 0x6c, 0x65, 0x2d, 0x63, 0x6c, 0x69, 0x63, - 0x6b, 0x20, 0x6f, 0x6e, 0x20, 0x61, 0x20, 0x75, - 0x73, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x67, - 0x65, 0x74, 0x20, 0x61, 0x20, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x20, 0x6f, 0x66, 0x20, 0x61, - 0x6c, 0x6c, 0x20, 0x6d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x73, 0x20, 0x73, 0x65, 0x6e, 0x74, - 0x20, 0x69, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0 + 0x0a, 0x5b, 0x31, 0x5d, 0x20, 0x59, 0x6f, 0x75, + 0x20, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x6f, 0x64, + 0x69, 0x66, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x73, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x20, 0x49, + 0x43, 0x51, 0x20, 0x6d, 0x61, 0x6b, 0x65, 0x73, + 0x2e, 0x20, 0x4a, 0x75, 0x73, 0x74, 0x20, 0x73, + 0x65, 0x6c, 0x65, 0x63, 0x74, 0x20, 0x22, 0x53, + 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x22, 0x20, 0x66, + 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, + 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x6d, 0x69, 0x73, + 0x63, 0x22, 0x20, 0x69, 0x6e, 0x20, 0x49, 0x43, + 0x51, 0x20, 0x6f, 0x72, 0x20, 0x66, 0x72, 0x6f, + 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, 0x22, 0x53, + 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x22, 0x20, 0x69, + 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x20, 0x70, 0x61, + 0x6e, 0x65, 0x6c, 0x2e, 0x20, 0x43, 0x72, 0x65, + 0x64, 0x69, 0x74, 0x3a, 0x20, 0x45, 0x72, 0x61, + 0x6e, 0x0a, 0x5b, 0x32, 0x5d, 0x20, 0x43, 0x61, + 0x6e, 0x27, 0x74, 0x20, 0x72, 0x65, 0x6d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x20, 0x77, 0x68, 0x61, + 0x74, 0x20, 0x77, 0x61, 0x73, 0x20, 0x73, 0x61, + 0x69, 0x64, 0x3f, 0x20, 0x20, 0x44, 0x6f, 0x75, + 0x62, 0x6c, 0x65, 0x2d, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x20, 0x6f, 0x6e, 0x20, 0x61, 0x20, 0x75, + 0x73, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x67, + 0x65, 0x74, 0x20, 0x61, 0x20, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x20, 0x6f, 0x66, 0x20, 0x61, + 0x6c, 0x6c, 0x20, 0x6d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x73, 0x20, 0x73, 0x65, 0x6e, 0x74, + 0x20, 0x69, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0 }; - -Contact_Member* contact(guint32 uin) +Contact_Member *contact(guint32 uin) { - int cindex; + int cindex; - for(cindex = 0; cindex < Num_Contacts; cindex++) - if(Contacts[cindex].uin == uin) break; + for (cindex = 0; cindex < Num_Contacts; cindex++) + if (Contacts[cindex].uin == uin) + break; - if(cindex == Num_Contacts) - return NULL; + if (cindex == Num_Contacts) + return NULL; - return &Contacts[cindex]; + return &Contacts[cindex]; } - -Contact_Member* contact_from_socket(gint sock) +Contact_Member *contact_from_socket(gint sock) { - int cindex; + int cindex; - for(cindex = 0; cindex < Num_Contacts; cindex++) - { - if(Contacts[cindex].tcp_sok == sock) break; - if(Contacts[cindex].chat_sok == sock) break; - } + for (cindex = 0; cindex < Num_Contacts; cindex++) { + if (Contacts[cindex].tcp_sok == sock) + break; + if (Contacts[cindex].chat_sok == sock) + break; + } - if(cindex == Num_Contacts) - return NULL; + if (cindex == Num_Contacts) + return NULL; - return &Contacts[cindex]; + return &Contacts[cindex]; } - guint32 Chars_2_DW(unsigned char *buf) { - return (guint32)((buf[3] << 24) + (buf[2] << 16) + (buf[1] << 8) + buf[0]); + return (guint32) ((buf[3] << 24) + (buf[2] << 16) + (buf[1] << 8) + + buf[0]); } - guint16 Chars_2_Word(unsigned char *buf) { - return (guint16)((buf[1] << 8) + buf[0]); + return (guint16) ((buf[1] << 8) + buf[0]); } - void DW_2_Chars(unsigned char *buf, guint32 num) { - buf[3] = (guchar)((num >> 24) & 0x000000FF); - buf[2] = (guchar)((num >> 16) & 0x000000FF); - buf[1] = (guchar)((num >> 8) & 0x000000FF); - buf[0] = (guchar)(num & 0x000000FF); + buf[3] = (guchar) ((num >> 24) & 0x000000FF); + buf[2] = (guchar) ((num >> 16) & 0x000000FF); + buf[1] = (guchar) ((num >> 8) & 0x000000FF); + buf[0] = (guchar) (num & 0x000000FF); } - void Word_2_Chars(unsigned char *buf, guint16 num) { - buf[1] = (guchar)((num >> 8) & 0x00FF); - buf[0] = (guchar)(num & 0x00FF); + buf[1] = (guchar) ((num >> 8) & 0x00FF); + buf[0] = (guchar) (num & 0x00FF); } - -void wrinkle_packet(void* ptr, size_t len) +void wrinkle_packet(void *ptr, size_t len) { - guint8 *buf; - guint32 chksum; - guint32 key; - guint32 tkey, temp; - guint8 r1, r2; - gint n, pos; - guint32 chk1, chk2; - - buf = ptr; - - buf[2] = rand() & 0xff; - buf[3] = 0; - buf[4] = 0; - buf[5] = 0; - - r1 = rand() % ( len - 4 ); - r2 = rand() & 0xff; - - chk1 = (guint8) buf[8]; - chk1 <<= 8; - chk1 += (guint8) buf[4]; - chk1 <<= 8; - chk1 += (guint8) buf[2]; - chk1 <<= 8; - chk1 += (guint8) buf[6]; - chk2 = r1; - chk2 <<= 8; - chk2 += (guint8) ( buf[ r1 ] ); - chk2 <<= 8; - chk2 += r2; - chk2 <<= 8; - chk2 += (guint8) ( icq_check_data[ r2 ] ); - chk2 ^= 0x00ff00ff; - - chksum = chk2 ^ chk1; - - DW_2_Chars( &buf[ 0x10 ], chksum ); - key = len; - key *= 0x66756B65; - key += chksum; - n = ( len + 3 ) / 4; - pos = 0; - while( pos < n ) - { - if( pos != 0x10 ) - { - tkey = key + icq_check_data[ pos & 0xff ]; - temp = Chars_2_DW( &buf[ pos ] ); - temp ^= tkey; - DW_2_Chars( &buf[ pos ], temp ); - } - pos += 4; - } - Word_2_Chars( &buf[ 0 ], ICQ_VER ); + guint8 *buf; + guint32 chksum; + guint32 key; + guint32 tkey, temp; + guint8 r1, r2; + gint n, pos; + guint32 chk1, chk2; + + buf = ptr; + + buf[2] = rand() & 0xff; + buf[3] = 0; + buf[4] = 0; + buf[5] = 0; + + r1... [truncated message content] |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/yahoo2 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/yahoo2 Modified Files: yahoo.c Log Message: reformatted source code Index: yahoo.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- yahoo.c 6 Sep 2009 18:23:08 -0000 1.116 +++ yahoo.c 17 Sep 2009 12:04:59 -0000 1.117 @@ -29,7 +29,7 @@ #ifdef __MINGW32__ # include <winsock2.h> -# include <sys/timeb.h> /* <-- added to allow compilation on Win32 ( see get_time() ) : plasmoidia */ +# include <sys/timeb.h> /* <-- added to allow compilation on Win32 ( see get_time() ) : plasmoidia */ # define EINPROGRESS WSAEINPROGRESS #else # include <netdb.h> @@ -93,12 +93,11 @@ ******************************************************************************/ /* Module defines */ [...4377 lines suppressed...] eb_remove_menu_item(EB_CHAT_WINDOW_MENU, webcam_chat_menu_tag); - if(webcam_contact_menu_tag) + if (webcam_contact_menu_tag) eb_remove_menu_item(EB_CONTACT_MENU, webcam_contact_menu_tag); mywebcam_chat_menu_tag = mywebcam_contact_menu_tag = 0; @@ -3834,11 +3988,10 @@ yc.ext_yahoo_buddyicon_uploaded = ext_yahoo_buddyicon_uploaded; yc.ext_yahoo_chat_yahoologout = ext_yahoo_chat_yahoologout; - yc.ext_yahoo_chat_yahooerror = ext_yahoo_chat_yahooerror ; + yc.ext_yahoo_chat_yahooerror = ext_yahoo_chat_yahooerror; yc.ext_yahoo_got_buddy_change_group = ext_yahoo_got_buddy_change_group; yahoo_register_callbacks(&yc); - + #endif } - |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/icq-toc In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/icq-toc Modified Files: icq-toc.c icq.h Log Message: reformatted source code Index: icq-toc.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq-toc/icq-toc.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- icq-toc.c 27 Jul 2009 16:42:03 -0000 1.51 +++ icq-toc.c 17 Sep 2009 12:04:58 -0000 1.52 @@ -65,7 +65,6 @@ #include "pixmaps/icq_online.xpm" #include "pixmaps/icq_away.xpm" - #define DBG_TOC do_icq_debug int do_icq_debug = 0; @@ -74,14 +73,13 @@ ************************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN [...1747 lines suppressed...] @@ -1348,8 +1375,8 @@ icqtoc_new_group = eb_icq_new_group; icqtoc_logged_in = eb_icq_logged_in; icqtoc_async_socket = eb_icq_async_socket; - - sc = g_new0( struct service_callbacks, 1 ); + + sc = g_new0(struct service_callbacks, 1); sc->query_connected = eb_icq_query_connected; sc->login = eb_icq_login; sc->logout = eb_icq_logout; @@ -1383,7 +1410,7 @@ sc->get_color = eb_toc_get_color; sc->get_smileys = eb_default_smileys; - + sc->change_group = eb_icq_change_group; sc->add_group = eb_icq_add_group; sc->del_group = eb_icq_del_group; Index: icq.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq-toc/icq.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- icq.h 1 Apr 2003 07:24:31 -0000 1.1.1.1 +++ icq.h 17 Sep 2009 12:04:58 -0000 1.2 @@ -29,9 +29,9 @@ #ifndef __EB_icq_H__ #define __EB_icq_H__ - + #include "service.h" -struct service_callbacks * icq_query_callbacks(); +struct service_callbacks *icq_query_callbacks(); #endif /*__icq_H__*/ |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/irc/libirc In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/irc/libirc Modified Files: ctcp.c ctcp.h irc_message.c irc_replies.h libirc.c libirc.h Log Message: reformatted source code Index: ctcp.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/irc/libirc/ctcp.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ctcp.c 2 Aug 2008 06:13:10 -0000 1.2 +++ ctcp.c 17 Sep 2009 12:04:59 -0000 1.3 @@ -30,469 +30,466 @@ * String data for CTCP data types * The CTCPCommandType enumerator elements act as offset to this array */ -static const CTCPExtData ctcp_command [] = - { - {"ACTION" ,6 , " allows user to refer to 'perform' action." - " This is shown by chat clients in 3rd person." }, - {"DCC" ,3 , " allows direct connection between clients." }, - {"SED" ,3 , " allows encrypted communication between clients." }, - {"FINGER" ,6 , " returns user's full name and idle time" }, - {"VERSION" ,7 , " shows client type, version and environment." }, - {"SOURCE" ,6 , " shows location from where to download client source code." }, - {"USERINFO" ,8 , " shows user information" }, - {"CLIENTINFO" ,10, " gives information about available CTCP commands." }, - {"ERRMSG" ,6 , " is used to display and reply to errors." }, - {"PING" ,4 , " echoes back whatever it receives." }, - {"TIME" ,4 , " shows the current time on the client system." } - } ; - +static const CTCPExtData ctcp_command[] = { + {"ACTION", 6, " allows user to refer to 'perform' action." + " This is shown by chat clients in 3rd person."}, + {"DCC", 3, " allows direct connection between clients."}, + {"SED", 3, " allows encrypted communication between clients."}, + {"FINGER", 6, " returns user's full name and idle time"}, + {"VERSION", 7, " shows client type, version and environment."}, + {"SOURCE", 6, " shows location from where to download client source code."}, + {"USERINFO", 8, " shows user information"}, + {"CLIENTINFO", 10, " gives information about available CTCP commands."}, + {"ERRMSG", 6, " is used to display and reply to errors."}, + {"PING", 4, " echoes back whatever it receives."}, + {"TIME", 4, " shows the current time on the client system."} +}; #define ctcp_strndup(outstr,str,len) {\ outstr=(char *)calloc(len+1, sizeof(char)) ; \ strncpy(outstr,str,len); \ } - -static void ctcp_low_encode ( char *msg, int size, int mem_size ) +static void ctcp_low_encode(char *msg, int size, int mem_size) { - int offset, out_offset ; - char *in_msg = NULL ; - + int offset, out_offset; + char *in_msg = NULL; + ctcp_strndup(in_msg, msg, size); - for (offset=0, out_offset=0; offset<=size; offset++, out_offset++) { + for (offset = 0, out_offset = 0; offset <= size; offset++, out_offset++) { /* Reallocate if we're falling short of memory... will happen only in rare cases */ - if ( out_offset >= mem_size - 1 ) { - mem_size += mem_size / 2 ; - msg = (char *)realloc(msg, mem_size*sizeof(char)); + if (out_offset >= mem_size - 1) { + mem_size += mem_size / 2; + msg = (char *)realloc(msg, mem_size * sizeof(char)); } - if ( in_msg[offset] == CTCP_NL ) { - msg [ out_offset++ ] = CTCP_MQUOTE ; - msg [ out_offset ] = 'n' ; - } - else if ( in_msg[offset] == CTCP_CR ) { - msg [ out_offset++ ] = CTCP_MQUOTE ; - msg [ out_offset ] = 'r' ; - } - else { - msg [out_offset] = in_msg[offset] ; + if (in_msg[offset] == CTCP_NL) { + msg[out_offset++] = CTCP_MQUOTE; + msg[out_offset] = 'n'; + } else if (in_msg[offset] == CTCP_CR) { + msg[out_offset++] = CTCP_MQUOTE; + msg[out_offset] = 'r'; + } else { + msg[out_offset] = in_msg[offset]; } } } - -char *ctcp_encode ( const char *msg, int msg_size ) +char *ctcp_encode(const char *msg, int msg_size) { - int offset, out_size, out_capacity ; - char *out_msg = NULL ; - - out_capacity = msg_size*2 ; + int offset, out_size, out_capacity; + char *out_msg = NULL; + + out_capacity = msg_size * 2; out_msg = (char *)calloc(out_capacity, sizeof(char)); - for ( offset = 0, out_size = 0; offset <= msg_size; offset++, out_size++ ) { + for (offset = 0, out_size = 0; offset <= msg_size; offset++, out_size++) { /* Reallocate if we're falling short of memory... will happen only in rare cases */ - if ( out_size >= out_capacity - 1 ) { - out_capacity += msg_size/2 ; - out_msg = (char *)realloc(out_msg, out_capacity*sizeof(char)); + if (out_size >= out_capacity - 1) { + out_capacity += msg_size / 2; + out_msg = + (char *)realloc(out_msg, + out_capacity * sizeof(char)); } - if (msg [offset] == CTCP_TAG ) { - out_msg [out_size++] = CTCP_XQUOTE ; - out_msg [ out_size ] = 'a' ; - } - else if (msg [offset] == CTCP_XQUOTE ) { - out_msg [out_size++] = CTCP_XQUOTE ; - out_msg [ out_size ] = CTCP_XQUOTE ; - } - else { - out_msg [ out_size ] = msg [offset] ; + if (msg[offset] == CTCP_TAG) { + out_msg[out_size++] = CTCP_XQUOTE; + out_msg[out_size] = 'a'; + } else if (msg[offset] == CTCP_XQUOTE) { + out_msg[out_size++] = CTCP_XQUOTE; + out_msg[out_size] = CTCP_XQUOTE; + } else { + out_msg[out_size] = msg[offset]; } } /* Do low level quoting */ - ctcp_low_encode ( out_msg, out_size, out_capacity ) ; + ctcp_low_encode(out_msg, out_size, out_capacity); - return out_msg ; + return out_msg; } - -static void ctcp_low_decode ( char *msg, const char *in_msg, int size ) +static void ctcp_low_decode(char *msg, const char *in_msg, int size) { int offset, out_offset; - for (offset=0, out_offset=0; offset<=size; offset++, out_offset++) { - if ( in_msg[offset] == CTCP_MQUOTE ) { - if (in_msg[offset+1] == '0') - msg[out_offset] = CTCP_NUL ; - else if (in_msg[offset+1] == 'n') - msg[out_offset] = CTCP_NL ; - else if (in_msg[offset+1] == 'r') - msg[out_offset] = CTCP_CR ; + for (offset = 0, out_offset = 0; offset <= size; offset++, out_offset++) { + if (in_msg[offset] == CTCP_MQUOTE) { + if (in_msg[offset + 1] == '0') + msg[out_offset] = CTCP_NUL; + else if (in_msg[offset + 1] == 'n') + msg[out_offset] = CTCP_NL; + else if (in_msg[offset + 1] == 'r') + msg[out_offset] = CTCP_CR; else msg[out_offset] = in_msg[offset]; - offset++ ; - } - else { + offset++; + } else { msg[out_offset] = in_msg[offset]; } } } - -char *ctcp_decode ( const char *msg, int msg_size ) +char *ctcp_decode(const char *msg, int msg_size) { int offset, out_size; - char *out_msg = NULL ; - - out_msg = (char *)calloc(msg_size+1, sizeof(char)); + char *out_msg = NULL; + + out_msg = (char *)calloc(msg_size + 1, sizeof(char)); /* Do low level quoting */ - ctcp_low_decode ( out_msg, msg, msg_size ) ; + ctcp_low_decode(out_msg, msg, msg_size); - for ( offset = 0, out_size = 0; offset <= msg_size; offset++, out_size++ ) { + for (offset = 0, out_size = 0; offset <= msg_size; offset++, out_size++) { - if (msg [offset] == CTCP_XQUOTE ) { - if ( msg[offset+1] == CTCP_XQUOTE ) - out_msg [out_size] = CTCP_XQUOTE ; - else if ( msg[offset+1] == 'a' ) - out_msg [out_size] = CTCP_TAG ; + if (msg[offset] == CTCP_XQUOTE) { + if (msg[offset + 1] == CTCP_XQUOTE) + out_msg[out_size] = CTCP_XQUOTE; + else if (msg[offset + 1] == 'a') + out_msg[out_size] = CTCP_TAG; else out_msg[out_size] = msg[offset]; - offset++ ; - } - else { - out_msg [ out_size ] = msg [offset] ; + offset++; + } else { + out_msg[out_size] = msg[offset]; } } - return out_msg ; + return out_msg; } - void ctcp_free_extended_data(ctcp_extended_data_list *data_list) { - while(data_list) { + while (data_list) { ctcp_extended_data_list *elem = data_list; - data_list = data_list -> next; - - if (elem -> ext_data ) { - if( elem -> ext_data -> data ) { - free(elem -> ext_data -> data); + data_list = data_list->next; + + if (elem->ext_data) { + if (elem->ext_data->data) { + free(elem->ext_data->data); } - free(elem -> ext_data); + free(elem->ext_data); } free(elem); } } - -ctcp_extended_data_list *ctcp_get_extended_data ( const char *in_msg, int size) +ctcp_extended_data_list *ctcp_get_extended_data(const char *in_msg, int size) { - int delimiter=0 ; + int delimiter = 0; - char *msg_start = NULL ; - char *cmd = NULL ; - char *tag_loc = NULL ; - char *temp = NULL ; - int count = 0 ; + char *msg_start = NULL; + char *cmd = NULL; + char *tag_loc = NULL; + char *temp = NULL; + int count = 0; char *msg = strdup(in_msg); - msg_start = msg ; + msg_start = msg; - ctcp_extended_data_list *list_head = NULL ; - ctcp_extended_data_list *data_list = NULL ; + ctcp_extended_data_list *list_head = NULL; + ctcp_extended_data_list *data_list = NULL; - if ( !in_msg ) - return NULL ; + if (!in_msg) + return NULL; - while ( (msg - msg_start) < size && (tag_loc = strchr(msg, CTCP_TAG)) != NULL ) { - - *tag_loc = '\0' ; - - if (data_list == NULL) { - data_list = (ctcp_extended_data_list *)calloc(1, sizeof(ctcp_extended_data_list)); - list_head = data_list ; - } - else { - data_list -> next = (ctcp_extended_data_list *)calloc(1, sizeof(ctcp_extended_data_list)); - data_list = data_list -> next ; - } + while ((msg - msg_start) < size + && (tag_loc = strchr(msg, CTCP_TAG)) != NULL) { - delimiter = !delimiter ; + *tag_loc = '\0'; - data_list -> ext_data = (ctcp_extended_data *)calloc(1, sizeof(ctcp_extended_data)); + if (data_list == NULL) { + data_list = + (ctcp_extended_data_list *)calloc(1, + sizeof(ctcp_extended_data_list)); + list_head = data_list; + } else { + data_list->next = + (ctcp_extended_data_list *)calloc(1, + sizeof(ctcp_extended_data_list)); + data_list = data_list->next; + } + + delimiter = !delimiter; + + data_list->ext_data = + (ctcp_extended_data *)calloc(1, + sizeof(ctcp_extended_data)); /* We found an odd delimiter. The stuff before it is plain text */ if (delimiter) { - data_list -> ext_data -> type = CTCP_NONE ; - } - else { + data_list->ext_data->type = CTCP_NONE; + } else { cmd = strchr(msg, ' '); if (cmd) { - *cmd = '\0' ; - temp = msg ; - msg = cmd + 1 ; - cmd = temp ; - } - else { - cmd = msg ; - msg = tag_loc ; + *cmd = '\0'; + temp = msg; + msg = cmd + 1; + cmd = temp; + } else { + cmd = msg; + msg = tag_loc; } - for (count = CTCP_NONE + 1; count < CTCP_DATA_COUNT; count++ ) { - if ( !strcmp( cmd, ctcp_command [ count ].data ) ) { - data_list -> ext_data -> type = count ; - break ; + for (count = CTCP_NONE + 1; count < CTCP_DATA_COUNT; + count++) { + if (!strcmp(cmd, ctcp_command[count].data)) { + data_list->ext_data->type = count; + break; } } if (count == CTCP_DATA_COUNT) { - data_list -> ext_data -> type = CTCP_NONE ; + data_list->ext_data->type = CTCP_NONE; } } - data_list -> ext_data -> data = strdup(msg) ; - msg = tag_loc+1 ; + data_list->ext_data->data = strdup(msg); + msg = tag_loc + 1; } /* if there is anything remaining in the message then put that into the list as well */ - if ( (msg - msg_start) < size ) { + if ((msg - msg_start) < size) { if (data_list == NULL) { - data_list = (ctcp_extended_data_list *)calloc(1, sizeof(ctcp_extended_data_list)); - list_head = data_list ; - } - else { - data_list -> next = (ctcp_extended_data_list *)calloc(1, sizeof(ctcp_extended_data_list)); - data_list = data_list -> next ; + data_list = + (ctcp_extended_data_list *)calloc(1, + sizeof(ctcp_extended_data_list)); + list_head = data_list; + } else { + data_list->next = + (ctcp_extended_data_list *)calloc(1, + sizeof(ctcp_extended_data_list)); + data_list = data_list->next; } - - data_list -> ext_data = (ctcp_extended_data *)calloc(1, sizeof(ctcp_extended_data)); - data_list -> ext_data -> type = CTCP_NONE ; - data_list -> ext_data -> data = strdup(msg) ; + + data_list->ext_data = + (ctcp_extended_data *)calloc(1, + sizeof(ctcp_extended_data)); + data_list->ext_data->type = CTCP_NONE; + data_list->ext_data->data = strdup(msg); } - if(msg_start) { - free ( msg_start ) ; - msg_start = NULL ; + if (msg_start) { + free(msg_start); + msg_start = NULL; } - return list_head ; + return list_head; } - -char *ctcp_gen_extended_data_request ( int type, const char *msg ) +char *ctcp_gen_extended_data_request(int type, const char *msg) { - char *out_msg = NULL ; - int out_msg_len ; - - out_msg_len = ctcp_command [ type ].length + 2 + (msg?strlen(msg)+1:0) ; + char *out_msg = NULL; + int out_msg_len; + + out_msg_len = + ctcp_command[type].length + 2 + (msg ? strlen(msg) + 1 : 0); - out_msg = (char *)calloc((out_msg_len + 1), sizeof(char)) ; + out_msg = (char *)calloc((out_msg_len + 1), sizeof(char)); - out_msg [ 0 ] = '\001' ; - strcat ( out_msg, ctcp_command [ type ].data ) ; + out_msg[0] = '\001'; + strcat(out_msg, ctcp_command[type].data); /* Needed for CLIENTINFO, ERRMSG and PING */ if (msg) { - strcat (out_msg, " ") ; - strcat (out_msg, msg) ; + strcat(out_msg, " "); + strcat(out_msg, msg); } - out_msg [ strlen(out_msg) ] = '\001' ; + out_msg[strlen(out_msg)] = '\001'; - return out_msg ; + return out_msg; } - -char *ctcp_gen_version_response ( char *client_name, char *client_version, char *client_env ) +char *ctcp_gen_version_response(char *client_name, char *client_version, + char *client_env) { - char *out_msg = NULL ; - int out_msg_len = ctcp_command [ CTCP_VERSION ].length - + (client_name?strlen(client_name):0) - + (client_version?strlen(client_version):0) - + (client_env?strlen(client_env):0) - + 5 ; + char *out_msg = NULL; + int out_msg_len = ctcp_command[CTCP_VERSION].length + + (client_name ? strlen(client_name) : 0) + + (client_version ? strlen(client_version) : 0) + + (client_env ? strlen(client_env) : 0) + + 5; - out_msg = (char *)calloc((out_msg_len + 1), sizeof(char)) ; + out_msg = (char *)calloc((out_msg_len + 1), sizeof(char)); - out_msg [ 0 ] = '\001' ; - strcat ( out_msg, ctcp_command [ CTCP_VERSION ].data ) ; - out_msg [ ctcp_command [ CTCP_VERSION ].length +1 ] = ' ' ; + out_msg[0] = '\001'; + strcat(out_msg, ctcp_command[CTCP_VERSION].data); + out_msg[ctcp_command[CTCP_VERSION].length + 1] = ' '; - strcat ( out_msg, client_name ) ; - strcat ( out_msg, ":" ) ; - strcat ( out_msg, client_version ) ; - strcat ( out_msg, ":" ) ; - strcat ( out_msg, client_env ) ; + strcat(out_msg, client_name); + strcat(out_msg, ":"); + strcat(out_msg, client_version); + strcat(out_msg, ":"); + strcat(out_msg, client_env); - out_msg [ out_msg_len - 1 ] = '\001' ; + out_msg[out_msg_len - 1] = '\001'; - return out_msg ; + return out_msg; } - -ctcp_version *ctcp_got_version (const char *msg) +ctcp_version *ctcp_got_version(const char *msg) { - char *name_offset = NULL ; - char *version_offset = NULL ; + char *name_offset = NULL; + char *version_offset = NULL; ctcp_version *out = (ctcp_version *)calloc(1, sizeof(ctcp_version)); if (!msg) - return NULL ; + return NULL; name_offset = strchr(msg, ':'); - if ( name_offset ) { - ctcp_strndup(out -> name, msg, (name_offset - msg)); - version_offset = strchr(name_offset+1, ':'); + if (name_offset) { + ctcp_strndup(out->name, msg, (name_offset - msg)); + version_offset = strchr(name_offset + 1, ':'); } - - if ( version_offset ) { - ctcp_strndup(out -> version, (name_offset+1), (version_offset - name_offset - 1)); - out -> env = strdup(version_offset+1); + + if (version_offset) { + ctcp_strndup(out->version, (name_offset + 1), + (version_offset - name_offset - 1)); + out->env = strdup(version_offset + 1); } - return out ; + return out; } - -char *ctcp_gen_source_response ( char *source_host, char *source_path, char *source_file ) +char *ctcp_gen_source_response(char *source_host, char *source_path, + char *source_file) { - char *out_msg = NULL ; - int out_msg_len = ctcp_command [ CTCP_SOURCE ].length - + (source_host?strlen(source_host):0) - + (source_path?strlen(source_path):0) - + (source_file?strlen(source_file):0) - + 5 ; + char *out_msg = NULL; + int out_msg_len = ctcp_command[CTCP_SOURCE].length + + (source_host ? strlen(source_host) : 0) + + (source_path ? strlen(source_path) : 0) + + (source_file ? strlen(source_file) : 0) + + 5; - out_msg = (char *)calloc((out_msg_len+1), sizeof(char)) ; + out_msg = (char *)calloc((out_msg_len + 1), sizeof(char)); - out_msg [ 0 ] = '\001' ; - strcat ( out_msg, ctcp_command [ CTCP_SOURCE ].data ) ; - out_msg [ ctcp_command [ CTCP_SOURCE ].length + 1 ] = ' ' ; + out_msg[0] = '\001'; + strcat(out_msg, ctcp_command[CTCP_SOURCE].data); + out_msg[ctcp_command[CTCP_SOURCE].length + 1] = ' '; - strcat ( out_msg, source_host ) ; - strcat ( out_msg, ":" ) ; - strcat ( out_msg, source_path ) ; - strcat ( out_msg, ":" ) ; - strcat ( out_msg, source_file ) ; + strcat(out_msg, source_host); + strcat(out_msg, ":"); + strcat(out_msg, source_path); + strcat(out_msg, ":"); + strcat(out_msg, source_file); - out_msg [ out_msg_len - 1 ] = '\001' ; + out_msg[out_msg_len - 1] = '\001'; - return out_msg ; + return out_msg; } - -ctcp_source *ctcp_got_source (const char *msg) +ctcp_source *ctcp_got_source(const char *msg) { - char *host_offset = NULL ; - char *path_offset = NULL ; + char *host_offset = NULL; + char *path_offset = NULL; ctcp_source *out = (ctcp_source *)calloc(1, sizeof(ctcp_source)); if (!msg) - return NULL ; + return NULL; host_offset = strchr(msg, ':'); - if ( host_offset ) { - ctcp_strndup(out -> host, msg, (host_offset - msg)); - path_offset = strchr(host_offset+1, ':'); + if (host_offset) { + ctcp_strndup(out->host, msg, (host_offset - msg)); + path_offset = strchr(host_offset + 1, ':'); } - - if ( path_offset ) { - ctcp_strndup(out -> path, (host_offset+1), (path_offset - msg)); - out -> file = strdup(path_offset); + + if (path_offset) { + ctcp_strndup(out->path, (host_offset + 1), (path_offset - msg)); + out->file = strdup(path_offset); } - return out ; + return out; } - -char *ctcp_gen_time_response (void) +char *ctcp_gen_time_response(void) { - time_t tm ; - char *cur_time = NULL ; + time_t tm; + char *cur_time = NULL; - char *out_msg = NULL ; - int out_msg_len ; - - tm = time (NULL) ; + char *out_msg = NULL; + int out_msg_len; + + tm = time(NULL); cur_time = ctime(&tm); /* Remove the \n from end of string */ - cur_time [ strlen(cur_time) - 1 ] = '\0' ; - - out_msg_len = ctcp_command [ CTCP_TIME ].length + 4 + (cur_time?strlen(cur_time):0) ; + cur_time[strlen(cur_time) - 1] = '\0'; - out_msg = (char *)calloc((out_msg_len + 1), sizeof(char)) ; + out_msg_len = + ctcp_command[CTCP_TIME].length + 4 + + (cur_time ? strlen(cur_time) : 0); - out_msg [ 0 ] = '\001' ; - strcat ( out_msg, ctcp_command [ CTCP_TIME ].data ) ; - out_msg [ ctcp_command [ CTCP_TIME ].length + 1 ] = ' ' ; - out_msg [ ctcp_command [ CTCP_TIME ].length + 2 ] = ':' ; + out_msg = (char *)calloc((out_msg_len + 1), sizeof(char)); - strcat ( out_msg, cur_time ) ; + out_msg[0] = '\001'; + strcat(out_msg, ctcp_command[CTCP_TIME].data); + out_msg[ctcp_command[CTCP_TIME].length + 1] = ' '; + out_msg[ctcp_command[CTCP_TIME].length + 2] = ':'; - out_msg [ out_msg_len - 1 ] = '\001' ; + strcat(out_msg, cur_time); + out_msg[out_msg_len - 1] = '\001'; - return out_msg ; + return out_msg; } - -char *ctcp_gen_clientinfo_response (const char *command) +char *ctcp_gen_clientinfo_response(const char *command) { - int count = 0 ; + int count = 0; - char *out_msg = NULL ; + char *out_msg = NULL; - for(count = CTCP_NONE + 1; count < CTCP_DATA_COUNT; count++) { - if (!strcmp(command, ctcp_command [count].data)) { + for (count = CTCP_NONE + 1; count < CTCP_DATA_COUNT; count++) { + if (!strcmp(command, ctcp_command[count].data)) { - out_msg = (char *)calloc( (ctcp_command [count].length + - strlen(ctcp_command [count].clientinfo_description) + 1 ) - , sizeof(char) ); + out_msg = (char *)calloc((ctcp_command[count].length + + strlen(ctcp_command[count]. + clientinfo_description) + 1) + , sizeof(char)); - strcpy(out_msg, ctcp_command [count].data); - strcat(out_msg, ctcp_command [count].clientinfo_description); + strcpy(out_msg, ctcp_command[count].data); + strcat(out_msg, + ctcp_command[count].clientinfo_description); - break ; + break; } } - return out_msg ; + return out_msg; } - char *ctcp_gen_ping_response(char *timestamp) { - char *out_msg = NULL ; - int out_msg_len ; - - out_msg_len = ctcp_command [ CTCP_PING ].length + 3 + (timestamp?strlen(timestamp):0) ; + char *out_msg = NULL; + int out_msg_len; - out_msg = (char *)calloc((out_msg_len + 1), sizeof(char)) ; + out_msg_len = + ctcp_command[CTCP_PING].length + 3 + + (timestamp ? strlen(timestamp) : 0); - out_msg [ 0 ] = '\001' ; - strcat ( out_msg, ctcp_command [ CTCP_PING ].data ) ; - out_msg [ ctcp_command [ CTCP_PING ].length + 1 ] = ' ' ; + out_msg = (char *)calloc((out_msg_len + 1), sizeof(char)); - strcat ( out_msg, timestamp ) ; + out_msg[0] = '\001'; + strcat(out_msg, ctcp_command[CTCP_PING].data); + out_msg[ctcp_command[CTCP_PING].length + 1] = ' '; - out_msg [ out_msg_len - 1 ] = '\001' ; + strcat(out_msg, timestamp); + out_msg[out_msg_len - 1] = '\001'; - return out_msg ; + return out_msg; } - Index: ctcp.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/irc/libirc/ctcp.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ctcp.h 2 Aug 2008 06:13:10 -0000 1.2 +++ ctcp.h 17 Sep 2009 12:04:59 -0000 1.3 @@ -25,125 +25,104 @@ #ifndef __CTCP_H__ #define __CTCP_H__ - /* * Special characters with special meanings in CTCP protocol */ #define CTCP_TAG '\001' /* Tag delimiter */ -#define CTCP_XQUOTE '\134' /* CTCP level quoting char for CTCP_TAG */ +#define CTCP_XQUOTE '\134' /* CTCP level quoting char for CTCP_TAG */ -#define CTCP_MQUOTE '\020' /* Low level quoting char for \n, \r and \0 */ -#define CTCP_NUL '\0' /* NULL */ -#define CTCP_NL '\n' /* Newline */ -#define CTCP_CR '\r' /* Carriage Return */ +#define CTCP_MQUOTE '\020' /* Low level quoting char for \n, \r and \0 */ +#define CTCP_NUL '\0' /* NULL */ +#define CTCP_NL '\n' /* Newline */ +#define CTCP_CR '\r' /* Carriage Return */ /* * CTCP Data element. This describes a CTCP command * i.e. the command string, length of command string and a description returned to a CLIENTINFO request */ typedef struct { - const char *data ; - const int length ; - const char *clientinfo_description ; -} CTCPExtData ; - + const char *data; + const int length; + const char *clientinfo_description; +} CTCPExtData; /* * CTCP extended data types. */ enum { - CTCP_NONE = -1 , - CTCP_ACTION = 0 , - CTCP_DCC = 1 , - CTCP_SED = 2 , - CTCP_FINGER = 3 , - CTCP_VERSION = 4 , - CTCP_SOURCE = 5 , - CTCP_USERINFO = 6 , - CTCP_CLIENTINFO = 7 , - CTCP_ERRMSG = 8 , - CTCP_PING = 9 , - CTCP_TIME = 10 , - CTCP_DATA_COUNT = 11 -} CTCPCommandType ; - + CTCP_NONE = -1, + CTCP_ACTION = 0, + CTCP_DCC = 1, + CTCP_SED = 2, + CTCP_FINGER = 3, + CTCP_VERSION = 4, + CTCP_SOURCE = 5, + CTCP_USERINFO = 6, + CTCP_CLIENTINFO = 7, + CTCP_ERRMSG = 8, + CTCP_PING = 9, + CTCP_TIME = 10, + CTCP_DATA_COUNT = 11 +} CTCPCommandType; /* * An extended data element */ typedef struct { - int type ; /* Type of Extended data */ - char *data ; /* The string argument to the extended data type */ -} ctcp_extended_data ; - + int type; /* Type of Extended data */ + char *data; /* The string argument to the extended data type */ +} ctcp_extended_data; /* * A singly linked list of elements of type ctcp_extended_data */ typedef struct _extended_data_list { - ctcp_extended_data *ext_data ; - struct _extended_data_list *next ; - -} ctcp_extended_data_list ; + ctcp_extended_data *ext_data; + struct _extended_data_list *next; +} ctcp_extended_data_list; /* * Response structure to \001VERSION\001 */ typedef struct { - char *name ; - char *version ; - char *env ; -} ctcp_version ; - + char *name; + char *version; + char *env; +} ctcp_version; /* * Response structure to \001SOURCE\001 */ typedef struct { - char *host ; - char *path ; - char *file ; -} ctcp_source ; - - + char *host; + char *path; + char *file; +} ctcp_source; /* Quote a message string to send to server */ -char * ctcp_encode - ( const char *msg, - int size ) ; - +char *ctcp_encode(const char *msg, int size); /* Unquote a message string received from server */ -char *ctcp_decode - ( const char *msg, - int size ) ; - +char *ctcp_decode(const char *msg, int size); /* * Decode extended data from the message string. * Return value: Pointer to a ctcp_extended_data_list */ -ctcp_extended_data_list *ctcp_get_extended_data - ( const char *in_msg, - int size ) ; +ctcp_extended_data_list *ctcp_get_extended_data(const char *in_msg, int size); /* * Free the data list */ -void ctcp_free_extended_data - ( ctcp_extended_data_list *data_list ); - +void ctcp_free_extended_data(ctcp_extended_data_list *data_list); /* * Generate an Extended Data Request * Return value: The complete request string, with leading and trailing CTCP tags (\001) */ -char * ctcp_gen_extended_data_request - ( int type, - const char *msg ) ; - +char *ctcp_gen_extended_data_request(int type, const char *msg); /* * Generate an Extended Data Response. behaviour is the same as ctcp_gen_extended_data_request @@ -151,63 +130,47 @@ */ #define ctcp_gen_extended_data_response ctcp_gen_extended_data_request - /* * Parse the response string to get the various parameters set by VERSION * Return value: ctcp_version structure containing the name, version and environment of the client */ -ctcp_version *ctcp_got_version - ( const char *msg ) ; - +ctcp_version *ctcp_got_version(const char *msg); /* * Generate a CTCP string response to \001VERSION\001 * Return value: CTCP response to VERSION containing client name, version and environment */ -char * ctcp_gen_version_response - ( char *client_name, - char *client_version, - char *client_env ) ; - +char *ctcp_gen_version_response + (char *client_name, char *client_version, char *client_env); /* * Parse CTCP response to \001SOURCE\001 request * Return value: ctcp_source structure containing parameters of response to SOURCE query */ -ctcp_source *ctcp_got_source - ( const char *msg ) ; - +ctcp_source *ctcp_got_source(const char *msg); /* * Generate a CTCP response to \001SOURCE\001 query * Return value: CTCP Response containing the host, path and filename as requested by the SOURCE query */ -char *ctcp_gen_source_response - ( char *source_host, - char *source_path, - char *source_file ) ; - +char *ctcp_gen_source_response + (char *source_host, char *source_path, char *source_file); /* * Generate response to \001TIME\001 Query * Return value: CTCP response containing the current time */ -char *ctcp_gen_time_response - ( void ) ; - +char *ctcp_gen_time_response(void); /* * Generate response to \001CLIENTINFO\001 query. * Return value: CTCP response containing description of the COMMAND provided as argument */ -char *ctcp_gen_clientinfo_response - ( const char *command ) ; +char *ctcp_gen_clientinfo_response(const char *command); /* * Generate response to a \001PING\001 query */ -char *ctcp_gen_ping_response - (char *timestamp) ; +char *ctcp_gen_ping_response(char *timestamp); #endif - Index: irc_message.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/irc/libirc/irc_message.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- irc_message.c 7 Sep 2009 07:13:03 -0000 1.5 +++ irc_message.c 17 Sep 2009 12:04:59 -0000 1.6 @@ -20,7 +20,6 @@ * */ - #include <string.h> #include "libirc.h" #include "irc_replies.h" @@ -34,24 +33,34 @@ #define CB_EXEC(cb,func) if(cb->func) cb->func [...1537 lines suppressed...] msg++; } - snprintf(out, BUF_LEN, "PRIVMSG %s :%s\n", params, (msg?msg:"")); + snprintf(out, BUF_LEN, "PRIVMSG %s :%s\n", params, + (msg ? msg : "")); // restore the space in params since client might need it - if(msg) { - *(msg-1) = ' '; + if (msg) { + *(msg - 1) = ' '; } - return ; + return; } } - - Index: irc_replies.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/irc/libirc/irc_replies.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- irc_replies.h 24 Jul 2009 13:09:42 -0000 1.3 +++ irc_replies.h 17 Sep 2009 12:04:59 -0000 1.4 @@ -34,7 +34,7 @@ #define RPL_MYINFO 4 #define RPL_BOUNCE 5 -#define RPL_NONE 300 /* Dummy Reply. Not used */ +#define RPL_NONE 300 /* Dummy Reply. Not used */ #define RPL_AWAY 301 #define RPL_USERHOST 302 #define RPL_ISON 303 @@ -192,5 +192,4 @@ #define IRC_CMD_PING 1011 #define IRC_CMD_ERROR 1012 - #endif Index: libirc.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/irc/libirc/libirc.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libirc.c 7 Sep 2009 07:13:03 -0000 1.8 +++ libirc.c 17 Sep 2009 12:04:59 -0000 1.9 @@ -22,8 +22,7 @@ #include "libirc.h" #include "ctcp.h" -static char irc_modes[] = -{ +static char irc_modes[] = { 'a', 'i', 'w', @@ -34,57 +33,56 @@ }; /* LOGIN */ -void irc_login( const char *password, int mode, irc_account *ia ) +void irc_login(const char *password, int mode, irc_account *ia) { char buff[BUF_LEN]; - memset(buff,0,BUF_LEN); + memset(buff, 0, BUF_LEN); - if(password && password [0]) { + if (password && password[0]) { sprintf(buff, "PASS %s\n", password); ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - if(ia->nick) { + if (ia->nick) { sprintf(buff, "NICK %s\n", ia->nick); ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - if(ia->user) { - sprintf(buff, "USER %s %d * :Ayttm user %s\n", ia->user, mode, ia->user); + if (ia->user) { + sprintf(buff, "USER %s %d * :Ayttm user %s\n", ia->user, mode, + ia->user); ia->callbacks->irc_send_data(buff, strlen(buff), ia); } } - /* LOGOUT */ -void irc_logout( irc_account *ia ) +void irc_logout(irc_account *ia) { char buff[BUF_LEN]; - memset(buff,0,BUF_LEN); + memset(buff, 0, BUF_LEN); sprintf(buff, "QUIT :Ayttm logging off\n"); ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - /* Send a PRIVMSG */ -void irc_send_privmsg( const char *recipient, char *message, irc_account *ia) +void irc_send_privmsg(const char *recipient, char *message, irc_account *ia) { - char *out_msg ; - int offset=0; + char *out_msg; + int offset = 0; char buff[BUF_LEN]; - memset(buff,0,BUF_LEN); + memset(buff, 0, BUF_LEN); if (!message) return; - while(message[offset] == ' ' || message[offset] == '\t') + while (message[offset] == ' ' || message[offset] == '\t') offset++; - if ( message[offset] == '/' ) { + if (message[offset] == '/') { char *param_offset = NULL; // It is some kind of command - message+=offset+1; + message += offset + 1; param_offset = strchr(message, ' '); @@ -93,48 +91,47 @@ param_offset++; } - irc_get_command_string(buff, recipient, message, param_offset, ia); + irc_get_command_string(buff, recipient, message, param_offset, + ia); // reinstate the space so that we can put the message in our window intact if (param_offset) { - *(param_offset-1) = ' '; + *(param_offset - 1) = ' '; } - } - else { - out_msg = ctcp_encode (message, strlen(message) ) ; - snprintf(buff, sizeof(buff), "PRIVMSG %s :%s\n", recipient, out_msg); + } else { + out_msg = ctcp_encode(message, strlen(message)); + snprintf(buff, sizeof(buff), "PRIVMSG %s :%s\n", recipient, + out_msg); - if(out_msg) + if (out_msg) free(out_msg); } - if(*buff) + if (*buff) ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - /* Send a NOTICE */ -void irc_send_notice( const char *recipient, char *message, irc_account *ia) +void irc_send_notice(const char *recipient, char *message, irc_account *ia) { - char *out_msg ; + char *out_msg; char buff[BUF_LEN]; - memset(buff,0,BUF_LEN); + memset(buff, 0, BUF_LEN); - out_msg = ctcp_encode (message, strlen(message) ) ; + out_msg = ctcp_encode(message, strlen(message)); sprintf(buff, "NOTICE %s :%s\n", recipient, out_msg); ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - /* Send WHOIS query */ -void irc_send_whois( const char *target, const char *mask, irc_account *ia ) +void irc_send_whois(const char *target, const char *mask, irc_account *ia) { char buff[BUF_LEN]; - memset(buff,0,BUF_LEN); + memset(buff, 0, BUF_LEN); - if ( target ) + if (target) sprintf(buff, "WHOIS %s ", target); else sprintf(buff, "WHOIS "); @@ -145,9 +142,8 @@ ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - /* Set Away */ -void irc_set_away( char * message, irc_account *ia ) +void irc_set_away(char *message, irc_account *ia) { char buff[BUF_LEN]; memset(buff, 0, BUF_LEN); @@ -164,7 +160,6 @@ } } - /* Set Modes */ void irc_set_mode(int irc_mode, irc_account *ia) { @@ -175,7 +170,6 @@ ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - /* Unset modes */ void irc_unset_mode(int irc_mode, irc_account *ia) { @@ -186,15 +180,14 @@ ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - /* Join a Channel */ -void irc_join (const char *room, irc_account *ia) +void irc_join(const char *room, irc_account *ia) { char buff[BUF_LEN]; memset(buff, 0, BUF_LEN); sprintf(buff, "JOIN :%s\n", room); - + ia->callbacks->irc_send_data(buff, strlen(buff), ia); } @@ -205,21 +198,20 @@ memset(buff, 0, BUF_LEN); sprintf(buff, "PART :%s\n", room); - + ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - /* Send an Invite */ -void irc_send_invite( const char *user, const char *room, - const char * message, irc_account *ia ) +void irc_send_invite(const char *user, const char *room, + const char *message, irc_account *ia) { char buff[BUF_LEN]; memset(buff, 0, BUF_LEN); if (*message) { sprintf(buff, "PRIVMSG %s :%s\n", user, message); - + ia->callbacks->irc_send_data(buff, strlen(buff), ia); } @@ -227,8 +219,7 @@ ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - -void irc_get_names_list( const char *channel, irc_account *ia ) +void irc_get_names_list(const char *channel, irc_account *ia) { char buff[BUF_LEN]; memset(buff, 0, BUF_LEN); @@ -237,8 +228,7 @@ ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - -void irc_request_list ( const char *channel, const char *target, irc_account *ia ) +void irc_request_list(const char *channel, const char *target, irc_account *ia) { char buff[BUF_LEN]; memset(buff, 0, BUF_LEN); @@ -259,7 +249,6 @@ ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - /* Send a PONG message response. Called by the PING handler */ void irc_send_pong(const char *message, irc_account *ia) { @@ -270,99 +259,100 @@ ia->callbacks->irc_send_data(buff, strlen(buff), ia); } - /* Get PRIVMSG. CTCP implementation called here. */ -void irc_process_privmsg(const char *to, const char *message, irc_message_prefix *prefix, irc_account *ia) +void irc_process_privmsg(const char *to, const char *message, + irc_message_prefix *prefix, irc_account *ia) { /* * This only decodes. You will want to call ctcp_get_extended_data() to actually * get the complete break-up of the string into constituent commands */ - char *out_msg = ctcp_decode (message, strlen(message)) ; + char *out_msg = ctcp_decode(message, strlen(message)); ia->callbacks->got_privmsg(to, out_msg, prefix, ia); - if(out_msg) { + if (out_msg) { free(out_msg); } } - /* Get PRIVMSG. CTCP implementation called here. */ -void irc_process_notice(const char *to, const char *message, irc_message_prefix *prefix, irc_account *ia) +void irc_process_notice(const char *to, const char *message, + irc_message_prefix *prefix, irc_account *ia) { /* * This only decodes. You will want to call ctcp_get_extended_data() to actually * get the complete break-up of the string into constituent commands */ - char *out_msg = ctcp_decode (message, strlen(message)) ; + char *out_msg = ctcp_decode(message, strlen(message)); ia->callbacks->incoming_notice(to, out_msg, prefix, ia); - if(out_msg) { + if (out_msg) { free(out_msg); } } - irc_name_list *irc_gen_name_list(char *message) { - char *offset = NULL ; + char *offset = NULL; irc_name_list *list = NULL; - irc_name_list *head = NULL ; + irc_name_list *head = NULL; while (message && *message) { offset = strchr(message, ' '); - if ( list ) { - list->next = (irc_name_list *)calloc(1, sizeof(irc_name_list)); - list = list-> next ; - } - else if ( !list ) { - list = (irc_name_list *)calloc(1, sizeof(irc_name_list)); - head = list ; + if (list) { + list->next = + (irc_name_list *)calloc(1, + sizeof(irc_name_list)); + list = list->next; + } else if (!list) { + list = (irc_name_list *)calloc(1, + sizeof(irc_name_list)); + head = list; } - if(offset) { + if (offset) { *offset = '\0'; } - if ( *message == '+' || *message == '@' ) { - list -> attribute = *message ; + if (*message == '+' || *message == '@') { + list->attribute = *message; message++; - } - else - list -> attribute = '\0'; + } else + list->attribute = '\0'; - list -> name = strdup(message); + list->name = strdup(message); /* We're at the end of the list... get out now... */ - if (!offset) - break ; + if (!offset) + break; - message = offset + 1 ; + message = offset + 1; } - return head ; + return head; } - /* Add a parameter to the list and return its new head */ -irc_param_list *irc_param_list_add(irc_param_list *param_list, const char *param) +irc_param_list *irc_param_list_add(irc_param_list *param_list, + const char *param) { irc_param_list *head = param_list; - irc_param_list *new = (irc_param_list *)calloc(1, sizeof(irc_param_list)); + irc_param_list *new = + (irc_param_list *)calloc(1, sizeof(irc_param_list)); - if(!param_list) { + if (!param_list) { new->param = strdup(param); new->next = NULL; return new; } - while(param_list->next) + while (param_list->next) param_list = param_list->next; - + param_list->next = new; new->param = strdup(param); @@ -372,48 +362,46 @@ } /* Free the parameter list */ -void irc_param_list_free(irc_param_list *param_list ) +void irc_param_list_free(irc_param_list *param_list) { irc_param_list *to_be_freed = NULL; - while(param_list) { + while (param_list) { to_be_freed = param_list; param_list = param_list->next; free(to_be_freed); - to_be_freed = NULL ; + to_be_freed = NULL; } } /* Get nth paramater in the list */ -char *irc_param_list_get_at(irc_param_list * list, int position) +char *irc_param_list_get_at(irc_param_list *list, int position) { - int cur=0; + int cur = 0; - if(!list) + if (!list) return NULL; - while(list->next && cur<position) { - list=list->next; + while (list->next && cur < position) { + list = list->next; cur++; } - if(list) + if (list) return list->param; else return NULL; } - - -int irc_recv (irc_account *ia, char *buf, int len) +int irc_recv(irc_account *ia, char *buf, int len) { - if(buf[len] == '\n') { - if(buf[len-1] !='\r') + if (buf[len] == '\n') { + if (buf[len - 1] != '\r') return 0; - buf[len-1]='\0'; + buf[len - 1] = '\0'; -// fprintf(stderr, "irc> %s\n", buf); +// fprintf(stderr, "irc> %s\n", buf); irc_message_parse(buf, ia); @@ -422,5 +410,3 @@ return 0; } - - Index: libirc.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/irc/libirc/libirc.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libirc.h 7 Sep 2009 07:13:03 -0000 1.8 +++ libirc.h 17 Sep 2009 12:04:59 -0000 1.9 @@ -22,7 +22,6 @@ * */ - #ifndef _LIB_IRC_H_ #define _LIB_IRC_H_ @@ -46,13 +45,11 @@ #include <netdb.h> #endif - /* RFC1459 and RFC2812 defines max message size including \n == 512 bytes, but being tolerant of violations is nice nevertheless. */ #define BUF_LEN 512*2 - /* from util.c : * * The last state in the list of states will be the OFFLINE state @@ -76,12 +73,12 @@ /* User modes */ enum { IRC_USER_MODE_AWAY = 1, - IRC_USER_MODE_INVISIBLE = 1<<1, - IRC_USER_MODE_RECEIVE_WALLOPS = 1<<2, - IRC_USER_MODE_RESTRICT_USER_CONNECTION = 1<<3, - IRC_USER_MODE_OPER = 1<<4, - IRC_USER_MODE_LOCAL_OPER = 1<<5, - IRC_USER_MODE_RECEIVE_SERVER_NOTICES = 1<<6 + IRC_USER_MODE_INVISIBLE = 1 << 1, + IRC_USER_MODE_RECEIVE_WALLOPS = 1 << 2, + IRC_USER_MODE_RESTRICT_USER_CONNECTION = 1 << 3, + IRC_USER_MODE_OPER = 1 << 4, + IRC_USER_MODE_LOCAL_OPER = 1 << 5, + IRC_USER_MODE_RECEIVE_SERVER_NOTICES = 1 << 6 }; /* Message Prefix */ @@ -90,26 +87,26 @@ char *servername; char *user; char *hostname; -} irc_message_prefix ; +} irc_message_prefix; /* Parameter List element */ typedef struct _irc_param_list { char *param; struct _irc_param_list *next; -} irc_param_list ; +} irc_param_list; struct _irc_callbacks; typedef struct { - char connect_address [255]; - char port [16]; + char connect_address[255]; + char port[16]; char *nick; char *servername; char *hostname; char *user; - int fd; + int fd; - int status; + int status; char *usermodes; char *channelmodes; @@ -119,489 +116,394 @@ char buf[BUF_LEN]; int len; - void *data ; -} irc_account ; - + void *data; +} irc_account; typedef struct _namelist { - char *name ; - char attribute ; - struct _namelist *next ; -} irc_name_list ; - + char *name; + char attribute; + struct _namelist *next; +} irc_name_list; typedef struct _irc_callbacks { - void (*incoming_notice) (const char *to, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*buddy_quit) (const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*buddy_join) (const char *channel, - irc_message_prefix *prefix, - irc_account *ia); - - void (*buddy_part) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_invite) (const char *to, - const char *channel, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_kick) (const char *to, - const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*nick_change) (const char *newnick, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_privmsg) (const char *recipient, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_ping) (const char *server, - irc_account *ia); - - void (*got_welcome) (const char *nick, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_yourhost) (const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_created) (const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_myinfo) (const char *servername, - const char *version, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_channel_list) (const char *me, - const char *channel, - int users, - const char *topic, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_channel_listend) (const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_away) (const char *from, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_unaway) (const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_nowaway) (const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_ison) (const char *userlist, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_whoisidle) (const char *from, - int since, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_whoisuser) (const char *nick, - const char *user, - const char *host, - const char *real_name, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_whoisserver) (const char *nick, - const char *server, - const char *info, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_whoisop) (const char *nick, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_whowasuser) (const char *nick, - const char *user, - const char *host, - const char *real_name, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_endofwhois) (const char *nicks, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_endofwhowas) (const char *nicks, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_notopic) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_topic) (const char *channel, - const char *topic, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_topicsetby) (const char *channel, - const char *nickname, - const char *time, - irc_message_prefix *prefix, - irc_account *ia); - - void (*inviting) (const char *channel, - const char *nick, - irc_message_prefix *prefix, - irc_account *ia); - - void (*summoning) (const char *user, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_version) (const char *version, - const char *debuglevel, - const char *server, - const char *comments, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_info) (const char *info, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_endinfo) (const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*motd_start) (const char *server, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_motd) (const char *motd, - irc_message_prefix *prefix, - irc_account *ia); - - void (*endofmotd) (const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_endofwho) (const char *name, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_endofnames) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*youreoper) (const char *message, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_namelist) (irc_name_list *list, - const char *channel, - irc_message_prefix *prefix, - irc_account *ia); - - void (*got_time) (const char *time, - irc_message_prefix *prefix, - irc_account *ia); - - void (*irc_send_data) (void *buf, - int len, - irc_account *ia); - - void (*irc_error) (const char *message, - void *data); - - void (*irc_warning) (const char *message, - void *data); - - void (*client_quit) (irc_account *ia); - + void (*incoming_notice) (const char *to, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*buddy_quit) (const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*buddy_join) (const char *channel, + irc_message_prefix *prefix, irc_account *ia); + + void (*buddy_part) (const char *channel, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_invite) (const char *to, + const char *channel, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_kick) (const char *to, + const char *channel, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*nick_change) (const char *newnick, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_privmsg) (const char *recipient, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_ping) (const char *server, irc_account *ia); + + void (*got_welcome) (const char *nick, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_yourhost) (const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_created) (const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_myinfo) (const char *servername, + const char *version, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_channel_list) (const char *me, + const char *channel, + int users, + const char *topic, irc_message_prefix *prefix, irc_account *ia); + + void (*got_channel_listend) (const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_away) (const char *from, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_unaway) (const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_nowaway) (const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_ison) (const char *userlist, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_whoisidle) (const char *from, + int since, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_whoisuser) (const char *nick, + const char *user, + const char *host, + const char *real_name, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_whoisserver) (const char *nick, + const char *server, + const char *info, irc_message_prefix *prefix, irc_account *ia); + + void (*got_whoisop) (const char *nick, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_whowasuser) (const char *nick, + const char *user, + const char *host, + const char *real_name, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_endofwhois) (const char *nicks, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_endofwhowas) (const char *nicks, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_notopic) (const char *channel, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_topic) (const char *channel, + const char *topic, irc_message_prefix *prefix, irc_account *ia); + + void (*got_topicsetby) (const char *channel, + const char *nickname, + const char *time, irc_message_prefix *prefix, irc_account *ia); + + void (*inviting) (const char *channel, + const char *nick, irc_message_prefix *prefix, irc_account *ia); + + void (*summoning) (const char *user, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_version) (const char *version, + const char *debuglevel, + const char *server, + const char *comments, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_info) (const char *info, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_endinfo) (const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*motd_start) (const char *server, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_motd) (const char *motd, + irc_message_prefix *prefix, irc_account *ia); + + void (*endofmotd) (const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_endofwho) (const char *name, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_endofnames) (const char *channel, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*youreoper) (const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_namelist) (irc_name_list *list, + const char *channel, + irc_message_prefix *prefix, irc_account *ia); + + void (*got_time) (const char *time, + irc_message_prefix *prefix, irc_account *ia); + + void (*irc_send_data) (void *buf, int len, irc_account *ia); + + void (*irc_error) (const char *message, void *data); + + void (*irc_warning) (const char *message, void *data); + + void (*client_quit) (irc_account *ia); + /* ERROR HANDLERS */ - void (*irc_no_such_nick) (const char *nick, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_such_server) (const char *server, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_such_channel) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_cant_sendto_chnl) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_was_no_such_nick) (const char *nick, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_too_many_chnl) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_too_many_targets) (const char *target, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_origin) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_recipient) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_text_to_send) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_toplevel) (const char *mask, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_wild_toplevel) (const char *mask, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_unknown_cmd) (const char *command, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_motd) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_admininfo) (const char *server, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_file_error) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_nick_given) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_erroneous_nick) (const char *nick, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_nick_in_use) (const char *nick, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_nick_collision) (const char *nick, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_user_not_in_chnl) (const char *nick, - const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_not_on_chnl) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_on_chnl) (const char *user, - const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_nologin) (const char *nick, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_summon_disabled) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_user_disabled) (const char *user_disabled, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_not_registered) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_need_more_params) (const char *cmd, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_already_registered) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_perm_for_host) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_password_mismatch) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_banned) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_chnl_key_set) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_channel_full) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_unknown_mode) (const char *mode, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_invite_only) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_banned_from_chnl) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_bad_chnl_key) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_privileges) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_chnlop_privs_needed) (const char *channel, - const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_cant_kill_server) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_no_o_per_host) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_mode_unknown) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); - - void (*irc_user_dont_match) (const char *message, - irc_message_prefix *prefix, - irc_account *ia ); + void (*irc_no_such_nick) (const char *nick, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*irc_no_such_server) (const char *server, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*irc_no_such_channel) (const char *channel, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*irc_cant_sendto_chnl) (const char *channel, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*irc_was_no_such_nick) (const char *nick, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*irc_too_many_chnl) (const char *channel, + const char *message, + irc_message_prefix *prefix, irc_account *ia); + + void (*irc_too_many_targets) (cons... [truncated message content] |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/livejournal In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/livejournal Modified Files: lj.c lj.h lj_httplib.c lj_httplib.h Log Message: reformatted source code Index: lj.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/livejournal/lj.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lj.c 19 Aug 2009 04:07:04 -0000 1.5 +++ lj.c 17 Sep 2009 12:04:59 -0000 1.6 @@ -49,30 +49,28 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info lj_LTX_plugin_info - #define SERVICE_INFO lj_LTX_SERVICE_INFO - #define module_version lj_LTX_module_version +#define plugin_info lj_LTX_plugin_info +#define SERVICE_INFO lj_LTX_SERVICE_INFO +#define module_version lj_LTX_module_version #endif - /* Function Prototypes */ static int plugin_init(); static int plugin_finish(); -struct service_callbacks * query_callbacks(); +struct service_callbacks *query_callbacks(); static int is_setting_state = 0; static int ref_count = 0; -static char lj_url[MAX_PREF_LEN]="http://www.livejournal.com/interface/flat"; -static char lj_host[MAX_PREF_LEN]=""; +static char lj_url[MAX_PREF_LEN] = "http://www.livejournal.com/interface/flat"; +static char lj_host[MAX_PREF_LEN] = ""; static int lj_port; static char lj_path[MAX_PREF_LEN]; static int do_lj_debug = 0; /* Module Exports */ -PLUGIN_INFO plugin_info = -{ +PLUGIN_INFO plugin_info = { PLUGIN_SERVICE, "LiveJournal", "Ayttm client for LiveJournal (http://www.livejournal.com/)", @@ -83,17 +81,22 @@ plugin_finish, NULL }; + struct service SERVICE_INFO = { "LiveJournal", -1, SERVICE_CAN_OFFLINEMSG | /* all messages are offline */ - SERVICE_CAN_FILETRANSFER, /* true so i can prevent file - transfer altogether */ + SERVICE_CAN_FILETRANSFER, /* true so i can prevent file + transfer altogether */ NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static int plugin_init() { @@ -126,9 +129,8 @@ * End Module Code ******************************************************************************/ - #ifdef __STDC__ -int LJ_DEBUGLOG(char *fmt,...) +int LJ_DEBUGLOG(char *fmt, ...) #else int LJ_DEBUGLOG(fmt, va_alist) char *fmt; @@ -149,7 +151,6 @@ return 0; } - #define LOG(x) if(do_lj_debug) { LJ_DEBUGLOG("%s:%d: ", __FILE__, __LINE__); \ LJ_DEBUGLOG x; \ LJ_DEBUGLOG("\n"); } @@ -158,25 +159,27 @@ LJ_DEBUGLOG x; \ LJ_DEBUGLOG("\n"); } - #define LJ_MSG_COLOUR "#20b2aa" -static char *ay_lj_get_color(void) { return LJ_MSG_COLOUR; } +static char *ay_lj_get_color(void) +{ + return LJ_MSG_COLOUR; +} enum lj_status_code { LJ_STATUS_ONLINE, LJ_STATUS_OFFLINE }; - + typedef struct lj_account_data { int status; /* always online */ } lj_account_data; typedef struct lj_local_account { char password[MAX_PREF_LEN]; - int status; /* always online */ + int status; /* always online */ int connect_progress_tag; LList *buddies; char last_update[255]; int poll_timeout_tag; - int poll_interval; /* 0 means don't poll */ + int poll_interval; /* 0 means don't poll */ } lj_local_account; static void lj_account_prefs_init(eb_local_account *ela) @@ -200,12 +203,12 @@ } -static eb_local_account *ay_lj_read_local_account_config(LList * pairs) +static eb_local_account *ay_lj_read_local_account_config(LList *pairs) { eb_local_account *ela; lj_local_account *lla; - if(!pairs) { + if (!pairs) { WARNING(("ay_lj_read_local_account_config: pairs == NULL")); return NULL; } @@ -226,7 +229,7 @@ return ela; } -static LList *ay_lj_write_local_config(eb_local_account * account) +static LList *ay_lj_write_local_config(eb_local_account *account) { return eb_input_to_value_pair(account->prefs); } @@ -241,34 +244,42 @@ return states; } -static int lj_find_and_handle_errors(int success, eb_local_account *ela, LList *pairs) +static int lj_find_and_handle_errors(int success, eb_local_account *ela, + LList *pairs) { - char buff[1024]="", *str; - switch(success) { - case LJ_HTTP_NETWORK: - snprintf(buff, sizeof(buff), _("Could not connect %s to LiveJournal service.\n\nThere was a network error."), ela->handle); - break; - case LJ_HTTP_NOK: - snprintf(buff, sizeof(buff), _("Could not connect %s to LiveJournal service.\n\nThe server returned an unknown HTTP error."), ela->handle); - break; - case LJ_HTTP_OK: - str = value_pair_get_value(pairs, "success"); - if(!str) { - snprintf(buff, sizeof(buff), - _("Incomplete read from LiveJournal service.\n\nData lost.")); - } else if(strcmp(str, "OK") != 0) { - free(str); - str = value_pair_get_value(pairs, "errmsg"); - snprintf(buff, sizeof(buff), - _("%s!\n\n%s"), ela->handle, str); - free(str); - } - - break; + char buff[1024] = "", *str; + switch (success) { + case LJ_HTTP_NETWORK: + snprintf(buff, sizeof(buff), + _ + ("Could not connect %s to LiveJournal service.\n\nThere was a network error."), + ela->handle); + break; + case LJ_HTTP_NOK: + snprintf(buff, sizeof(buff), + _ + ("Could not connect %s to LiveJournal service.\n\nThe server returned an unknown HTTP error."), + ela->handle); + break; + case LJ_HTTP_OK: + str = value_pair_get_value(pairs, "success"); + if (!str) { + snprintf(buff, sizeof(buff), + _ + ("Incomplete read from LiveJournal service.\n\nData lost.")); + } else if (strcmp(str, "OK") != 0) { + free(str); + str = value_pair_get_value(pairs, "errmsg"); + snprintf(buff, sizeof(buff), + _("%s!\n\n%s"), ela->handle, str); + free(str); + } + + break; } - if(buff[0]) { - ay_do_warning( _("LiveJournal Error"), buff); + if (buff[0]) { + ay_do_warning(_("LiveJournal Error"), buff); return 1; } else { return 0; @@ -282,11 +293,11 @@ return lla->status; } -static void ay_lj_set_idle(eb_local_account * account, int idle) +static void ay_lj_set_idle(eb_local_account *account, int idle) { } -static void ay_lj_set_away(eb_local_account * account, char * message) +static void ay_lj_set_away(eb_local_account *account, char *message) { } @@ -307,22 +318,22 @@ static void _ay_lj_user_added(int success, eb_local_account *ela, LList *pairs) { - int nadded=0, i; + int nadded = 0, i; char *str, buff[1024]; eb_account *ea; lj_find_and_handle_errors(success, ela, pairs); str = value_pair_get_value(pairs, "friends_added"); - if(str) { + if (str) { nadded = atoi(str); free(str); } - for(i=1; i<=nadded; i++) { + for (i = 1; i <= nadded; i++) { snprintf(buff, sizeof(buff), "friend_%d_user", i); str = value_pair_get_value(pairs, buff); - if(!str) + if (!str) continue; ea = find_account_with_ela(str, ela); @@ -331,14 +342,14 @@ snprintf(buff, sizeof(buff), "friend_%d_name", i); str = value_pair_get_value(pairs, buff); - if(!ea || !str) + if (!ea || !str) continue; - if(strcmp(ea->account_contact->nick, str)) + if (strcmp(ea->account_contact->nick, str)) rename_contact(ea->account_contact, str); free(str); } - + } static void ay_lj_add_user(eb_account *ea) @@ -347,8 +358,9 @@ lj_local_account *lla = ela->protocol_local_account_data; char buff[1024]; - snprintf(buff, sizeof(buff), "mode=editfriends&user=%s&password=%s&editfriend_add_1_user=%s", - ela->handle, lla->password, ea->handle); + snprintf(buff, sizeof(buff), + "mode=editfriends&user=%s&password=%s&editfriend_add_1_user=%s", + ela->handle, lla->password, ea->handle); send_http_request(buff, _ay_lj_user_added, ela); } @@ -359,13 +371,14 @@ lj_local_account *lla = ela->protocol_local_account_data; char buff[1024]; - snprintf(buff, sizeof(buff), "mode=editfriends&user=%s&password=%s&editfriend_delete_%s", - ela->handle, lla->password, ea->handle); + snprintf(buff, sizeof(buff), + "mode=editfriends&user=%s&password=%s&editfriend_delete_%s", + ela->handle, lla->password, ea->handle); send_http_request(buff, NULL, NULL); } -static eb_account *ay_lj_read_account_config(eb_account *ea, LList * config) +static eb_account *ay_lj_read_account_config(eb_account *ea, LList *config) { lj_account_data *lad = calloc(1, sizeof(lj_account_data)); lad->status = LJ_STATUS_OFFLINE; @@ -374,7 +387,7 @@ return ea; } -static int ay_lj_query_connected(eb_account * account) +static int ay_lj_query_connected(eb_account *account) { lj_account_data *lad = account->protocol_account_data; @@ -386,21 +399,20 @@ "Offline" }; -static char *ay_lj_get_status_string(eb_account * account) +static char *ay_lj_get_status_string(eb_account *account) { lj_account_data *lad = account->protocol_account_data; return status_strings[lad->status]; } - -static char ** ay_lj_get_status_pixmap(eb_account * account) +static char **ay_lj_get_status_pixmap(eb_account *account) { lj_account_data *lad; lad = account->protocol_account_data; - if(lad->status == LJ_STATUS_ONLINE) + if (lad->status == LJ_STATUS_ONLINE) return NULL; else return NULL; @@ -409,10 +421,12 @@ static void ay_lj_send_file(eb_local_account *from, eb_account *to, char *file) { - ay_do_info( _("LiveJournal Warning"), _("You cannot send files through LiveJournal...") ); + ay_do_info(_("LiveJournal Warning"), + _("You cannot send files through LiveJournal...")); } -static void ay_lj_send_im(eb_local_account *account_from, eb_account *account_to, char *message) +static void ay_lj_send_im(eb_local_account *account_from, + eb_account *account_to, char *message) { } @@ -426,36 +440,41 @@ lj_find_and_handle_errors(success, ela, pairs); str = value_pair_get_value(pairs, "lastupdate"); - if(str && str[0]) + if (str && str[0]) strncpy(lla->last_update, str, sizeof(lla->last_update)); - if(str) + if (str) free(str); str = value_pair_get_value(pairs, "new"); - if(str) { - if(!strcmp(str, "1")) { - eb_account *ea = find_account_with_ela(ela->handle, ela); - if(!ea) { + if (str) { + if (!strcmp(str, "1")) { + eb_account *ea = + find_account_with_ela(ela->handle, ela); + if (!ea) { ea = ay_lj_new_account(ela, ela->handle); add_dummy_contact(ela->handle, ea); } eb_timeout_remove(lla->poll_timeout_tag); lla->poll_timeout_tag = 0; - - snprintf(buff, sizeof(buff), _("%s, your LiveJournal friends view has been updated.<br>" - "<a href=\"http://www.livejournal.com/users/%s/friends\">Go there now</a>"), - ela->alias, ela->handle); + + snprintf(buff, sizeof(buff), + _ + ("%s, your LiveJournal friends view has been updated.<br>" + "<a href=\"http://www.livejournal.com/users/%s/friends\">Go there now</a>"), + ela->alias, ela->handle); eb_parse_incoming_message(ela, ea, buff); } free(str); } str = value_pair_get_value(pairs, "interval"); - if(str) { - if(lla->poll_interval != atoi(str)) { + if (str) { + if (lla->poll_interval != atoi(str)) { lla->poll_interval = atoi(str); - if(lla->poll_timeout_tag) { + if (lla->poll_timeout_tag) { eb_timeout_remove(lla->poll_timeout_tag); - lla->poll_timeout_tag = eb_timeout_add(lla->poll_interval * 1000, ay_lj_ping_timeout_callback, ela); + lla->poll_timeout_tag = + eb_timeout_add(lla->poll_interval * + 1000, ay_lj_ping_timeout_callback, ela); } } free(str); @@ -468,8 +487,9 @@ lj_local_account *lla = ela->protocol_local_account_data; char buff[1024]; - snprintf(buff, sizeof(buff), "mode=checkfriends&user=%s&password=%s&lastupdate=%s", - ela->handle, lla->password, lla->last_update); + snprintf(buff, sizeof(buff), + "mode=checkfriends&user=%s&password=%s&lastupdate=%s", + ela->handle, lla->password, lla->last_update); send_http_request(buff, _ay_lj_got_update, ela); return 1; @@ -480,21 +500,21 @@ lj_local_account *lla = ela->protocol_local_account_data; eb_account *ea = NULL; int changed = 0; - int i, nfriends=0; + int i, nfriends = 0; char *str, buff[1024]; - if(lj_find_and_handle_errors(success, ela, pairs)) + if (lj_find_and_handle_errors(success, ela, pairs)) goto end_buddy_list; str = value_pair_get_value(pairs, "friend_count"); - if(!str) + if (!str) goto end_buddy_list; nfriends = atoi(str); free(str); - for(i=1; i<=nfriends; i++) { - char *uname=NULL, *real_name=NULL; + for (i = 1; i <= nfriends; i++) { + char *uname = NULL, *real_name = NULL; struct contact *con; grouplist *g; @@ -503,7 +523,7 @@ ea = find_account_with_ela(str, ela); - if(ea) { + if (ea) { free(uname); continue; } @@ -513,15 +533,16 @@ g = find_grouplist_by_name("LiveJournal"); con = find_contact_in_group_by_nick(real_name, g); - if(!con) + if (!con) con = find_contact_in_group_by_nick(uname, g); - if(!con) + if (!con) con = find_contact_by_nick(real_name); - if(!con) + if (!con) con = find_contact_by_nick(uname); - if(!con) { + if (!con) { changed = 1; - con=add_new_contact("LiveJournal", real_name, SERVICE_INFO.protocol_id); + con = add_new_contact("LiveJournal", real_name, + SERVICE_INFO.protocol_id); } ea = ay_lj_new_account(ela, uname); add_account(con->nick, ea); @@ -531,14 +552,14 @@ free(real_name); } - if(changed) { + if (changed) { update_contact_list(); } -end_buddy_list: - if(lla->connect_progress_tag) { + end_buddy_list: + if (lla->connect_progress_tag) { ay_activity_bar_remove(lla->connect_progress_tag); - lla->connect_progress_tag=0; + lla->connect_progress_tag = 0; } } @@ -547,11 +568,12 @@ lj_local_account *lla = ela->protocol_local_account_data; char buff[1024]; - snprintf(buff, sizeof(buff), _("Fetching buddies for %s..."), ela->handle); + snprintf(buff, sizeof(buff), _("Fetching buddies for %s..."), + ela->handle); ay_activity_bar_update_label(lla->connect_progress_tag, buff); - snprintf(buff, sizeof(buff), "mode=getfriends&user=%s&password=%s", - ela->handle, lla->password); + snprintf(buff, sizeof(buff), "mode=getfriends&user=%s&password=%s", + ela->handle, lla->password); send_http_request(buff, _ay_lj_got_buddies, ela); } @@ -560,20 +582,20 @@ { lj_local_account *lla = ela->protocol_local_account_data; - if(lj_find_and_handle_errors(success, ela, pairs)) { + if (lj_find_and_handle_errors(success, ela, pairs)) { ref_count--; - if(lla->connect_progress_tag) { + if (lla->connect_progress_tag) { ay_activity_bar_remove(lla->connect_progress_tag); - lla->connect_progress_tag=0; + lla->connect_progress_tag = 0; } } else { char *str = value_pair_get_value(pairs, "name"); strncpy(ela->alias, str, sizeof(ela->alias)); free(str); - + str = value_pair_get_value(pairs, "message"); - if(str) { + if (str) { ay_do_info(_("LiveJournal System Message"), str); free(str); } @@ -583,12 +605,15 @@ lla->status = LJ_STATUS_ONLINE; is_setting_state = 1; - if(ela->status_menu) - eb_set_active_menu_status(ela->status_menu, lla->status); + if (ela->status_menu) + eb_set_active_menu_status(ela->status_menu, + lla->status); is_setting_state = 0; lj_get_buddies(ela); - lla->poll_timeout_tag = eb_timeout_add(lla->poll_interval * 1000, ay_lj_ping_timeout_callback, ela); + lla->poll_timeout_tag = + eb_timeout_add(lla->poll_interval * 1000, + ay_lj_ping_timeout_callback, ela); } } @@ -598,15 +623,16 @@ char buff[1024]; char buff2[1024]; - if(ela->connecting || ela->connected) + if (ela->connecting || ela->connected) return; url_to_host_port_path(lj_url, lj_host, &lj_port, lj_path); - snprintf(buff, sizeof(buff), "clientversion=%s-%s/%s&mode=login&user=%s&password=%s", - HOST, PACKAGE, VERSION, - ela->handle, lla->password); - snprintf(buff2, sizeof(buff2), _("Logging in to LiveJournal account: %s"), ela->handle); + snprintf(buff, sizeof(buff), + "clientversion=%s-%s/%s&mode=login&user=%s&password=%s", HOST, + PACKAGE, VERSION, ela->handle, lla->password); + snprintf(buff2, sizeof(buff2), + _("Logging in to LiveJournal account: %s"), ela->handle); ela->connecting = 1; lla->connect_progress_tag = ay_activity_bar_add(buff2, NULL, NULL); @@ -628,7 +654,7 @@ free(uname); l_list_free_1(l); } -*/ ela->connected=0; +*/ ela->connected = 0; ref_count--; } @@ -636,25 +662,36 @@ { lj_local_account *lla = account->protocol_local_account_data; - if(is_setting_state) + if (is_setting_state) return; - if(lla->status == LJ_STATUS_OFFLINE && state == LJ_STATUS_ONLINE) + if (lla->status == LJ_STATUS_OFFLINE && state == LJ_STATUS_ONLINE) ay_lj_login(account); - else if(lla->status == LJ_STATUS_ONLINE && state == LJ_STATUS_OFFLINE) + else if (lla->status == LJ_STATUS_ONLINE && state == LJ_STATUS_OFFLINE) ay_lj_logout(account); lla->status = state; } -static char * ay_lj_check_login(char * user, char * pass) +static char *ay_lj_check_login(char *user, char *pass) { return NULL; } -const char * ext_lj_host() { return (const char *)lj_host; } -int ext_lj_port() { return lj_port; } -const char * ext_lj_path() { return (const char *)lj_path; } +const char *ext_lj_host() +{ + return (const char *)lj_host; +} + +int ext_lj_port() +{ + return lj_port; +} + +const char *ext_lj_path() +{ + return (const char *)lj_path; +} struct service_callbacks *query_callbacks() { @@ -662,35 +699,34 @@ sc = calloc(1, sizeof(struct service_callbacks)); - sc->query_connected = ay_lj_query_connected; - sc->login = ay_lj_login; - sc->logout = ay_lj_logout; - sc->check_login = ay_lj_check_login; - - sc->send_im = ay_lj_send_im; - - sc->read_local_account_config = ay_lj_read_local_account_config; - sc->write_local_config = ay_lj_write_local_config; - sc->read_account_config = ay_lj_read_account_config; - - sc->get_states = ay_lj_get_states; - sc->get_current_state = ay_lj_get_current_state; - sc->set_current_state = ay_lj_set_current_state; - - sc->new_account = ay_lj_new_account; - sc->add_user = ay_lj_add_user; - sc->del_user = ay_lj_del_user; - - sc->get_status_string = ay_lj_get_status_string; - sc->get_status_pixmap = ay_lj_get_status_pixmap; + sc->query_connected = ay_lj_query_connected; + sc->login = ay_lj_login; + sc->logout = ay_lj_logout; + sc->check_login = ay_lj_check_login; + + sc->send_im = ay_lj_send_im; + + sc->read_local_account_config = ay_lj_read_local_account_config; + sc->write_local_config = ay_lj_write_local_config; + sc->read_account_config = ay_lj_read_account_config; - sc->set_idle = ay_lj_set_idle; - sc->set_away = ay_lj_set_away; + sc->get_states = ay_lj_get_states; + sc->get_current_state = ay_lj_get_current_state; + sc->set_current_state = ay_lj_set_current_state; - sc->send_file = ay_lj_send_file; + sc->new_account = ay_lj_new_account; + sc->add_user = ay_lj_add_user; + sc->del_user = ay_lj_del_user; - sc->get_color = ay_lj_get_color; + sc->get_status_string = ay_lj_get_status_string; + sc->get_status_pixmap = ay_lj_get_status_pixmap; + + sc->set_idle = ay_lj_set_idle; + sc->set_away = ay_lj_set_away; + + sc->send_file = ay_lj_send_file; + + sc->get_color = ay_lj_get_color; return sc; } - Index: lj.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/livejournal/lj.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lj.h 1 Aug 2003 09:52:29 -0000 1.1 +++ lj.h 17 Sep 2009 12:04:59 -0000 1.2 @@ -1,3 +1,3 @@ -const char *ext_lj_host( void ); -int ext_lj_port( void ); -const char *ext_lj_path( void ); +const char *ext_lj_host(void); +int ext_lj_port(void); +const char *ext_lj_path(void); Index: lj_httplib.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/livejournal/lj_httplib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lj_httplib.c 19 Aug 2009 04:07:04 -0000 1.2 +++ lj_httplib.c 17 Sep 2009 12:04:59 -0000 1.3 @@ -40,9 +40,9 @@ int url_to_host_port_path(const char *url, char *host, int *port, char *path) { - char *urlcopy=NULL; - char *slash=NULL; - char *colon=NULL; + char *urlcopy = NULL; + char *slash = NULL; + char *colon = NULL; /* * http://hostname @@ -55,24 +55,24 @@ * http://hostname:port/path:foo */ - if(strstr(url, "http://") == url) { - urlcopy = strdup(url+7); + if (strstr(url, "http://") == url) { + urlcopy = strdup(url + 7); } else { - /*WARNING(("Weird url - unknown protocol: %s", url));*/ + /*WARNING(("Weird url - unknown protocol: %s", url)); */ return 0; } slash = strchr(urlcopy, '/'); colon = strchr(urlcopy, ':'); - if(!colon || (slash && slash < colon)) { + if (!colon || (slash && slash < colon)) { *port = 80; } else { *colon = 0; - *port = atoi(colon+1); + *port = atoi(colon + 1); } - if(!slash) { + if (!slash) { strcpy(path, "/"); } else { strcpy(path, slash); @@ -93,71 +93,71 @@ char *urlencode(const char *instr) { - int ipos=0, bpos=0; + int ipos = 0, bpos = 0; char *str = NULL; int len = strlen(instr); - if(!(str = malloc(sizeof(char) * (3*len + 1)) )) + if (!(str = malloc(sizeof(char) * (3 * len + 1)))) return ""; - while(instr[ipos]) { - while(isurlchar(instr[ipos])) + while (instr[ipos]) { + while (isurlchar(instr[ipos])) str[bpos++] = instr[ipos++]; - if(!instr[ipos]) + if (!instr[ipos]) break; snprintf(&str[bpos], 4, "%%%.2x", instr[ipos]); - bpos+=3; + bpos += 3; ipos++; } - str[bpos]='\0'; + str[bpos] = '\0'; /* free extra alloc'ed mem. */ len = strlen(str); - str = realloc(str, sizeof(char) * (len+1)); + str = realloc(str, sizeof(char) * (len + 1)); return (str); } char *urldecode(const char *instr) { - int ipos=0, bpos=0; + int ipos = 0, bpos = 0; char *str = NULL; - char entity[3]={0,0,0}; + char entity[3] = { 0, 0, 0 }; unsigned dec; int len = strlen(instr); - if(!(str = malloc(sizeof(char) * (len+1)) )) + if (!(str = malloc(sizeof(char) * (len + 1)))) return ""; - while(instr[ipos]) { - while(instr[ipos] && instr[ipos]!='%') - if(instr[ipos]=='+') { - str[bpos++]=' '; + while (instr[ipos]) { + while (instr[ipos] && instr[ipos] != '%') + if (instr[ipos] == '+') { + str[bpos++] = ' '; ipos++; } else str[bpos++] = instr[ipos++]; - if(!instr[ipos]) + if (!instr[ipos]) break; ipos++; - entity[0]=instr[ipos++]; - entity[1]=instr[ipos++]; + entity[0] = instr[ipos++]; + entity[1] = instr[ipos++]; sscanf(entity, "%2x", &dec); str[bpos++] = (char)dec; } - str[bpos]='\0'; + str[bpos] = '\0'; /* free extra alloc'ed mem. */ len = strlen(str); - str = realloc(str, sizeof(char) * (len+1)); + str = realloc(str, sizeof(char) * (len + 1)); return (str); } struct callback_data { int tag; - lj_callback callback; + lj_callback callback; eb_local_account *ela; char *request; }; @@ -167,27 +167,28 @@ struct callback_data *ccd = data; char buff[MAX_PREF_LEN]; - int n=0; + int n = 0; - LList *pairs=NULL; - char key[MAX_PREF_NAME_LEN]=""; + LList *pairs = NULL; + char key[MAX_PREF_NAME_LEN] = ""; - int success=LJ_HTTP_NETWORK; + int success = LJ_HTTP_NETWORK; - while(success != LJ_HTTP_OK && (n=ay_tcp_readline(buff, sizeof(buff), fd)) > 0) { + while (success != LJ_HTTP_OK + && (n = ay_tcp_readline(buff, sizeof(buff), fd)) > 0) { /* read up to blank line */ - if(!strcmp(buff, "")) - success=LJ_HTTP_OK; - else if(!strncmp(buff, "HTTP/", strlen("HTTP/"))) - if(!strstr(buff, " 200 ")) - success=LJ_HTTP_NOK; + if (!strcmp(buff, "")) + success = LJ_HTTP_OK; + else if (!strncmp(buff, "HTTP/", strlen("HTTP/"))) + if (!strstr(buff, " 200 ")) + success = LJ_HTTP_NOK; } - if(n==0) + if (n == 0) goto end_of_read; - while((n=ay_tcp_readline(buff, sizeof(buff), fd)) > 0) { - if(!strcmp(key, "")) { + while ((n = ay_tcp_readline(buff, sizeof(buff), fd)) > 0) { + if (!strcmp(key, "")) { strncpy(key, buff, sizeof(key)); } else { pairs = value_pair_add(pairs, key, buff); @@ -195,8 +196,8 @@ } } -end_of_read: - if(ccd->callback) + end_of_read: + if (ccd->callback) ccd->callback(success, ccd->ela, pairs); value_pair_free(pairs); @@ -210,7 +211,7 @@ static void lj_got_connected(int fd, int error, void *data) { struct callback_data *ccd = data; - if(error == 0 && fd > 0) { + if (error == 0 && fd > 0) { write(fd, ccd->request, strlen(ccd->request)); fsync(fd); } @@ -218,23 +219,24 @@ ccd->tag = eb_input_add(fd, EB_INPUT_READ, read_http_response, ccd); } -void send_http_request(const char *request, lj_callback callback, eb_local_account *ela) +void send_http_request(const char *request, lj_callback callback, + eb_local_account *ela) { char buff[1024]; - struct callback_data *ccd=calloc(1, sizeof(struct callback_data)); + struct callback_data *ccd = calloc(1, sizeof(struct callback_data)); snprintf(buff, sizeof(buff), - "POST %s HTTP/1.0\r\n" - "Host: %s\r\n" - "Content-Type: application/x-www-form-urlencoded\r\n" - "Content-Length: %u\r\n" - "\r\n" - "%s", - ext_lj_path(), ext_lj_host(), strlen(request), request); + "POST %s HTTP/1.0\r\n" + "Host: %s\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" + "Content-Length: %u\r\n" + "\r\n" + "%s", ext_lj_path(), ext_lj_host(), strlen(request), request); ccd->callback = callback; ccd->request = strdup(buff); ccd->ela = ela; - ccd->tag = ay_socket_new_async(ext_lj_host(), ext_lj_port(), lj_got_connected, ccd, NULL); + ccd->tag = + ay_socket_new_async(ext_lj_host(), ext_lj_port(), + lj_got_connected, ccd, NULL); } - Index: lj_httplib.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/livejournal/lj_httplib.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lj_httplib.h 1 Aug 2003 09:52:29 -0000 1.1 +++ lj_httplib.h 17 Sep 2009 12:04:59 -0000 1.2 @@ -14,13 +14,15 @@ extern "C" { #endif -typedef void (*lj_callback)(int success, eb_local_account *ela, LList *pairs); + typedef void (*lj_callback) (int success, eb_local_account *ela, + LList *pairs); -void send_http_request(const char *request, lj_callback callback, eb_local_account *ela); -int url_to_host_port_path(const char *url, char *host, int *port, char *path); + void send_http_request(const char *request, lj_callback callback, + eb_local_account *ela); + int url_to_host_port_path(const char *url, char *host, int *port, + char *path); #ifdef __cplusplus } #endif - #endif |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/irc In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/irc Modified Files: irc.c irc.h Log Message: reformatted source code Index: irc.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/irc/irc.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- irc.c 7 Sep 2009 08:21:20 -0000 1.62 +++ irc.c 17 Sep 2009 12:04:58 -0000 1.63 @@ -58,20 +58,18 @@ #include "pixmaps/irc_online.xpm" #include "pixmaps/irc_away.xpm" - /******************************************************************************* * Begin Module Code ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info irc_LTX_plugin_info - #define SERVICE_INFO irc_LTX_SERVICE_INFO [...2048 lines suppressed...] /* Errors */ - cb->irc_no_such_nick = ay_irc_no_such_nick; - cb->irc_no_such_server = ay_irc_no_such_server; - cb->irc_no_such_channel = ay_irc_no_such_channel; - cb->irc_nick_in_use = ay_irc_nick_in_use; - cb->irc_password_mismatch = ay_irc_password_mismatch; + cb->irc_no_such_nick = ay_irc_no_such_nick; + cb->irc_no_such_server = ay_irc_no_such_server; + cb->irc_no_such_channel = ay_irc_no_such_channel; + cb->irc_nick_in_use = ay_irc_nick_in_use; + cb->irc_password_mismatch = ay_irc_password_mismatch; /* cb->irc_cant_sendto_chnl = ay_irc_cant_sendto_chnl; cb->irc_was_no_such_nick = ay_irc_was_no_such_nick; cb->irc_too_many_chnl = ay_irc_too_many_chnl; @@ -2310,4 +2439,3 @@ return cb; } - Index: irc.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/irc/irc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- irc.h 6 Sep 2009 18:23:08 -0000 1.5 +++ irc.h 17 Sep 2009 12:04:59 -0000 1.6 @@ -39,38 +39,35 @@ #define DBG_IRC do_irc_debug -typedef struct irc_local_account_type -{ - char password[MAX_PREF_LEN]; - int fd_tag; - int keepalive_tag; - int connect_tag; - int activity_tag; - char * buff; - int buff_user; - LList * friends; - LList * channel_list; - LList * current_rooms; +typedef struct irc_local_account_type { + char password[MAX_PREF_LEN]; + int fd_tag; + int keepalive_tag; + int connect_tag; + int activity_tag; + char *buff; + int buff_user; + LList *friends; + LList *channel_list; + LList *current_rooms; irc_account *ia; void (*got_public_chatrooms) (LList *list, void *data); void *public_chatroom_callback_data; - AyConnection * connection; + AyConnection *connection; } irc_local_account; -typedef struct irc_account_type -{ - char server[255]; - char realserver[255]; - int status; - int idle; - gboolean dummy; +typedef struct irc_account_type { + char server[255]; + char realserver[255]; + int status; + int idle; + gboolean dummy; } ay_irc_account; -typedef struct _irc_info -{ - char *whois_info; - eb_account *me; - char *fullmessage; +typedef struct _irc_info { + char *whois_info; + eb_account *me; + char *fullmessage; } irc_info; static int is_setting_state = 0; @@ -83,57 +80,61 @@ #define MAX_IRC_ACTION_LEN 255 /* IRC_COMMAND_TYPE: type of command in an irc_command_action struct. */ -enum IRC_COMMAND_TYPE -{ - IRC_COMMAND_BUILTIN = 1, - IRC_COMMAND_USER_DEF = 2 +enum IRC_COMMAND_TYPE { + IRC_COMMAND_BUILTIN = 1, + IRC_COMMAND_USER_DEF = 2 }; -typedef struct irc_command_action_type -{ - char command[MAX_IRC_COMMAND_LEN]; - char action[MAX_IRC_ACTION_LEN]; - enum IRC_COMMAND_TYPE command_type; +typedef struct irc_command_action_type { + char command[MAX_IRC_COMMAND_LEN]; + char action[MAX_IRC_ACTION_LEN]; + enum IRC_COMMAND_TYPE command_type; } irc_command_action; - /* Local prototypes */ -static unsigned char *strip_color (unsigned char *text); -static int ay_irc_query_connected (eb_account * account); -static void ay_irc_login( eb_local_account * account); -static void ay_irc_logout( eb_local_account * ela ); -static void ay_irc_send_im( eb_local_account * account_from, eb_account * account_to,char *message ); -static eb_local_account * ay_irc_read_local_config(LList * pairs); -static LList * ay_irc_write_local_config( eb_local_account * account ); -static eb_account * ay_irc_read_config(eb_account *ea, LList *config ); -static LList * ay_irc_get_states(); -static int ay_irc_get_current_state(eb_local_account * account ); -static void ay_irc_set_current_state(eb_local_account * account, int state ); -static char * ay_irc_check_login(const char * user, const char * pass); -static void ay_irc_add_user( eb_account * account ); -static void ay_irc_del_user( eb_account * account ); -static int ay_irc_is_suitable (eb_local_account *local, eb_account *remote); -static eb_account * ay_irc_new_account(eb_local_account *ela, const char * account ); -static const char * ay_irc_get_status_string( eb_account * account ); -static void *ay_irc_get_status_pixbuf( eb_account * account); -static void ay_irc_set_idle(eb_local_account * account, int idle ); -static void ay_irc_set_away( eb_local_account * account, char * message, int away); -static void ay_irc_send_file( eb_local_account * from, eb_account * to, char * file ); -static void irc_info_update(info_window * iw); -static void irc_info_data_cleanup(info_window * iw); -static void ay_irc_get_info( eb_local_account * account_from, eb_account * account_to); +static unsigned char *strip_color(unsigned char *text); +static int ay_irc_query_connected(eb_account *account); +static void ay_irc_login(eb_local_account *account); +static void ay_irc_logout(eb_local_account *ela); +static void ay_irc_send_im(eb_local_account *account_from, + eb_account *account_to, char *message); +static eb_local_account *ay_irc_read_local_config(LList *pairs); +static LList *ay_irc_write_local_config(eb_local_account *account); +static eb_account *ay_irc_read_config(eb_account *ea, LList *config); +static LList *ay_irc_get_states(); +static int ay_irc_get_current_state(eb_local_account *account); +static void ay_irc_set_current_state(eb_local_account *account, int state); +static char *ay_irc_check_login(const char *user, const char *pass); +static void ay_irc_add_user(eb_account *account); +static void ay_irc_del_user(eb_account *account); +static int ay_irc_is_suitable(eb_local_account *local, eb_account *remote); +static eb_account *ay_irc_new_account(eb_local_account *ela, + const char *account); +static const char *ay_irc_get_status_string(eb_account *account); +static void *ay_irc_get_status_pixbuf(eb_account *account); +static void ay_irc_set_idle(eb_local_account *account, int idle); +static void ay_irc_set_away(eb_local_account *account, char *message, int away); +static void ay_irc_send_file(eb_local_account *from, eb_account *to, + char *file); +static void irc_info_update(info_window *iw); +static void irc_info_data_cleanup(info_window *iw); +static void ay_irc_get_info(eb_local_account *account_from, + eb_account *account_to); static void ay_irc_join_chat_room(eb_chat_room *room); static void ay_irc_leave_chat_room(eb_chat_room *room); static void ay_irc_send_chat_room_message(eb_chat_room *room, char *message); -static void ay_irc_send_invite( eb_local_account * account, eb_chat_room * room, char * user, const char * message); -static eb_chat_room * ay_irc_make_chat_room(char * name, eb_local_account * account, int is_public); -static eb_chat_room *ay_irc_make_chat_room_window(char *name, eb_local_account *account, int is_public, int send_join); -static void ay_irc_accept_invite( eb_local_account * account, void * invitation ); -static void ay_irc_decline_invite( eb_local_account * account, void * invitation ); -static void eb_irc_read_prefs_config(LList * values); -static LList * eb_irc_write_prefs_config(); -static void irc_connect_cb(AyConnection *con, AyConnectionStatus error, void *data); +static void ay_irc_send_invite(eb_local_account *account, eb_chat_room *room, + char *user, const char *message); +static eb_chat_room *ay_irc_make_chat_room(char *name, + eb_local_account *account, int is_public); +static eb_chat_room *ay_irc_make_chat_room_window(char *name, + eb_local_account *account, int is_public, int send_join); +static void ay_irc_accept_invite(eb_local_account *account, void *invitation); +static void ay_irc_decline_invite(eb_local_account *account, void *invitation); +static void eb_irc_read_prefs_config(LList *values); +static LList *eb_irc_write_prefs_config(); +static void irc_connect_cb(AyConnection *con, AyConnectionStatus error, + void *data); void irc_finish_login(eb_local_account *ela); -static irc_callbacks *ay_irc_map_callbacks( void ) ; - +static irc_callbacks *ay_irc_map_callbacks(void); |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/icq-toc/libtoc In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/icq-toc/libtoc Modified Files: libtoc.c libtoc.h Log Message: reformatted source code Index: libtoc.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq-toc/libtoc/libtoc.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libtoc.c 22 May 2009 06:02:23 -0000 1.20 +++ libtoc.c 17 Sep 2009 12:04:58 -0000 1.21 @@ -52,7 +52,6 @@ #define snprintf _snprintf #endif - #define TOC_HOST "toc.oscar.aol.com" #define TOC_PORT 80 #ifndef MSG_NOSIGNAL @@ -74,28 +73,25 @@ static char user_info_id[1024]; [...1993 lines suppressed...] } - int main() { - toc_conn * conn; - char buff[] = "toc_send_im tsearle256 \"if you see this message send a message to tsearle256\""; - proxy_set_proxy( PROXY_NONE, "", 0 ); + toc_conn *conn; + char buff[] = + "toc_send_im tsearle256 \"if you see this message send a message to tsearle256\""; + proxy_set_proxy(PROXY_NONE, "", 0); conn = toc_signon("", ""); icqtoc_im_in = toc_test_im_in; eb_input_add(conn->fd, EB_INPUT_READ, icqtoc_callback_handler, conn); @@ -1677,4 +1596,3 @@ gtk_main(); } #endif - Index: libtoc.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/icq-toc/libtoc/libtoc.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libtoc.h 22 May 2009 06:02:23 -0000 1.11 +++ libtoc.h 17 Sep 2009 12:04:58 -0000 1.12 @@ -24,77 +24,75 @@ #include <stdio.h> #include "llist.h" -typedef struct _toc_conn -{ - int fd; - int seq_num; - void * account; - char server[255]; - short port; - char *username; - char *password; - int input; +typedef struct _toc_conn { + int fd; + int seq_num; + void *account; + char server[255]; + short port; + char *username; + char *password; + int input; } toc_conn; -typedef struct _toc_file_conn -{ +typedef struct _toc_file_conn { char header1[7]; char header2[2048]; - int fd; + int fd; unsigned long amount; - FILE * file; - int handle; - int progress; + FILE *file; + int handle; + int progress; } toc_file_conn; -void (*icqtoc_new_user)(toc_conn *conn, char * group, char * handle); -void (*icqtoc_new_group)(char * group); -int (*icqtoc_begin_file_receive)( const char * filename, unsigned long size ); -void (*icqtoc_update_file_status)( int tag, unsigned long progress ); -void (*icqtoc_complete_file_receive)( int tag ); -void (*icqtoc_im_in)(toc_conn * conn, char * user, char * message ); -void (*icqtoc_chat_im_in)(toc_conn * conn, char * id, char * user, char * message ); -void (*icqupdate_user_status)(toc_conn *conn, char * user, int online, time_t idle, int evil, int unavailable ); -void (*icqtoc_error_message)(char * message); -void (*icqtoc_disconnect)(toc_conn * conn); -void (*icqtoc_chat_invite)(toc_conn * conn, char * id, char * name, - char * sender, char * message ); -void (*icqtoc_join_ack)(toc_conn * conn, char * id, char * name); -void (*icqtoc_join_error)(toc_conn * conn, char * name); -void (*icqtoc_chat_update_buddy)(toc_conn * conn, char * id, - char * user, int online ); -void (*icqtoc_file_offer)( toc_conn * conn, char * nick, char * ip, short port, - char * cookie, char * filename ); - -void (*icqtoc_user_info)(toc_conn * conn, char * user, char * message ); -void (*icqtoc_logged_in)(toc_conn *conn); -int (*icqtoc_async_socket)(const char *host, int port, void *cb, void *data); - -void icqtoc_callback( toc_conn * conn ); -int icqtoc_signon( const char * username, const char * password, - const char * server, short port, const char * info ); -void icqtoc_send_keep_alive( toc_conn * conn ); -void icqtoc_signoff( toc_conn * conn ); -void icqtoc_send_im( toc_conn * conn, const char * username, const char * message ); -void icqtoc_get_info( toc_conn * conn, const char * user ); -void icqtoc_add_buddies( toc_conn * conn, const char * group, LList * list ); -void icqtoc_add_buddy( toc_conn * conn, char * user, const char * group ); -void icqtoc_set_idle( toc_conn * conn, int idle ); -void icqtoc_set_away( toc_conn * conn, const char * message); -void icqtoc_invite( toc_conn * conn, const char * id, const char * buddy, const char * message ); -void icqtoc_chat_join( toc_conn * conn, const char * chat_room_name ); -void icqtoc_chat_send( toc_conn * conn, const char * id, const char * message); -void icqtoc_chat_leave( toc_conn * conn, const char * id ); -void icqtoc_chat_accept( toc_conn * conn, const char * id); -void icqtoc_file_accept( toc_conn * conn, const char * nick, const char * ip, short port, - const char * cookie, const char * filename ); -void icqtoc_file_cancel( toc_conn * conn, const char * nick, const char * cookie ); -void icqtoc_talk_accept( toc_conn * conn, const char * nick, const char * ip, short port, - const char * cookie ); -void icqtoc_remove_buddy( toc_conn * conn, const char * user, const char * group ); +void (*icqtoc_new_user) (toc_conn *conn, char *group, char *handle); +void (*icqtoc_new_group) (char *group); +int (*icqtoc_begin_file_receive) (const char *filename, unsigned long size); +void (*icqtoc_update_file_status) (int tag, unsigned long progress); +void (*icqtoc_complete_file_receive) (int tag); +void (*icqtoc_im_in) (toc_conn *conn, char *user, char *message); +void (*icqtoc_chat_im_in) (toc_conn *conn, char *id, char *user, char *message); +void (*icqupdate_user_status) (toc_conn *conn, char *user, int online, + time_t idle, int evil, int unavailable); +void (*icqtoc_error_message) (char *message); +void (*icqtoc_disconnect) (toc_conn *conn); +void (*icqtoc_chat_invite) (toc_conn *conn, char *id, char *name, + char *sender, char *message); +void (*icqtoc_join_ack) (toc_conn *conn, char *id, char *name); +void (*icqtoc_join_error) (toc_conn *conn, char *name); +void (*icqtoc_chat_update_buddy) (toc_conn *conn, char *id, + char *user, int online); +void (*icqtoc_file_offer) (toc_conn *conn, char *nick, char *ip, short port, + char *cookie, char *filename); + +void (*icqtoc_user_info) (toc_conn *conn, char *user, char *message); +void (*icqtoc_logged_in) (toc_conn *conn); +int (*icqtoc_async_socket) (const char *host, int port, void *cb, void *data); + +void icqtoc_callback(toc_conn *conn); +int icqtoc_signon(const char *username, const char *password, + const char *server, short port, const char *info); +void icqtoc_send_keep_alive(toc_conn *conn); +void icqtoc_signoff(toc_conn *conn); +void icqtoc_send_im(toc_conn *conn, const char *username, const char *message); +void icqtoc_get_info(toc_conn *conn, const char *user); +void icqtoc_add_buddies(toc_conn *conn, const char *group, LList *list); +void icqtoc_add_buddy(toc_conn *conn, char *user, const char *group); +void icqtoc_set_idle(toc_conn *conn, int idle); +void icqtoc_set_away(toc_conn *conn, const char *message); +void icqtoc_invite(toc_conn *conn, const char *id, const char *buddy, + const char *message); +void icqtoc_chat_join(toc_conn *conn, const char *chat_room_name); +void icqtoc_chat_send(toc_conn *conn, const char *id, const char *message); +void icqtoc_chat_leave(toc_conn *conn, const char *id); +void icqtoc_chat_accept(toc_conn *conn, const char *id); +void icqtoc_file_accept(toc_conn *conn, const char *nick, const char *ip, + short port, const char *cookie, const char *filename); +void icqtoc_file_cancel(toc_conn *conn, const char *nick, const char *cookie); +void icqtoc_talk_accept(toc_conn *conn, const char *nick, const char *ip, + short port, const char *cookie); +void icqtoc_remove_buddy(toc_conn *conn, const char *user, const char *group); void icqtoc_add_group(toc_conn *conn, const char *group); void icqtoc_remove_group(toc_conn *conn, const char *group); - - #endif |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/jabber/libjabber In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/jabber/libjabber Modified Files: jconn.c jid.c jpacket.c jutil.c log.c pproxy.c rate.c Log Message: reformatted source code Index: jconn.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libjabber/jconn.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jconn.c 15 Aug 2009 19:57:27 -0000 1.14 +++ jconn.c 17 Sep 2009 12:04:59 -0000 1.15 @@ -31,10 +31,11 @@ int ext_jabber_write(jconn j, const char *buf, int len); /* prototypes of the local functions */ -static void startElement(void *userdata, const char *name, const char **attribs); +static void startElement(void *userdata, const char *name, + const char **attribs); static void endElement(void *userdata, const char *name); static void charData(void *userdata, const char *s, int slen); -void jab_continue (void *data, int error, jconn j); +void jab_continue(void *data, int error, jconn j); /* * jab_new -- initialize a new jabber connection @@ -50,24 +51,27 @@ */ jconn jab_new(char *user, char *pass, char *serv) { - pool p; - jconn j; + pool p; + jconn j; - if(!user) return(NULL); + if (!user) + return (NULL); - p = pool_new(); - if(!p) return(NULL); - j = pmalloc_x(p, sizeof(jconn_struct), 0); - if(!j) return(NULL); - j->p = p; - - j->user = jid_new(p, user); - j->pass = pstrdup(p, pass); - j->serv = pstrdup(p, serv); - - j->state = JCONN_STATE_OFF; + p = pool_new(); + if (!p) + return (NULL); + j = pmalloc_x(p, sizeof(jconn_struct), 0); + if (!j) + return (NULL); + j->p = p; + + j->user = jid_new(p, user); + j->pass = pstrdup(p, pass); + j->serv = pstrdup(p, serv); - return j; + j->state = JCONN_STATE_OFF; + + return j; } /* @@ -79,10 +83,11 @@ */ void jab_delete(jconn j) { - if(!j) return; + if (!j) + return; - jab_stop(j); - pool_free(j->p); + jab_stop(j); + pool_free(j->p); } /* @@ -94,9 +99,10 @@ */ void jab_state_handler(jconn j, jconn_state_h h) { - if(!j) return; + if (!j) + return; - j->on_state = h; + j->on_state = h; } /* @@ -108,12 +114,12 @@ */ void jab_packet_handler(jconn j, jconn_packet_h h) { - if(!j) return; + if (!j) + return; - j->on_packet = h; + j->on_packet = h; } - /* * jab_start -- start connection * @@ -123,53 +129,52 @@ */ int jab_start(jconn j) { - int tag = 0; - if(!j || j->state != JCONN_STATE_OFF) return 0; + int tag = 0; + if (!j || j->state != JCONN_STATE_OFF) + return 0; - j->parser = XML_ParserCreate(NULL); - XML_SetUserData(j->parser, (void *)j); - XML_SetElementHandler(j->parser, startElement, endElement); - XML_SetCharacterDataHandler(j->parser, charData); + j->parser = XML_ParserCreate(NULL); + XML_SetUserData(j->parser, (void *)j); + XML_SetElementHandler(j->parser, startElement, endElement); + XML_SetCharacterDataHandler(j->parser, charData); - if (!j->serv || !strlen(j->serv)) - j->serv = j->user->server; + if (!j->serv || !strlen(j->serv)) + j->serv = j->user->server; - if ((tag = ext_jabber_connect(j, jab_continue)) < 0) { - STATE_EVT(JCONN_STATE_OFF); - return 0; - } - return tag; + if ((tag = ext_jabber_connect(j, jab_continue)) < 0) { + STATE_EVT(JCONN_STATE_OFF); + return 0; + } + return tag; } - -void jab_continue (void *data, int error, jconn j) +void jab_continue(void *data, int error, jconn j) { - xmlnode x; - char *t,*t2; - + xmlnode x; + char *t, *t2; - if(error) { - ext_jabber_connect_error(data, error, j); - return; - } + if (error) { + ext_jabber_connect_error(data, error, j); + return; + } - j->state = JCONN_STATE_CONNECTED; - STATE_EVT(JCONN_STATE_CONNECTED) + j->state = JCONN_STATE_CONNECTED; + STATE_EVT(JCONN_STATE_CONNECTED) - /* start stream */ - x = jutil_header(NS_CLIENT, j->user->server); - t = xmlnode2str(x); - /* this is ugly, we can create the string here instead of jutil_header */ - /* what do you think about it? -madcat */ - t2 = strstr(t,"/>"); - *t2++ = '>'; - *t2 = '\0'; - jab_send_raw(j,"<?xml version='1.0'?>"); - jab_send_raw(j,t); - xmlnode_free(x); + /* start stream */ + x = jutil_header(NS_CLIENT, j->user->server); + t = xmlnode2str(x); + /* this is ugly, we can create the string here instead of jutil_header */ + /* what do you think about it? -madcat */ + t2 = strstr(t, "/>"); + *t2++ = '>'; + *t2 = '\0'; + jab_send_raw(j, "<?xml version='1.0'?>"); + jab_send_raw(j, t); + xmlnode_free(x); - j->state = JCONN_STATE_ON; - STATE_EVT(JCONN_STATE_ON) + j->state = JCONN_STATE_ON; + STATE_EVT(JCONN_STATE_ON) } /* @@ -180,12 +185,13 @@ */ void jab_stop(jconn j) { - if(!j || j->state == JCONN_STATE_OFF) return; + if (!j || j->state == JCONN_STATE_OFF) + return; - j->state = JCONN_STATE_OFF; - ext_jabber_disconnect(j); + j->state = JCONN_STATE_OFF; + ext_jabber_disconnect(j); - XML_ParserFree(j->parser); + XML_ParserFree(j->parser); } /* UNUSED @@ -213,10 +219,10 @@ */ jid jab_getjid(jconn j) { - if(j) - return(j->user); - else - return NULL; + if (j) + return (j->user); + else + return NULL; } /* jab_getsid -- get stream id @@ -228,10 +234,10 @@ */ char *jab_getsid(jconn j) { - if(j) - return(j->sid); - else - return NULL; + if (j) + return (j->sid); + else + return NULL; } /* @@ -244,16 +250,15 @@ void jab_send(jconn j, xmlnode x) { - if (j && j->state != JCONN_STATE_OFF) - { - char *buf = xmlnode2str(x); + if (j && j->state != JCONN_STATE_OFF) { + char *buf = xmlnode2str(x); - ext_jabber_write(j, buf, strlen(buf)); + ext_jabber_write(j, buf, strlen(buf)); #ifdef JDEBUG - fprintf(stderr, "jab<%s %s\n", j->user->user, buf); + fprintf(stderr, "jab<%s %s\n", j->user->user, buf); #endif - } + } } /* @@ -265,11 +270,11 @@ */ void jab_send_raw(jconn j, const char *str) { - if (j && j->state != JCONN_STATE_OFF) { - ext_jabber_write(j, str, strlen(str)); - } + if (j && j->state != JCONN_STATE_OFF) { + ext_jabber_write(j, str, strlen(str)); + } #ifdef JDEBUG - fprintf(stderr, "rjab<%s %s\n", j->user->user, str); + fprintf(stderr, "rjab<%s %s\n", j->user->user, str); #endif } @@ -281,35 +286,33 @@ */ int jab_recv(jconn j) { - static char buf[4096]; - int len = 0; + static char buf[4096]; + int len = 0; - if(!j || j->state == JCONN_STATE_OFF) - return -1; + if (!j || j->state == JCONN_STATE_OFF) + return -1; /* do { ret = ext_jabber_read(j, buf, sizeof(buf)-1); } while( ret > 0 && (len+=ret) ); */ - len = ext_jabber_read(j, buf, sizeof(buf) - 1 ); + len = ext_jabber_read(j, buf, sizeof(buf) - 1); - if(len>0) - { - buf[len] = '\0'; + if (len > 0) { + buf[len] = '\0'; #ifdef JDEBUG - fprintf(stderr, "jab>%s %s\n", j->user->user, buf); + fprintf(stderr, "jab>%s %s\n", j->user->user, buf); #endif - XML_Parse(j->parser, buf, len, 0); - } - else if( len<0 && errno != EAGAIN ) - { - STATE_EVT(JCONN_STATE_OFF); - jab_stop(j); - } + XML_Parse(j->parser, buf, len, 0); + } else if (len < 0 && errno != EAGAIN) { + STATE_EVT(JCONN_STATE_OFF); + jab_stop(j); + } - return len; + return len; } + //#undef JDEBUG /* * jab_poll -- check socket for incoming data @@ -320,7 +323,7 @@ */ void jab_poll(jconn j) { - jab_recv(j); + jab_recv(j); } /* @@ -331,41 +334,40 @@ */ void jab_auth(jconn j) { - xmlnode x,y,z; - char *hash, *user; + xmlnode x, y, z; + char *hash, *user; - if (!j) + if (!j) return; - x = jutil_iqnew(JPACKET__SET, NS_AUTH); - xmlnode_put_attrib(x, "id", "id_auth"); - y = xmlnode_get_tag(x,"query"); - - user = j->user->user; - - if (user) { - z = xmlnode_insert_tag(y, "username"); - xmlnode_insert_cdata(z, user, -1); - } - - z = xmlnode_insert_tag(y, "resource"); - xmlnode_insert_cdata(z, j->user->resource, -1); - - if (j->sid) { - z = xmlnode_insert_tag(y, "digest"); - hash = pmalloc(x->p, strlen(j->sid)+strlen(j->pass)+1); - strcpy(hash, j->sid); - strcat(hash, j->pass); - hash = shahash(hash); - xmlnode_insert_cdata(z, hash, 40); - } - else { + x = jutil_iqnew(JPACKET__SET, NS_AUTH); + xmlnode_put_attrib(x, "id", "id_auth"); + y = xmlnode_get_tag(x, "query"); + + user = j->user->user; + + if (user) { + z = xmlnode_insert_tag(y, "username"); + xmlnode_insert_cdata(z, user, -1); + } + + z = xmlnode_insert_tag(y, "resource"); + xmlnode_insert_cdata(z, j->user->resource, -1); + + if (j->sid) { + z = xmlnode_insert_tag(y, "digest"); + hash = pmalloc(x->p, strlen(j->sid) + strlen(j->pass) + 1); + strcpy(hash, j->sid); + strcat(hash, j->pass); + hash = shahash(hash); + xmlnode_insert_cdata(z, hash, 40); + } else { z = xmlnode_insert_tag(y, "password"); xmlnode_insert_cdata(z, j->pass, -1); - } + } - jab_send(j, x); - xmlnode_free(x); + jab_send(j, x); + xmlnode_free(x); } /* @@ -376,100 +378,95 @@ */ void jab_reg(jconn j) { - xmlnode x,y,z; - char *user; + xmlnode x, y, z; + char *user; - if (!j) + if (!j) return; - x = jutil_iqnew(JPACKET__SET, NS_REGISTER); - xmlnode_put_attrib(x, "id", "id_reg"); - y = xmlnode_get_tag(x, "query"); + x = jutil_iqnew(JPACKET__SET, NS_REGISTER); + xmlnode_put_attrib(x, "id", "id_reg"); + y = xmlnode_get_tag(x, "query"); - user = j->user->user; + user = j->user->user; - if (user){ - z = xmlnode_insert_tag(y, "username"); - xmlnode_insert_cdata(z, user, -1); - } + if (user) { + z = xmlnode_insert_tag(y, "username"); + xmlnode_insert_cdata(z, user, -1); + } - z = xmlnode_insert_tag(y, "resource"); - xmlnode_insert_cdata(z, j->user->resource, -1); + z = xmlnode_insert_tag(y, "resource"); + xmlnode_insert_cdata(z, j->user->resource, -1); - if (j->pass){ + if (j->pass) { z = xmlnode_insert_tag(y, "password"); xmlnode_insert_cdata(z, j->pass, -1); - } + } - jab_send(j, x); - xmlnode_free(x); - j->state = JCONN_STATE_ON; - STATE_EVT(JCONN_STATE_ON) + jab_send(j, x); + xmlnode_free(x); + j->state = JCONN_STATE_ON; + STATE_EVT(JCONN_STATE_ON) } - /* local functions */ static void startElement(void *userdata, const char *name, const char **attribs) { - xmlnode x; - jconn j = (jconn)userdata; + xmlnode x; + jconn j = (jconn) userdata; - if(j->current) - { - /* Append the node to the current one */ - x = xmlnode_insert_tag(j->current, name); - xmlnode_put_expat_attribs(x, attribs); - - j->current = x; - } - else - { - x = xmlnode_new_tag(name); - xmlnode_put_expat_attribs(x, attribs); - if(strcmp(name, "stream:stream") == 0) { - /* special case: name == stream:stream */ - /* id attrib of stream is stored for digest auth */ - j->sid = xmlnode_get_attrib(x, "id"); - /* STATE_EVT(JCONN_STATE_AUTH) */ - xmlnode_free(x); - } else { - j->current = x; - } - } + if (j->current) { + /* Append the node to the current one */ + x = xmlnode_insert_tag(j->current, name); + xmlnode_put_expat_attribs(x, attribs); + + j->current = x; + } else { + x = xmlnode_new_tag(name); + xmlnode_put_expat_attribs(x, attribs); + if (strcmp(name, "stream:stream") == 0) { + /* special case: name == stream:stream */ + /* id attrib of stream is stored for digest auth */ + j->sid = xmlnode_get_attrib(x, "id"); + /* STATE_EVT(JCONN_STATE_AUTH) */ + xmlnode_free(x); + } else { + j->current = x; + } + } } static void endElement(void *userdata, const char *name) { - jconn j = (jconn)userdata; - xmlnode x; - jpacket p; - - if(j->current == NULL) { - /* we got </stream:stream> */ - STATE_EVT(JCONN_STATE_OFF) - return; - } - - x = xmlnode_get_parent(j->current); - - if(x == NULL) - { - /* it is time to fire the event */ - p = jpacket_new(j->current); - - if(j->on_packet) - (j->on_packet)(j, p); - xmlnode_free(j->current); - } + jconn j = (jconn) userdata; + xmlnode x; + jpacket p; + + if (j->current == NULL) { + /* we got </stream:stream> */ + STATE_EVT(JCONN_STATE_OFF) + return; + } + + x = xmlnode_get_parent(j->current); + + if (x == NULL) { + /* it is time to fire the event */ + p = jpacket_new(j->current); + + if (j->on_packet) + (j->on_packet) (j, p); + xmlnode_free(j->current); + } - j->current = x; + j->current = x; } static void charData(void *userdata, const char *s, int slen) { - jconn j = (jconn)userdata; + jconn j = (jconn) userdata; - if (j->current) - xmlnode_insert_cdata(j->current, s, slen); + if (j->current) + xmlnode_insert_cdata(j->current, s, slen); } Index: jid.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libjabber/jid.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jid.c 3 Aug 2007 20:38:39 -0000 1.2 +++ jid.c 17 Sep 2009 12:04:59 -0000 1.3 @@ -43,279 +43,296 @@ jid jid_safe(jid id) { - unsigned char *str; + unsigned char *str; - if(strlen(id->server) == 0 || strlen(id->server) > 255) - return NULL; + if (strlen(id->server) == 0 || strlen(id->server) > 255) + return NULL; - /* lowercase the hostname, make sure it's valid characters */ - for(str = (unsigned char *)id->server; *str != '\0'; str++) - { - *str = tolower(*str); - if(!(isalnum(*str) || *str == '.' || *str == '-' || *str == '_')) return NULL; - } - - /* cut off the user */ - if(id->user != NULL && strlen(id->user) > 64) - id->user[64] = '\0'; - - /* check for low and invalid ascii characters in the username */ - if(id->user != NULL) - for(str = (unsigned char *)id->user; *str != '\0'; str++) - if(*str <= 32 || *str == ':' || *str == '@' || *str == '<' || *str == '>' || *str == '\'' || *str == '"' || *str == '&') return NULL; + /* lowercase the hostname, make sure it's valid characters */ + for (str = (unsigned char *)id->server; *str != '\0'; str++) { + *str = tolower(*str); + if (!(isalnum(*str) || *str == '.' || *str == '-' + || *str == '_')) + return NULL; + } + + /* cut off the user */ + if (id->user != NULL && strlen(id->user) > 64) + id->user[64] = '\0'; + + /* check for low and invalid ascii characters in the username */ + if (id->user != NULL) + for (str = (unsigned char *)id->user; *str != '\0'; str++) + if (*str <= 32 || *str == ':' || *str == '@' + || *str == '<' || *str == '>' || *str == '\'' + || *str == '"' || *str == '&') + return NULL; - return id; + return id; } jid jid_new(pool p, char *idstr) { - char *server, *resource, *type, *str; - jid id; + char *server, *resource, *type, *str; + jid id; - if(p == NULL || idstr == NULL || strlen(idstr) == 0) - return NULL; + if (p == NULL || idstr == NULL || strlen(idstr) == 0) + return NULL; - /* user@server/resource */ + /* user@server/resource */ - str = pstrdup(p, idstr); - - id = pmalloco(p,sizeof(struct jid_struct)); - id->p = p; - - resource = strstr(str,"/"); - if(resource != NULL) - { - *resource = '\0'; - ++resource; - if(strlen(resource) > 0) - id->resource = resource; - }else{ - resource = str + strlen(str); /* point to end */ - } - - type = strstr(str,":"); - if(type != NULL && type < resource) - { - *type = '\0'; - ++type; - str = type; /* ignore the type: prefix */ - } - - server = strstr(str,"@"); - if(server == NULL || server > resource) - { /* if there's no @, it's just the server address */ - id->server = str; - }else{ - *server = '\0'; - ++server; - id->server = server; - if(strlen(str) > 0) - id->user = str; - } + str = pstrdup(p, idstr); + + id = pmalloco(p, sizeof(struct jid_struct)); + id->p = p; + + resource = strstr(str, "/"); + if (resource != NULL) { + *resource = '\0'; + ++resource; + if (strlen(resource) > 0) + id->resource = resource; + } else { + resource = str + strlen(str); /* point to end */ + } + + type = strstr(str, ":"); + if (type != NULL && type < resource) { + *type = '\0'; + ++type; + str = type; /* ignore the type: prefix */ + } + + server = strstr(str, "@"); + if (server == NULL || server > resource) { /* if there's no @, it's just the server address */ + id->server = str; + } else { + *server = '\0'; + ++server; + id->server = server; + if (strlen(str) > 0) + id->user = str; + } - return jid_safe(id); + return jid_safe(id); } void jid_set(jid id, char *str, int item) { - char *old; + char *old; - if(id == NULL) - return; + if (id == NULL) + return; - /* invalidate the cached copy */ - id->full = NULL; + /* invalidate the cached copy */ + id->full = NULL; - switch(item) - { - case JID_RESOURCE: - if(str != NULL && strlen(str) != 0) - id->resource = pstrdup(id->p, str); - else - id->resource = NULL; - break; - case JID_USER: - old = id->user; - if(str != NULL && strlen(str) != 0) - id->user = pstrdup(id->p, str); - else - id->user = NULL; - if(jid_safe(id) == NULL) - id->user = old; /* revert if invalid */ - break; - case JID_SERVER: - old = id->server; - id->server = pstrdup(id->p, str); - if(jid_safe(id) == NULL) - id->server = old; /* revert if invalid */ - break; - } + switch (item) { + case JID_RESOURCE: + if (str != NULL && strlen(str) != 0) + id->resource = pstrdup(id->p, str); + else + id->resource = NULL; + break; + case JID_USER: + old = id->user; + if (str != NULL && strlen(str) != 0) + id->user = pstrdup(id->p, str); + else + id->user = NULL; + if (jid_safe(id) == NULL) + id->user = old; /* revert if invalid */ + break; + case JID_SERVER: + old = id->server; + id->server = pstrdup(id->p, str); + if (jid_safe(id) == NULL) + id->server = old; /* revert if invalid */ + break; + } } char *jid_full(jid id) { - spool s; + spool s; - if(id == NULL) - return NULL; + if (id == NULL) + return NULL; - /* use cached copy */ - if(id->full != NULL) - return id->full; + /* use cached copy */ + if (id->full != NULL) + return id->full; - s = spool_new(id->p); + s = spool_new(id->p); - if(id->user != NULL) - spooler(s, id->user,"@",s); + if (id->user != NULL) + spooler(s, id->user, "@", s); - spool_add(s, id->server); + spool_add(s, id->server); - if(id->resource != NULL) - spooler(s, "/",id->resource,s); + if (id->resource != NULL) + spooler(s, "/", id->resource, s); - id->full = spool_print(s); - return id->full; + id->full = spool_print(s); + return id->full; } /* parses a /resource?name=value&foo=bar into an xmlnode representing <resource name="value" foo="bar"/> */ xmlnode jid_xres(jid id) { - char *cur, *qmark, *amp, *eq; - xmlnode x; + char *cur, *qmark, *amp, *eq; + xmlnode x; - if(id == NULL || id->resource == NULL) return NULL; + if (id == NULL || id->resource == NULL) + return NULL; - cur = pstrdup(id->p, id->resource); - qmark = strstr(cur, "?"); - if(qmark == NULL) return NULL; - *qmark = '\0'; - qmark++; - - x = _xmlnode_new(id->p, cur, NTYPE_TAG); - - cur = qmark; - while(cur != '\0') - { - eq = strstr(cur, "="); - if(eq == NULL) break; - *eq = '\0'; - eq++; - - amp = strstr(eq, "&"); - if(amp != NULL) - { - *amp = '\0'; - amp++; - } - - xmlnode_put_attrib(x,cur,eq); - - if(amp != NULL) - cur = amp; - else - break; - } + cur = pstrdup(id->p, id->resource); + qmark = strstr(cur, "?"); + if (qmark == NULL) + return NULL; + *qmark = '\0'; + qmark++; + + x = _xmlnode_new(id->p, cur, NTYPE_TAG); + + cur = qmark; + while (cur != '\0') { + eq = strstr(cur, "="); + if (eq == NULL) + break; + *eq = '\0'; + eq++; + + amp = strstr(eq, "&"); + if (amp != NULL) { + *amp = '\0'; + amp++; + } + + xmlnode_put_attrib(x, cur, eq); + + if (amp != NULL) + cur = amp; + else + break; + } - return x; + return x; } /* local utils */ int _jid_nullstrcmp(char *a, char *b) { - if(a == NULL && b == NULL) return 0; - if(a == NULL || b == NULL) return -1; - return strcmp(a,b); + if (a == NULL && b == NULL) + return 0; + if (a == NULL || b == NULL) + return -1; + return strcmp(a, b); } + int _jid_nullstrcasecmp(char *a, char *b) { - if(a == NULL && b == NULL) return 0; - if(a == NULL || b == NULL) return -1; - return strcasecmp(a,b); + if (a == NULL && b == NULL) + return 0; + if (a == NULL || b == NULL) + return -1; + return strcasecmp(a, b); } int jid_cmp(jid a, jid b) { - if(a == NULL || b == NULL) - return -1; + if (a == NULL || b == NULL) + return -1; - if(_jid_nullstrcmp(a->resource, b->resource) != 0) return -1; - if(_jid_nullstrcasecmp(a->user, b->user) != 0) return -1; - if(_jid_nullstrcmp(a->server, b->server) != 0) return -1; + if (_jid_nullstrcmp(a->resource, b->resource) != 0) + return -1; + if (_jid_nullstrcasecmp(a->user, b->user) != 0) + return -1; + if (_jid_nullstrcmp(a->server, b->server) != 0) + return -1; - return 0; + return 0; } /* suggested by Anders Qvist <qu...@va...> */ int jid_cmpx(jid a, jid b, int parts) { - if(a == NULL || b == NULL) - return -1; + if (a == NULL || b == NULL) + return -1; - if(parts & JID_RESOURCE && _jid_nullstrcmp(a->resource, b->resource) != 0) return -1; - if(parts & JID_USER && _jid_nullstrcasecmp(a->user, b->user) != 0) return -1; - if(parts & JID_SERVER && _jid_nullstrcmp(a->server, b->server) != 0) return -1; + if (parts & JID_RESOURCE + && _jid_nullstrcmp(a->resource, b->resource) != 0) + return -1; + if (parts & JID_USER && _jid_nullstrcasecmp(a->user, b->user) != 0) + return -1; + if (parts & JID_SERVER && _jid_nullstrcmp(a->server, b->server) != 0) + return -1; - return 0; + return 0; } /* makes a copy of b in a's pool, requires a valid a first! */ jid jid_append(jid a, jid b) { - jid next; + jid next; - if(a == NULL) - return NULL; + if (a == NULL) + return NULL; - if(b == NULL) - return a; + if (b == NULL) + return a; - next = a; - while(next != NULL) - { - /* check for dups */ - if(jid_cmp(next,b) == 0) - break; - if(next->next == NULL) - next->next = jid_new(a->p,jid_full(b)); - next = next->next; - } - return a; + next = a; + while (next != NULL) { + /* check for dups */ + if (jid_cmp(next, b) == 0) + break; + if (next->next == NULL) + next->next = jid_new(a->p, jid_full(b)); + next = next->next; + } + return a; } xmlnode jid_nodescan(jid id, xmlnode x) { - xmlnode cur; - pool p; - jid tmp; - - if(id == NULL || xmlnode_get_firstchild(x) == NULL) return NULL; - - p = pool_new(); - for(cur = xmlnode_get_firstchild(x); cur != NULL; cur = xmlnode_get_nextsibling(cur)) - { - if(xmlnode_get_type(cur) != NTYPE_TAG) continue; - - tmp = jid_new(p,xmlnode_get_attrib(cur,"jid")); - if(tmp == NULL) continue; - - if(jid_cmp(tmp,id) == 0) break; - } - pool_free(p); + xmlnode cur; + pool p; + jid tmp; + + if (id == NULL || xmlnode_get_firstchild(x) == NULL) + return NULL; + + p = pool_new(); + for (cur = xmlnode_get_firstchild(x); cur != NULL; + cur = xmlnode_get_nextsibling(cur)) { + if (xmlnode_get_type(cur) != NTYPE_TAG) + continue; + + tmp = jid_new(p, xmlnode_get_attrib(cur, "jid")); + if (tmp == NULL) + continue; + + if (jid_cmp(tmp, id) == 0) + break; + } + pool_free(p); - return cur; + return cur; } jid jid_user(jid a) { - jid ret; + jid ret; - if(a == NULL || a->resource == NULL) return a; + if (a == NULL || a->resource == NULL) + return a; - ret = pmalloco(a->p,sizeof(struct jid_struct)); - ret->p = a->p; - ret->user = a->user; - ret->server = a->server; + ret = pmalloco(a->p, sizeof(struct jid_struct)); + ret->p = a->p; + ret->user = a->user; + ret->server = a->server; - return ret; + return ret; } Index: jpacket.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libjabber/jpacket.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- jpacket.c 1 Apr 2003 07:24:34 -0000 1.1.1.1 +++ jpacket.c 17 Sep 2009 12:04:59 -0000 1.2 @@ -43,116 +43,110 @@ jpacket jpacket_new(xmlnode x) { - jpacket p; + jpacket p; - if(x == NULL) - return NULL; + if (x == NULL) + return NULL; - p = pmalloc(xmlnode_pool(x),sizeof(_jpacket)); - p->x = x; + p = pmalloc(xmlnode_pool(x), sizeof(_jpacket)); + p->x = x; - return jpacket_reset(p); + return jpacket_reset(p); } jpacket jpacket_reset(jpacket p) { - char *val; - xmlnode x; + char *val; + xmlnode x; - x = p->x; - memset(p,0,sizeof(_jpacket)); - p->x = x; - p->p = xmlnode_pool(x); - - if(strncmp(xmlnode_get_name(x),"message",7) == 0) - { - p->type = JPACKET_MESSAGE; - }else if(strncmp(xmlnode_get_name(x),"presence",8) == 0) - { - p->type = JPACKET_PRESENCE; - val = xmlnode_get_attrib(x, "type"); - if(val == NULL) - p->subtype = JPACKET__AVAILABLE; - else if(strcmp(val,"unavailable") == 0) - p->subtype = JPACKET__UNAVAILABLE; - else if(strcmp(val,"probe") == 0) - p->subtype = JPACKET__PROBE; - else if(strcmp(val,"error") == 0) - p->subtype = JPACKET__ERROR; - else if(strcmp(val,"invisible") == 0) - p->subtype = JPACKET__INVISIBLE; - else if(*val == 's' || *val == 'u') - p->type = JPACKET_S10N; - else if(strcmp(val,"available") == 0) - { /* someone is using type='available' which is frowned upon */ - xmlnode_hide_attrib(x,"type"); - p->subtype = JPACKET__AVAILABLE; - }else - p->type = JPACKET_UNKNOWN; - }else if(strncmp(xmlnode_get_name(x),"iq",2) == 0) - { - p->type = JPACKET_IQ; - p->iq = xmlnode_get_tag(x,"?xmlns"); - p->iqns = xmlnode_get_attrib(p->iq,"xmlns"); - } - - /* set up the jids if any, flag packet as unknown if they are unparseable */ - val = xmlnode_get_attrib(x,"to"); - if(val != NULL) - if((p->to = jid_new(p->p, val)) == NULL) - p->type = JPACKET_UNKNOWN; - val = xmlnode_get_attrib(x,"from"); - if(val != NULL) - if((p->from = jid_new(p->p, val)) == NULL) - p->type = JPACKET_UNKNOWN; + x = p->x; + memset(p, 0, sizeof(_jpacket)); + p->x = x; + p->p = xmlnode_pool(x); + + if (strncmp(xmlnode_get_name(x), "message", 7) == 0) { + p->type = JPACKET_MESSAGE; + } else if (strncmp(xmlnode_get_name(x), "presence", 8) == 0) { + p->type = JPACKET_PRESENCE; + val = xmlnode_get_attrib(x, "type"); + if (val == NULL) + p->subtype = JPACKET__AVAILABLE; + else if (strcmp(val, "unavailable") == 0) + p->subtype = JPACKET__UNAVAILABLE; + else if (strcmp(val, "probe") == 0) + p->subtype = JPACKET__PROBE; + else if (strcmp(val, "error") == 0) + p->subtype = JPACKET__ERROR; + else if (strcmp(val, "invisible") == 0) + p->subtype = JPACKET__INVISIBLE; + else if (*val == 's' || *val == 'u') + p->type = JPACKET_S10N; + else if (strcmp(val, "available") == 0) { /* someone is using type='available' which is frowned upon */ + xmlnode_hide_attrib(x, "type"); + p->subtype = JPACKET__AVAILABLE; + } else + p->type = JPACKET_UNKNOWN; + } else if (strncmp(xmlnode_get_name(x), "iq", 2) == 0) { + p->type = JPACKET_IQ; + p->iq = xmlnode_get_tag(x, "?xmlns"); + p->iqns = xmlnode_get_attrib(p->iq, "xmlns"); + } + + /* set up the jids if any, flag packet as unknown if they are unparseable */ + val = xmlnode_get_attrib(x, "to"); + if (val != NULL) + if ((p->to = jid_new(p->p, val)) == NULL) + p->type = JPACKET_UNKNOWN; + val = xmlnode_get_attrib(x, "from"); + if (val != NULL) + if ((p->from = jid_new(p->p, val)) == NULL) + p->type = JPACKET_UNKNOWN; - return p; + return p; } - int jpacket_subtype(jpacket p) { - char *type; - int ret = p->subtype; + char *type; + int ret = p->subtype; - if(ret != JPACKET__UNKNOWN) - return ret; + if (ret != JPACKET__UNKNOWN) + return ret; - ret = JPACKET__NONE; /* default, when no type attrib is specified */ - type = xmlnode_get_attrib(p->x, "type"); - if(j_strcmp(type,"error") == 0) - ret = JPACKET__ERROR; - else - switch(p->type) - { - case JPACKET_MESSAGE: - if(j_strcmp(type,"chat") == 0) - ret = JPACKET__CHAT; - else if(j_strcmp(type,"groupchat") == 0) - ret = JPACKET__GROUPCHAT; - else if(j_strcmp(type,"headline") == 0) - ret = JPACKET__HEADLINE; - break; - case JPACKET_S10N: - if(j_strcmp(type,"subscribe") == 0) - ret = JPACKET__SUBSCRIBE; - else if(j_strcmp(type,"subscribed") == 0) - ret = JPACKET__SUBSCRIBED; - else if(j_strcmp(type,"unsubscribe") == 0) - ret = JPACKET__UNSUBSCRIBE; - else if(j_strcmp(type,"unsubscribed") == 0) - ret = JPACKET__UNSUBSCRIBED; - break; - case JPACKET_IQ: - if(j_strcmp(type,"get") == 0) - ret = JPACKET__GET; - else if(j_strcmp(type,"set") == 0) - ret = JPACKET__SET; - else if(j_strcmp(type,"result") == 0) - ret = JPACKET__RESULT; - break; - } + ret = JPACKET__NONE; /* default, when no type attrib is specified */ + type = xmlnode_get_attrib(p->x, "type"); + if (j_strcmp(type, "error") == 0) + ret = JPACKET__ERROR; + else + switch (p->type) { + case JPACKET_MESSAGE: + if (j_strcmp(type, "chat") == 0) + ret = JPACKET__CHAT; + else if (j_strcmp(type, "groupchat") == 0) + ret = JPACKET__GROUPCHAT; + else if (j_strcmp(type, "headline") == 0) + ret = JPACKET__HEADLINE; + break; + case JPACKET_S10N: + if (j_strcmp(type, "subscribe") == 0) + ret = JPACKET__SUBSCRIBE; + else if (j_strcmp(type, "subscribed") == 0) + ret = JPACKET__SUBSCRIBED; + else if (j_strcmp(type, "unsubscribe") == 0) + ret = JPACKET__UNSUBSCRIBE; + else if (j_strcmp(type, "unsubscribed") == 0) + ret = JPACKET__UNSUBSCRIBED; + break; + case JPACKET_IQ: + if (j_strcmp(type, "get") == 0) + ret = JPACKET__GET; + else if (j_strcmp(type, "set") == 0) + ret = JPACKET__SET; + else if (j_strcmp(type, "result") == 0) + ret = JPACKET__RESULT; + break; + } - p->subtype = ret; - return ret; + p->subtype = ret; + return ret; } Index: jutil.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libjabber/jutil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- jutil.c 1 Apr 2003 07:24:35 -0000 1.1.1.1 +++ jutil.c 17 Sep 2009 12:04:59 -0000 1.2 @@ -44,248 +44,249 @@ /* util for making presence packets */ xmlnode jutil_presnew(int type, char *to, char *status) { - xmlnode pres; + xmlnode pres; - pres = xmlnode_new_tag("presence"); - switch(type) - { - case JPACKET__SUBSCRIBE: - xmlnode_put_attrib(pres,"type","subscribe"); - break; - case JPACKET__UNSUBSCRIBE: - xmlnode_put_attrib(pres,"type","unsubscribe"); - break; - case JPACKET__SUBSCRIBED: - xmlnode_put_attrib(pres,"type","subscribed"); - break; - case JPACKET__UNSUBSCRIBED: - xmlnode_put_attrib(pres,"type","unsubscribed"); - break; - case JPACKET__PROBE: - xmlnode_put_attrib(pres,"type","probe"); - break; - case JPACKET__UNAVAILABLE: - xmlnode_put_attrib(pres,"type","unavailable"); - break; - case JPACKET__INVISIBLE: - xmlnode_put_attrib(pres,"type","invisible"); - break; - } - if(to != NULL) - xmlnode_put_attrib(pres,"to",to); - if(status != NULL) - xmlnode_insert_cdata(xmlnode_insert_tag(pres,"status"),status,strlen(status)); + pres = xmlnode_new_tag("presence"); + switch (type) { + case JPACKET__SUBSCRIBE: + xmlnode_put_attrib(pres, "type", "subscribe"); + break; + case JPACKET__UNSUBSCRIBE: + xmlnode_put_attrib(pres, "type", "unsubscribe"); + break; + case JPACKET__SUBSCRIBED: + xmlnode_put_attrib(pres, "type", "subscribed"); + break; + case JPACKET__UNSUBSCRIBED: + xmlnode_put_attrib(pres, "type", "unsubscribed"); + break; + case JPACKET__PROBE: + xmlnode_put_attrib(pres, "type", "probe"); + break; + case JPACKET__UNAVAILABLE: + xmlnode_put_attrib(pres, "type", "unavailable"); + break; + case JPACKET__INVISIBLE: + xmlnode_put_attrib(pres, "type", "invisible"); + break; + } + if (to != NULL) + xmlnode_put_attrib(pres, "to", to); + if (status != NULL) + xmlnode_insert_cdata(xmlnode_insert_tag(pres, "status"), status, + strlen(status)); - return pres; + return pres; } /* util for making IQ packets */ xmlnode jutil_iqnew(int type, char *ns) { - xmlnode iq; + xmlnode iq; - iq = xmlnode_new_tag("iq"); - switch(type) - { - case JPACKET__GET: - xmlnode_put_attrib(iq,"type","get"); - break; - case JPACKET__SET: - xmlnode_put_attrib(iq,"type","set"); - break; - case JPACKET__RESULT: - xmlnode_put_attrib(iq,"type","result"); - break; - case JPACKET__ERROR: - xmlnode_put_attrib(iq,"type","error"); - break; - } - xmlnode_put_attrib(xmlnode_insert_tag(iq,"query"),"xmlns",ns); + iq = xmlnode_new_tag("iq"); + switch (type) { + case JPACKET__GET: + xmlnode_put_attrib(iq, "type", "get"); + break; + case JPACKET__SET: + xmlnode_put_attrib(iq, "type", "set"); + break; + case JPACKET__RESULT: + xmlnode_put_attrib(iq, "type", "result"); + break; + case JPACKET__ERROR: + xmlnode_put_attrib(iq, "type", "error"); + break; + } + xmlnode_put_attrib(xmlnode_insert_tag(iq, "query"), "xmlns", ns); - return iq; + return iq; } /* util for making message packets */ xmlnode jutil_msgnew(char *type, char *to, char *subj, char *body) { - xmlnode msg; + xmlnode msg; - msg = xmlnode_new_tag("message"); - xmlnode_put_attrib (msg, "type", type); - xmlnode_put_attrib (msg, "to", to); + msg = xmlnode_new_tag("message"); + xmlnode_put_attrib(msg, "type", type); + xmlnode_put_attrib(msg, "to", to); - if (subj) - { - xmlnode_insert_cdata (xmlnode_insert_tag (msg, "subject"), subj, strlen (subj)); - } + if (subj) { + xmlnode_insert_cdata(xmlnode_insert_tag(msg, "subject"), subj, + strlen(subj)); + } - xmlnode_insert_cdata (xmlnode_insert_tag (msg, "body"), body, strlen (body)); + xmlnode_insert_cdata(xmlnode_insert_tag(msg, "body"), body, + strlen(body)); - return msg; + return msg; } /* util for making stream packets */ -xmlnode jutil_header(char* xmlns, char* server) +xmlnode jutil_header(char *xmlns, char *server) { - xmlnode result; - if ((xmlns == NULL)||(server == NULL)) - return NULL; - result = xmlnode_new_tag("stream:stream"); - xmlnode_put_attrib(result, "xmlns:stream", "http://etherx.jabber.org/streams"); - xmlnode_put_attrib(result, "xmlns", xmlns); - xmlnode_put_attrib(result, "to", server); + xmlnode result; + if ((xmlns == NULL) || (server == NULL)) + return NULL; + result = xmlnode_new_tag("stream:stream"); + xmlnode_put_attrib(result, "xmlns:stream", + "http://etherx.jabber.org/streams"); + xmlnode_put_attrib(result, "xmlns", xmlns); + xmlnode_put_attrib(result, "to", server); - return result; + return result; } /* returns the priority on a presence packet */ int jutil_priority(xmlnode x) { - char *str; - int p; + char *str; + int p; - if(x == NULL) - return -1; + if (x == NULL) + return -1; - if(xmlnode_get_attrib(x,"type") != NULL) - return -1; + if (xmlnode_get_attrib(x, "type") != NULL) + return -1; - x = xmlnode_get_tag(x,"priority"); - if(x == NULL) - return 0; - - str = xmlnode_get_data((x)); - if(str == NULL) - return 0; - - p = atoi(str); - if(p >= 0) - return p; - else - return 0; + x = xmlnode_get_tag(x, "priority"); + if (x == NULL) + return 0; + + str = xmlnode_get_data((x)); + if (str == NULL) + return 0; + + p = atoi(str); + if (p >= 0) + return p; + else + return 0; } void jutil_tofrom(xmlnode x) { - char *to, *from; + char *to, *from; - to = xmlnode_get_attrib(x,"to"); - from = xmlnode_get_attrib(x,"from"); - xmlnode_put_attrib(x,"from",to); - xmlnode_put_attrib(x,"to",from); + to = xmlnode_get_attrib(x, "to"); + from = xmlnode_get_attrib(x, "from"); + xmlnode_put_attrib(x, "from", to); + xmlnode_put_attrib(x, "to", from); } xmlnode jutil_iqresult(xmlnode x) { - xmlnode cur; + xmlnode cur; - jutil_tofrom(x); + jutil_tofrom(x); - xmlnode_put_attrib(x,"type","result"); + xmlnode_put_attrib(x, "type", "result"); - /* hide all children of the iq, they go back empty */ - for(cur = xmlnode_get_firstchild(x); cur != NULL; cur = xmlnode_get_nextsibling(cur)) - xmlnode_hide(cur); + /* hide all children of the iq, they go back empty */ + for (cur = xmlnode_get_firstchild(x); cur != NULL; + cur = xmlnode_get_nextsibling(cur)) + xmlnode_hide(cur); - return x; + return x; } char *jutil_timestamp(void) { - time_t t; - struct tm *new_time; - static char timestamp[18]; - int ret; + time_t t; + struct tm *new_time; + static char timestamp[18]; + int ret; + + t = time(NULL); + + if (t == (time_t) - 1) + return NULL; + new_time = gmtime(&t); + + ret = snprintf(timestamp, 18, "%d%02d%02dT%02d:%02d:%02d", + 1900 + new_time->tm_year, new_time->tm_mon + 1, + new_time->tm_mday, new_time->tm_hour, new_time->tm_min, + new_time->tm_sec); - t = time(NULL); + if (ret == -1) + return NULL; - if(t == (time_t)-1) - return NULL; - new_time = gmtime(&t); - - ret = snprintf(timestamp, 18, "%d%02d%02dT%02d:%02d:%02d", 1900+new_time->tm_year, - new_time->tm_mon+1, new_time->tm_mday, new_time->tm_hour, - new_time->tm_min, new_time->tm_sec); - - if(ret == -1) - return NULL; - - return timestamp; + return timestamp; } void jutil_error(xmlnode x, terror E) { - xmlnode err; - char code[4]; + xmlnode err; + char code[4]; - xmlnode_put_attrib(x,"type","error"); - err = xmlnode_insert_tag(x,"error"); + xmlnode_put_attrib(x, "type", "error"); + err = xmlnode_insert_tag(x, "error"); - snprintf(code,4,"%d",E.code); - xmlnode_put_attrib(err,"code",code); - if(E.msg != NULL) - xmlnode_insert_cdata(err,E.msg,strlen(E.msg)); + snprintf(code, 4, "%d", E.code); + xmlnode_put_attrib(err, "code", code); + if (E.msg != NULL) + xmlnode_insert_cdata(err, E.msg, strlen(E.msg)); - jutil_tofrom(x); + jutil_tofrom(x); } void jutil_delay(xmlnode msg, char *reason) { - xmlnode delay; + xmlnode delay; - delay = xmlnode_insert_tag(msg,"x"); - xmlnode_put_attrib(delay,"xmlns",NS_DELAY); - xmlnode_put_attrib(delay,"from",xmlnode_get_attrib(msg,"to")); - xmlnode_put_attrib(delay,"stamp",jutil_timestamp()); - if(reason != NULL) - xmlnode_insert_cdata(delay,reason,strlen(reason)); + delay = xmlnode_insert_tag(msg, "x"); + xmlnode_put_attrib(delay, "xmlns", NS_DELAY); + xmlnode_put_attrib(delay, "from", xmlnode_get_attrib(msg, "to")); + xmlnode_put_attrib(delay, "stamp", jutil_timestamp()); + if (reason != NULL) + xmlnode_insert_cdata(delay, reason, strlen(reason)); } #define KEYBUF 100 char *jutil_regkey(char *key, char *seed) { - static char keydb[KEYBUF][41]; - static char seeddb[KEYBUF][41]; - static int last = -1; - char *str, strint[32]; - int i; - - /* blanket the keydb first time */ - if(last == -1) - { - last = 0; - memset(&keydb,0,KEYBUF*41); - memset(&seeddb,0,KEYBUF*41); - srand(time(NULL)); - } - - /* creation phase */ - if(key == NULL && seed != NULL) - { - /* create a random key hash and store it */ - sprintf(strint,"%d",rand()); - strcpy(keydb[last],shahash(strint)); - - /* store a hash for the seed associated w/ this key */ - strcpy(seeddb[last],shahash(seed)); - - /* return it all */ - str = keydb[last]; - last++; - if(last == KEYBUF) last = 0; - return str; - } - - /* validation phase */ - str = shahash(seed); - for(i=0;i<KEYBUF;i++) - if(j_strcmp(keydb[i],key) == 0 && j_strcmp(seeddb[i],str) == 0) - { - seeddb[i][0] = '\0'; /* invalidate this key */ - return keydb[i]; - } + static char keydb[KEYBUF][41]; + static char seeddb[KEYBUF][41]; + static int last = -1; + char *str, strint[32]; + int i; + + /* blanket the keydb first time */ + if (last == -1) { + last = 0; + memset(&keydb, 0, KEYBUF * 41); + memset(&seeddb, 0, KEYBUF * 41); + srand(time(NULL)); + } + + /* creation phase */ + if (key == NULL && seed != NULL) { + /* create a random key hash and store it */ + sprintf(strint, "%d", rand()); + strcpy(keydb[last], shahash(strint)); + + /* store a hash for the seed associated w/ this key */ + strcpy(seeddb[last], shahash(seed)); + + /* return it all */ + str = keydb[last]; + last++; + if (last == KEYBUF) + last = 0; + return str; + } + + /* validation phase */ + str = shahash(seed); + for (i = 0; i < KEYBUF; i++) + if (j_strcmp(keydb[i], key) == 0 + && j_strcmp(seeddb[i], str) == 0) { + seeddb[i][0] = '\0'; /* invalidate this key */ + return keydb[i]; + } - return NULL; + return NULL; } - Index: log.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libjabber/log.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- log.c 1 Apr 2003 07:24:35 -0000 1.1.1.1 +++ log.c 17 Sep 2009 12:04:59 -0000 1.2 @@ -24,21 +24,20 @@ void jdebug(char *zone, const char *msgfmt, ...) { - va_list ap; - static char loghdr[LOGSIZE_HDR]; - static char logmsg[LOGSIZE_TAIL]; - static int size; + va_list ap; + static char loghdr[LOGSIZE_HDR]; + static char logmsg[LOGSIZE_TAIL]; + static int size; - /* XXX: We may want to check the sizes eventually */ - size = snprintf(loghdr, LOGSIZE_HDR, "debug/%s %s\n", zone, msgfmt); + /* XXX: We may want to check the sizes eventually */ + size = snprintf(loghdr, LOGSIZE_HDR, "debug/%s %s\n", zone, msgfmt); - va_start(ap, msgfmt); - size = vsnprintf(logmsg, LOGSIZE_TAIL, loghdr, ap); + va_start(ap, msgfmt); + size = vsnprintf(logmsg, LOGSIZE_TAIL, loghdr, ap); - fprintf(stderr,"%s",logmsg); + fprintf(stderr, "%s", logmsg); - return; + return; } - -#endif /* DEBUG */ +#endif /* DEBUG */ Index: pproxy.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libjabber/pproxy.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- pproxy.c 1 Apr 2003 07:24:35 -0000 1.1.1.1 +++ pproxy.c 17 Sep 2009 12:04:59 -0000 1.2 @@ -45,167 +45,167 @@ ppdb _ppdb_new(pool p, jid id) { - ppdb ret; - ret = pmalloc(p,sizeof(_ppdb)); - ret->p = p; - ret->pri = -1; - ret->next = NULL; - ret->user = NULL; - ret->x = NULL; - ret->id = jid_new(p,jid_full(id)); + ppdb ret; + ret = pmalloc(p, sizeof(_ppdb)); + ret->p = p; + ret->pri = -1; + ret->next = NULL; + ret->user = NULL; + ret->x = NULL; + ret->id = jid_new(p, jid_full(id)); - return ret; + return ret; } ppdb _ppdb_get(ppdb db, jid id) { - ppdb cur; + ppdb cur; - if(db == NULL || id == NULL) return NULL; + if (db == NULL || id == NULL) + return NULL; - for(cur = db->next; cur != NULL; cur = cur->next) - if(jid_cmp(cur->id,id) == 0) return cur; + for (cur = db->next; cur != NULL; cur = cur->next) + if (jid_cmp(cur->id, id) == 0) + return cur; - return NULL; + return NULL; } ppdb ppdb_insert(ppdb db, jid id, xmlnode x) { - ppdb cur, curu; - pool p; + ppdb cur, curu; + pool p; - if(id == NULL || id->server == NULL || x == NULL) - return db; + if (id == NULL || id->server == NULL || x == NULL) + return db; - /* new ppdb list dummy holder */ - if(db == NULL) - { - p = pool_heap(1024); - db = _ppdb_new(p,NULL); - } - - cur = _ppdb_get(db,id); - - /* just update it */ - if(cur != NULL) - { - xmlnode_free(cur->x); - cur->x = xmlnode_dup(x); - cur->pri = jutil_priority(x); - return db; - } - - /* make an entry for it */ - cur = _ppdb_new(db->p,id); - cur->x = xmlnode_dup(x); - cur->pri = jutil_priority(x); - cur->next = db->next; - db->next = cur; - - /* if this is a user's resource presence, get the the user entry */ - if(id->user != NULL && (curu = _ppdb_get(db,jid_user(id))) != cur) - { - /* no user entry, make one */ - if(curu == NULL) - { - curu = _ppdb_new(db->p,jid_user(id)); - curu->next = db->next; - db->next = curu; - } - - /* insert this resource into the user list */ - cur->user = curu->user; - curu->user = cur; - } + /* new ppdb list dummy holder */ + if (db == NULL) { + p = pool_heap(1024); + db = _ppdb_new(p, NULL); + } + + cur = _ppdb_get(db, id); + + /* just update it */ + if (cur != NULL) { + xmlnode_free(cur->x); + cur->x = xmlnode_dup(x); + cur->pri = jutil_priority(x); + return db; + } + + /* make an entry for it */ + cur = _ppdb_new(db->p, id); + cur->x = xmlnode_dup(x); + cur->pri = jutil_priority(x); + cur->next = db->next; + db->next = cur; + + /* if this is a user's resource presence, get the the user entry */ + if (id->user != NULL && (curu = _ppdb_get(db, jid_user(id))) != cur) { + /* no user entry, make one */ + if (curu == NULL) { + curu = _ppdb_new(db->p, jid_user(id)); + curu->next = db->next; + db->next = curu; + } + + /* insert this resource into the user list */ + cur->user = curu->user; + curu->user = cur; + } - return db; + return db; } xmlnode ppdb_primary(ppdb db, jid id) { - ppdb cur, top; + ppdb cur, top; - if(db == NULL || id == NULL) return NULL; + if (db == NULL || id == NULL) + return NULL; - cur = _ppdb_get(db,id); + cur = _ppdb_get(db, id); - if(cur == NULL) return NULL; + if (cur == NULL) + return NULL; - /* not user@host check, just return */ - if(id->user == NULL || id->resource != NULL) return cur->x; + /* not user@host check, just return */ + if (id->user == NULL || id->resource != NULL) + return cur->x; - top = cur; - for(cur = cur->user; cur != NULL; cur = cur->user) - if(cur->pri >= top->pri) top = cur; + top = cur; + for (cur = cur->user; cur != NULL; cur = cur->user) + if (cur->pri >= top->pri) + top = cur; - if(top != NULL && top->pri >= 0) return top->x; + if (top != NULL && top->pri >= 0) + return top->x; - return NULL; + return NULL; } /* return the presence for the id, successive calls return all of the known resources for a user@host address */ xmlnode ppdb_get(ppdb db, jid id) { - static ppdb last = NULL; - ppdb cur; + static ppdb last = NULL; + ppdb cur; - if(db == NULL || id == NULL) return NULL; + if (db == NULL || id == NULL) + return NULL; - /* MODE: if this is NOT just user@host addy, return just the single entry */ - if(id->user == NULL || id->resource != NULL) - { - /* we were just here, return now */ - if(last != NULL) - { - last = NULL; - return NULL; - } - - last = _ppdb_get(db,id); - if(last != NULL) - return last->x; - else - return NULL; - } - - /* handle looping for user@host */ - - /* we're already in the loop */ - if(last != NULL) - { - /* this is the last entry in the list */ - if(last->user == NULL) - { - last = NULL; - return NULL; - } - - last = last->user; - return last->x; - } - - /* start a new loop */ - cur = _ppdb_get(db,id); - - if(cur == NULL) return NULL; - - last = cur->user; - if(last != NULL) - return last->x; - else - return NULL; + /* MODE: if this is NOT just user@host addy, return just the single entry */ + if (id->user == NULL || id->resource != NULL) { + /* we were just here, return now */ + if (last != NULL) { + last = NULL; + return NULL; + } + + last = _ppdb_get(db, id); + if (last != NULL) + return last->x; + else + return NULL; + } + + /* handle looping for user@host */ + + /* we're already in the loop */ + if (last != NULL) { + /* this is the last entry in the list */ + if (last->user == NULL) { + last = NULL; + return NULL; + } + + last = last->user; + return last->x; + } + + /* start a new loop */ + cur = _ppdb_get(db, id); + + if (cur == NULL) + return NULL; + + last = cur->user; + if (last != NULL) + return last->x; + else + return NULL; } - void ppdb_free(ppdb db) { - ppdb cur; + ppdb cur; - if(db == NULL) return; + if (db == NULL) + return; - for(cur = db; cur != NULL; cur = cur->next) - xmlnode_free(cur->x); + for (cur = db; cur != NULL; cur = cur->next) + xmlnode_free(cur->x); - pool_free(db->p); + pool_free(db->p); } - Index: rate.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libjabber/rate.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- rate.c 1 Apr 2003 07:24:35 -0000 1.1.1.1 +++ rate.c 17 Sep 2009 12:04:59 -0000 1.2 @@ -43,56 +43,55 @@ jlimit jlimit_new(int maxt, int maxp) { - pool p; - jlimit r; + pool p; + jlimit r; - p = pool_new(); - r = pmalloc(p,sizeof(_jlimit)); - r->key = NULL; - r->start = r->points = 0; - r->maxt = maxt; - r->maxp = maxp; - r->p = p; + p = pool_new(); + r = pmalloc(p, sizeof(_jlimit)); + r->key = NULL; + r->start = r->points = 0; + r->maxt = maxt; + r->maxp = maxp; + r->p = p; - return r; + return r; } void jlimit_free(jlimit r) { - if(r != NULL) - { - if(r->key != NULL) free(r->key); - pool_free(r->p); - } + if (r != NULL) { + if (r->key != NULL) + free(r->key); + pool_free(r->p); + } } int jlimit_check(jlimit r, char *key, int points) { - int now = time(NULL); + int now = time(NULL); - if(r == NULL) return 0; + if (r == NULL) + return 0; - /* make sure we didn't go over the time frame or get a null/new key */ - if((now - r->start) > r->maxt || key == NULL || j_strcmp(key,r->key) != 0) - { /* start a new key */ - free(r->key); - if(key != NULL) - /* We use strdup instead of pstrdup since r->key needs to be free'd before - and more often than the rest of the rlimit structure */ - r->key = strdup(key); - else - r->key = NULL; - r->start = now; - r->points = 0; - } - - r->points += points; - - /* if we're within the time frame and over the point limit */ - if(r->points > r->maxp && (now - r->start) < r->maxt) - { - return 1; /* we don't reset the rate here, so that it remains rated until the time runs out */ - } + /* make sure we didn't go over the time frame or get a null/new key */ + if ((now - r->start) > r->maxt || key == NULL || j_strcmp(key, r->key) != 0) { /* start a new key */ + free(r->key); + if (key != NULL) + /* We use strdup instead of pstrdup since r->key needs to be free'd before + and more often than the rest of the rlimit structure */ + r->key = strdup(key); + else + r->key = NULL; + r->start = now; + r->points = 0; + } + + r->points += points; + + /* if we're within the time frame and over the point limit */ + if (r->points > r->maxp && (now - r->start) < r->maxt) { + return 1; /* we don't reset the rate here, so that it remains rated until the time runs out */ + } - return 0; + return 0; } |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/workwizu In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/workwizu Modified Files: workwizu.c workwizu.h Log Message: reformatted source code Index: workwizu.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/workwizu/workwizu.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- workwizu.c 27 Jul 2009 16:42:04 -0000 1.17 +++ workwizu.c 17 Sep 2009 12:04:59 -0000 1.18 @@ -79,15 +79,17 @@ ************************************************************************************/ #ifndef USE_POSIX_DLOPEN - #define plugin_info workwizu_LTX_plugin_info - #define SERVICE_INFO workwizu_LTX_SERVICE_INFO - #define plugin_init workwizu_LTX_plugin_init - #define plugin_finish workwizu_LTX_plugin_finish - #define module_version workwizu_LTX_module_version +#define plugin_info workwizu_LTX_plugin_info +#define SERVICE_INFO workwizu_LTX_SERVICE_INFO +#define plugin_init workwizu_LTX_plugin_init [...1443 lines suppressed...] + sc->set_current_state = eb_workwizu_set_current_state; + sc->check_login = eb_workwizu_check_login; + sc->add_user = eb_workwizu_add_user; + sc->del_user = eb_workwizu_del_user; + sc->new_account = eb_workwizu_new_account; + sc->get_status_string = eb_workwizu_get_status_string; + sc->get_status_pixmap = eb_workwizu_get_status_pixmap; + sc->send_chat_room_message = eb_workwizu_send_chat_room_message; + sc->join_chat_room = eb_workwizu_join_chat_room; + sc->leave_chat_room = eb_workwizu_leave_chat_room; + sc->make_chat_room = eb_workwizu_make_chat_room; + sc->send_invite = eb_workwizu_send_invite; + sc->get_color = eb_workwizu_get_color; + sc->get_smileys = eb_default_smileys; + sc->set_away = eb_workwizu_set_away; + sc->set_idle = eb_workwizu_set_idle; - return sc; + return sc; } Index: workwizu.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/workwizu/workwizu.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- workwizu.h 8 Apr 2003 08:40:08 -0000 1.3 +++ workwizu.h 17 Sep 2009 12:04:59 -0000 1.4 @@ -21,24 +21,23 @@ #ifndef __EB_WORKWIZU_H__ #define __EB_WORKWIZU_H__ - + #include "service.h" -struct service_callbacks * workwizu_query_callbacks(); +struct service_callbacks *workwizu_query_callbacks(); typedef struct { int fd; int tag_r; - int tag_w; -}tag_info; + int tag_w; +} tag_info; typedef struct _wwz_account_data wwz_account_data; -struct _wwz_account_data -{ +struct _wwz_account_data { char *password; int sock; - eb_chat_room *chat_room; /* only one */ + eb_chat_room *chat_room; /* only one */ int activity_tag; int connect_tag; }; @@ -59,21 +58,18 @@ int typing_handler; }; -typedef enum -{ +typedef enum { CONN_CLOSED, CONN_WAITING_CHALLENGE, CONN_WAITING_USERINFO, CONN_ESTABLISHED } ConnState; - -static void clean_up (int sock); -eb_account * eb_workwizu_new_account (const char *account); -void eb_workwizu_add_user (eb_account *account); -void eb_workwizu_del_user (eb_account *account); -void eb_workwizu_logout (eb_local_account *account); - +static void clean_up(int sock); +eb_account *eb_workwizu_new_account(const char *account); +void eb_workwizu_add_user(eb_account *account); +void eb_workwizu_del_user(eb_account *account); +void eb_workwizu_logout(eb_local_account *account); /* destinations */ #define CHANNEL 0 |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/aycryption In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/aycryption Modified Files: aycryption.c select-keys.c select-keys.h Log Message: reformatted source code Index: aycryption.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aycryption/aycryption.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- aycryption.c 26 Aug 2009 09:26:14 -0000 1.26 +++ aycryption.c 17 Sep 2009 12:04:58 -0000 1.27 @@ -47,42 +47,40 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info aycryption_LTX_plugin_info - #define module_version aycryption_LTX_module_version +#define plugin_info aycryption_LTX_plugin_info +#define module_version aycryption_LTX_module_version #endif - /* Function Prototypes */ -static char *aycryption_out(const eb_local_account * local, const eb_account * remote, - struct contact *contact, const char * s); -static char *aycryption_in(const eb_local_account * local, const eb_account * remote, - const struct contact *contact, const char * s); +static char *aycryption_out(const eb_local_account *local, + const eb_account *remote, struct contact *contact, const char *s); +static char *aycryption_in(const eb_local_account *local, + const eb_account *remote, const struct contact *contact, const char *s); static void set_gpg_key(ebmCallbackData *data); static void show_gpg_log(ebmCallbackData *data); -void pgp_encrypt ( gpgme_data_t plain, gpgme_data_t *cipher, gpgme_key_t *kset, int sign ); +void pgp_encrypt(gpgme_data_t plain, gpgme_data_t *cipher, gpgme_key_t *kset, + int sign); -gpgme_error_t gpgmegtk_passphrase_cb (void *opaque, - const char *desc, - const char *passphrase_info, - int prev_was_bad, - int fd); +gpgme_error_t gpgmegtk_passphrase_cb(void *opaque, + const char *desc, + const char *passphrase_info, int prev_was_bad, int fd); static int aycryption_init(); static int aycryption_finish(); struct passphrase_cb_info_s { - gpgme_ctx_t c; - int did_it; + gpgme_ctx_t c; + int did_it; }; static int store_passphrase = 0; static char mykey[MAX_PREF_LEN] = ""; static int ref_count = 0; -static void *tag1=NULL; -static void *tag2=NULL; -static void *tag3=NULL; -static void *tag4=NULL; +static void *tag1 = NULL; +static void *tag2 = NULL; +static void *tag3 = NULL; +static void *tag4 = NULL; static GtkWidget *gpg_log_window = NULL; static GtkWidget *gpg_log_text = NULL; @@ -95,7 +93,7 @@ PLUGIN_FILTER, "Aycryption", "Encrypts messages with GPG.\n" - "WARNING: Apparently MSN servers randomly truncates GPG signed/encrypted messages.", + "WARNING: Apparently MSN servers randomly truncates GPG signed/encrypted messages.", "$Revision$", "$Date$", &ref_count, @@ -103,9 +101,13 @@ aycryption_finish, NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static int aycryption_init() { @@ -120,69 +122,81 @@ il->type = EB_INPUT_CHECKBOX; il->next = g_new0(input_list, 1); - il = il->next; + il = il->next; il->widget.entry.value = mykey; il->name = "mykey"; il->label = strdup(_("Private key for signing:")); il->type = EB_INPUT_ENTRY; il->next = g_new0(input_list, 1); - il = il->next; + il = il->next; il->widget.checkbox.value = &do_aycryption_debug; il->name = "do_aycryption_debug"; il->label = strdup(_("Enable debugging")); il->type = EB_INPUT_CHECKBOX; - outgoing_message_filters = l_list_append(outgoing_message_filters, &aycryption_out); - incoming_message_filters = l_list_append(incoming_message_filters, &aycryption_in); - + outgoing_message_filters = + l_list_append(outgoing_message_filters, &aycryption_out); + incoming_message_filters = + l_list_append(incoming_message_filters, &aycryption_in); + gpg_log_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gpg_log_text = gtk_text_view_new(); - gpg_log_swindow = gtk_scrolled_window_new(NULL,NULL); - - gtk_window_set_title(GTK_WINDOW(gpg_log_window), _("Aycryption - status")); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gpg_log_swindow), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); + gpg_log_swindow = gtk_scrolled_window_new(NULL, NULL); + + gtk_window_set_title(GTK_WINDOW(gpg_log_window), + _("Aycryption - status")); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gpg_log_swindow), + GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); html_text_view_init(GTK_TEXT_VIEW(gpg_log_text), HTML_IGNORE_FONT); gtk_widget_set_size_request(gpg_log_text, 450, 150); - + gtk_container_add(GTK_CONTAINER(gpg_log_swindow), gpg_log_text); gtk_container_add(GTK_CONTAINER(gpg_log_window), gpg_log_swindow); gtk_widget_show(gpg_log_text); gtk_widget_show(gpg_log_swindow); - + g_signal_connect(gpg_log_window, "delete-event", - G_CALLBACK(gtk_widget_hide_on_delete), NULL); - + G_CALLBACK(gtk_widget_hide_on_delete), NULL); + gtk_widget_realize(gpg_log_window); gtk_widget_realize(gpg_log_swindow); gtk_widget_realize(gpg_log_text); - tag1=eb_add_menu_item(_("GPG settings..."), EB_CHAT_WINDOW_MENU, set_gpg_key, ebmCONTACTDATA, NULL); - if(!tag1) { - eb_debug(DBG_MOD, "Error! Unable to add aycryption menu to chat window menu\n"); - return(-1); - } - tag2=eb_add_menu_item(_("GPG settings..."), EB_CONTACT_MENU, set_gpg_key, ebmCONTACTDATA, NULL); - if(!tag2) { + tag1 = eb_add_menu_item(_("GPG settings..."), EB_CHAT_WINDOW_MENU, + set_gpg_key, ebmCONTACTDATA, NULL); + if (!tag1) { + eb_debug(DBG_MOD, + "Error! Unable to add aycryption menu to chat window menu\n"); + return (-1); + } + tag2 = eb_add_menu_item(_("GPG settings..."), EB_CONTACT_MENU, + set_gpg_key, ebmCONTACTDATA, NULL); + if (!tag2) { eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag1); - eb_debug(DBG_MOD, "Error! Unable to add aycryption menu to contact menu\n"); - return(-1); - } - tag3=eb_add_menu_item(_("GPG status..."), EB_CHAT_WINDOW_MENU, show_gpg_log, ebmCONTACTDATA, NULL); - if(!tag3) { + eb_debug(DBG_MOD, + "Error! Unable to add aycryption menu to contact menu\n"); + return (-1); + } + tag3 = eb_add_menu_item(_("GPG status..."), EB_CHAT_WINDOW_MENU, + show_gpg_log, ebmCONTACTDATA, NULL); + if (!tag3) { eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag1); eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag2); - eb_debug(DBG_MOD, "Error! Unable to add aycryption menu to chat window menu\n"); - return(-1); - } - tag4=eb_add_menu_item(_("GPG status..."), EB_CONTACT_MENU, show_gpg_log, ebmCONTACTDATA, NULL); - if(!tag4) { + eb_debug(DBG_MOD, + "Error! Unable to add aycryption menu to chat window menu\n"); + return (-1); + } + tag4 = eb_add_menu_item(_("GPG status..."), EB_CONTACT_MENU, + show_gpg_log, ebmCONTACTDATA, NULL); + if (!tag4) { eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag1); eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag2); eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag3); - eb_debug(DBG_MOD, "Error! Unable to add aycryption menu to contact menu\n"); - return(-1); + eb_debug(DBG_MOD, + "Error! Unable to add aycryption menu to contact menu\n"); + return (-1); } return 0; @@ -190,10 +204,12 @@ static int aycryption_finish() { - outgoing_message_filters = l_list_remove(outgoing_message_filters, &aycryption_out); - incoming_message_filters = l_list_remove(incoming_message_filters, &aycryption_in); - - while(plugin_info.prefs) { + outgoing_message_filters = + l_list_remove(outgoing_message_filters, &aycryption_out); + incoming_message_filters = + l_list_remove(incoming_message_filters, &aycryption_in); + + while (plugin_info.prefs) { input_list *il = plugin_info.prefs->next; free(plugin_info.prefs); plugin_info.prefs = il; @@ -207,7 +223,7 @@ eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag3); if (tag4) eb_remove_menu_item(EB_CHAT_WINDOW_MENU, tag4); - + gtk_widget_destroy(gpg_log_window); return 0; } @@ -217,27 +233,23 @@ ******************************************************************************/ /* removes the <br/> crap that kopete adds */ -static void br_to_nl(char * text) +static void br_to_nl(char *text) { int i, j; int visible = 1; - for (i=0, j=0; text[i]; i++) - { - if(text[i] == '<') - { - if (!strncasecmp(text+i+1, "br/", 3)) { + for (i = 0, j = 0; text[i]; i++) { + if (text[i] == '<') { + if (!strncasecmp(text + i + 1, "br/", 3)) { /* Kopete compat */ visible = 0; text[j++] = '\n'; - } else if (!strncasecmp(text+i+1, "br", 2)) { + } else if (!strncasecmp(text + i + 1, "br", 2)) { /* Fire compat */ visible = 0; text[j++] = '\n'; } - } - else if (text[i] == '>') - { - if(!visible) { + } else if (text[i] == '>') { + if (!visible) { visible = 1; continue; } @@ -250,8 +262,8 @@ static gpgme_error_t mygpgme_data_rewind(gpgme_data_t dh) { - return (gpgme_data_seek (dh, 0, SEEK_SET) == -1) - ? gpgme_error_from_errno (errno) : 0; + return (gpgme_data_seek(dh, 0, SEEK_SET) == -1) + ? gpgme_error_from_errno(errno) : 0; } static void show_gpg_log(ebmCallbackData *data) @@ -264,26 +276,27 @@ static void set_gpg_key(ebmCallbackData *data) { - ebmContactData *ecd=NULL; + ebmContactData *ecd = NULL; struct contact *ct = NULL; struct select_keys_s keys; GSList *recp_names = NULL; - if(IS_ebmContactData(data)) - ecd=(ebmContactData *)data; - + if (IS_ebmContactData(data)) + ecd = (ebmContactData *)data; + if (ecd) ct = find_contact_by_nick(ecd->contact); - + if (!ct) { eb_debug(DBG_CRYPT, "contact is null !\n"); return; } recp_names = g_slist_append(recp_names, strdup(ct->nick)); - if (ct->gpg_key && ct->gpg_key[0]); - recp_names = g_slist_append(recp_names, strdup(ct->gpg_key)); - keys = gpgmegtk_recipient_selection(recp_names, ct->gpg_do_encryption, ct->gpg_do_signature); + if (ct->gpg_key && ct->gpg_key[0]) ; + recp_names = g_slist_append(recp_names, strdup(ct->gpg_key)); + keys = gpgmegtk_recipient_selection(recp_names, ct->gpg_do_encryption, + ct->gpg_do_signature); if (keys.kset && keys.key) { - eb_debug(DBG_CRYPT,"got key %s\n", keys.key); + eb_debug(DBG_CRYPT, "got key %s\n", keys.key); strncpy(ct->gpg_key, keys.key, 48); ct->gpg_do_encryption = keys.do_crypt; @@ -296,21 +309,25 @@ ct->gpg_do_signature = keys.do_sign; } write_contact_list(); - + } -static char *logcolor[3] = {"#ffa8a8", "#a8a8a8", "#a8ffa8"}; +static char *logcolor[3] = { "#ffa8a8", "#a8a8a8", "#a8ffa8" }; + typedef enum { - LOG_ERR=0, + LOG_ERR = 0, LOG_NORM, LOG_OK } LogLevel; - -static void log_action(const struct contact *ct, int loglevel, const char *string) + +static void log_action(const struct contact *ct, int loglevel, + const char *string) { - + char buf[1024]; - snprintf(buf, 1024, _("<font color=%s><b>%s</b>: %s</font><br>"),logcolor[loglevel], ct->nick, string); - html_text_buffer_append(GTK_TEXT_VIEW(gpg_log_text), buf, HTML_IGNORE_NONE); + snprintf(buf, 1024, _("<font color=%s><b>%s</b>: %s</font><br>"), + logcolor[loglevel], ct->nick, string); + html_text_buffer_append(GTK_TEXT_VIEW(gpg_log_text), buf, + HTML_IGNORE_NONE); if (loglevel == LOG_ERR) { show_gpg_log(NULL); } @@ -325,7 +342,7 @@ err = gpgme_new(&ctx); g_assert(!err); - err = gpgme_op_keylist_start (ctx, ct->gpg_key, 0); + err = gpgme_op_keylist_start(ctx, ct->gpg_key, 0); if (err) { eb_debug(DBG_CRYPT, "err: %s\n", gpgme_strerror(err)); *kset = NULL; @@ -334,21 +351,19 @@ *kset = g_malloc(sizeof(gpgme_key_t)); - while ( !(err = gpgme_op_keylist_next ( ctx, &(*kset)[num_keys] )) ) { - eb_debug(DBG_CRYPT,"found a key for %s with name %s\n", - ct->gpg_key, - (*kset)[num_keys]->uids->name); + while (!(err = gpgme_op_keylist_next(ctx, &(*kset)[num_keys]))) { + eb_debug(DBG_CRYPT, "found a key for %s with name %s\n", + ct->gpg_key, (*kset)[num_keys]->uids->name); - *kset = g_realloc( *kset, sizeof(gpgme_key_t) * (num_keys + 1) ); + *kset = g_realloc(*kset, sizeof(gpgme_key_t) * (num_keys + 1)); num_keys++; } gpgme_release(ctx); } - -static char *aycryption_out(const eb_local_account * local, const eb_account * remote, - struct contact *ct, const char * s) +static char *aycryption_out(const eb_local_account *local, + const eb_account *remote, struct contact *ct, const char *s) { char *p = NULL; char buf[4096]; @@ -360,67 +375,69 @@ int err; if ((!ct->gpg_do_encryption || !ct->gpg_key || ct->gpg_key == '\0') - && !ct->gpg_do_signature) { + && !ct->gpg_do_signature) { if (ct->gpg_do_encryption) log_action(ct, LOG_ERR, "Could not encrypt message."); return strdup(s); } - if( ct->gpg_do_encryption && ct->gpg_key && ct->gpg_key[0] ) + if (ct->gpg_do_encryption && ct->gpg_key && ct->gpg_key[0]) gpg_get_kset(ct, &kset); - - if ( ct->gpg_do_encryption && ct->gpg_key && ct->gpg_key[0] && !kset ) { - eb_debug(DBG_CRYPT,"can't init outgoing crypt: %d %p %c\n", - ct->gpg_do_encryption, ct->gpg_key, ct->gpg_key[0]); - log_action(ct, LOG_ERR, "Could not encrypt message - you may have to set your contact's key."); + if (ct->gpg_do_encryption && ct->gpg_key && ct->gpg_key[0] && !kset) { + eb_debug(DBG_CRYPT, "can't init outgoing crypt: %d %p %c\n", + ct->gpg_do_encryption, ct->gpg_key, ct->gpg_key[0]); + log_action(ct, LOG_ERR, + "Could not encrypt message - you may have to set your contact's key."); return strdup(s); } - + error = gpgme_data_new(&plain); err = gpgme_data_write(plain, s, strlen(s)); - + /* encrypt only */ if (ct->gpg_do_encryption && kset && !ct->gpg_do_signature) { - pgp_encrypt (plain, &cipher, kset, FALSE); - gpgme_data_release (plain); plain = NULL; + pgp_encrypt(plain, &cipher, kset, FALSE); + gpgme_data_release(plain); + plain = NULL; log_action(ct, LOG_NORM, "Sent encrypted, unsigned message."); - /* sign only */ + /* sign only */ } else if (!(ct->gpg_do_encryption && kset) && ct->gpg_do_signature) { pgp_encrypt(plain, &cipher, NULL, TRUE); - gpgme_data_release (plain); plain = NULL; - log_action(ct, LOG_NORM, "Sent uncrypted, signed message."); - /* encrypt and sign */ + gpgme_data_release(plain); + plain = NULL; + log_action(ct, LOG_NORM, "Sent uncrypted, signed message."); + /* encrypt and sign */ } else if (ct->gpg_do_encryption && kset && ct->gpg_do_signature) { - pgp_encrypt (plain, &cipher, kset, TRUE); - gpgme_data_release (plain); plain = NULL; + pgp_encrypt(plain, &cipher, kset, TRUE); + gpgme_data_release(plain); + plain = NULL; log_action(ct, LOG_NORM, "Sent encrypted, signed message."); } - err = mygpgme_data_rewind (cipher); + err = mygpgme_data_rewind(cipher); if (err) - eb_debug(DBG_CRYPT,"error: %s\n", - gpgme_strerror(err)); - + eb_debug(DBG_CRYPT, "error: %s\n", gpgme_strerror(err)); + memset(buf, 0, sizeof(buf)); - while ( gpgme_data_read (cipher, buf, 4096) >0 ) { + while (gpgme_data_read(cipher, buf, 4096) > 0) { char tmp[4096]; - - snprintf(tmp, sizeof(tmp), "%s%s",(p!=NULL)?p:"", buf); + + snprintf(tmp, sizeof(tmp), "%s%s", (p != NULL) ? p : "", buf); if (p) free(p); p = strdup(tmp); memset(buf, 0, sizeof(buf)); } - if(cipher) - gpgme_data_release(cipher); + if (cipher) + gpgme_data_release(cipher); return p; } -static char *aycryption_in(const eb_local_account * local, const eb_account * remote, - const struct contact *ct, const char * s) +static char *aycryption_in(const eb_local_account *local, + const eb_account *remote, const struct contact *ct, const char *s) { char *p = NULL, *res = NULL, *s_nohtml = NULL; gpgme_data_t plain = NULL, cipher = NULL; @@ -438,102 +455,104 @@ int sig_code = 0; memset(buf, 0, 4096); - if (strncmp (s, "-----BEGIN PGP ", strlen("-----BEGIN PGP "))) { + if (strncmp(s, "-----BEGIN PGP ", strlen("-----BEGIN PGP "))) { eb_debug(DBG_CRYPT, "Incoming message isn't PGP formatted\n"); return strdup(s); } - err = gpgme_new (&ctx); + err = gpgme_new(&ctx); if (err) { - eb_debug(DBG_CRYPT,"gpgme_new failed: %s\n", gpgme_strerror (err)); - log_action(ct, LOG_ERR, "Memory error."); - return strdup(s); + eb_debug(DBG_CRYPT, "gpgme_new failed: %s\n", + gpgme_strerror(err)); + log_action(ct, LOG_ERR, "Memory error."); + return strdup(s); } gpgme_data_new(&plain); gpgme_data_new(&cipher); - + /* Clean out kopete HTML crap * < vdanen> so like KDE to just bloat stuff for the hell of it */ s_nohtml = strdup(s); - if (!s_nohtml) - { - eb_debug(DBG_CRYPT,"Couldn't copy message to strip html"); + if (!s_nohtml) { + eb_debug(DBG_CRYPT, "Couldn't copy message to strip html"); log_action(ct, LOG_ERR, "Memory error while stripping html."); return strdup(s); } br_to_nl(s_nohtml); - eb_debug(DBG_CRYPT,"html stripped: %s\n",s_nohtml); + eb_debug(DBG_CRYPT, "html stripped: %s\n", s_nohtml); err = gpgme_data_write(cipher, s_nohtml, strlen(s_nohtml)); - if(err == -1) + if (err == -1) perror("cipher write error"); free(s_nohtml); mygpgme_data_rewind(cipher); mygpgme_data_rewind(plain); - + if (!getenv("GPG_AGENT_INFO")) { - gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, NULL); - } - err = gpgme_op_decrypt_verify (ctx, cipher, plain); + gpgme_set_passphrase_cb(ctx, gpgmegtk_passphrase_cb, NULL); + } + err = gpgme_op_decrypt_verify(ctx, cipher, plain); if (err && gpg_err_code(err) != GPG_ERR_NO_DATA) { - log_action(ct, LOG_ERR, "Cannot decrypt message - maybe your contact uses an incorrect key."); + log_action(ct, LOG_ERR, + "Cannot decrypt message - maybe your contact uses an incorrect key."); return strdup(s); - } else if (gpg_err_code(err) == GPG_ERR_NO_DATA) { /*plaintext signed*/ + } else if (gpg_err_code(err) == GPG_ERR_NO_DATA) { /*plaintext signed */ was_crypted = 0; mygpgme_data_rewind(cipher); mygpgme_data_rewind(plain); err = gpgme_op_verify(ctx, cipher, sigstat, plain); if (err) - eb_debug(DBG_CRYPT, "plaintext err: %s\n", gpgme_strerror(err)); + eb_debug(DBG_CRYPT, "plaintext err: %s\n", + gpgme_strerror(err)); } - + verify_result = gpgme_op_verify_result(ctx); - - if(verify_result && verify_result->signatures) { - err = gpgme_get_key(ctx, verify_result->signatures->fpr, &key, 0); + + if (verify_result && verify_result->signatures) { + err = gpgme_get_key(ctx, verify_result->signatures->fpr, &key, + 0); if (err) { - eb_debug(DBG_CRYPT, "getkey err %s\n", gpgme_strerror(err)); + eb_debug(DBG_CRYPT, "getkey err %s\n", + gpgme_strerror(err)); key = NULL; } - } - else + } else key = NULL; err = mygpgme_data_rewind(plain); if (err) eb_debug(DBG_CRYPT, "rewind err %d\n", err); - memset(buf, 0, sizeof(buf)); - while ( gpgme_data_read (plain, buf, 4096) > 0 ) { + while (gpgme_data_read(plain, buf, 4096) > 0) { char tmp[4096]; memset(tmp, 0, 4096); - snprintf(tmp, sizeof(tmp), "%s%s",(p!=NULL)?p:"", buf); + snprintf(tmp, sizeof(tmp), "%s%s", (p != NULL) ? p : "", buf); if (p) free(p); p = strdup(tmp); memset(buf, 0, sizeof(buf)); } - + if (p) { - while (p[strlen(p)-1] == '\n' || p[strlen(p)-1] == '\r') - p[strlen(p)-1] = '\0'; + while (p[strlen(p) - 1] == '\n' || p[strlen(p) - 1] == '\r') + p[strlen(p) - 1] = '\0'; } gpgme_release(ctx); - if( verify_result && verify_result->signatures ) { + if (verify_result && verify_result->signatures) { sig_code = gpg_err_code(verify_result->signatures->status); - - switch( sig_code ) { + + switch (sig_code) { case GPG_ERR_NO_DATA: curloglevel = LOG_NORM; break; @@ -544,11 +563,12 @@ curloglevel = LOG_ERR; break; } - + strcpy(s_sigstat, _("Got an ")); - strcat(s_sigstat, was_crypted?_("encrypted"):_("unencrypted")); - - switch( sig_code ) { + strcat(s_sigstat, + was_crypted ? _("encrypted") : _("unencrypted")); + + switch (sig_code) { case GPG_ERR_NO_DATA: strcat(s_sigstat, _(", unsigned message.")); break; @@ -566,12 +586,15 @@ strcat(s_sigstat, _(" message with no key.")); break; case GPG_ERR_CERT_REVOKED: - strcat(s_sigstat, _(" message ; signature is valid but the signing key has been revoked")); + strcat(s_sigstat, + _ + (" message ; signature is valid but the signing key has been revoked")); break; case GPG_ERR_BAD_SIGNATURE: strcat(s_sigstat, _(" correctly signed (by ")); strcat(s_sigstat, key->uids->email); - strcat(s_sigstat, _(") message, but signature has expired.")); + strcat(s_sigstat, + _(") message, but signature has expired.")); break; case GPG_ERR_KEY_EXPIRED: strcat(s_sigstat, _(" correctly signed (by ")); @@ -579,10 +602,14 @@ strcat(s_sigstat, _(") message, but key has expired.")); break; case GPG_ERR_GENERAL: - strcat(s_sigstat, _(") message, but there was an error verifying the signature")); + strcat(s_sigstat, + _ + (") message, but there was an error verifying the signature")); break; default: - strcat(s_sigstat, _(" message - Unknown signature status (file a bugreport)!")); + strcat(s_sigstat, + _ + (" message - Unknown signature status (file a bugreport)!")); break; } @@ -597,7 +624,7 @@ return p; } -static GSList *create_signers_list (const char *keyid) +static GSList *create_signers_list(const char *keyid) { GSList *key_list = NULL; gpgme_ctx_t list_ctx = NULL; @@ -605,18 +632,18 @@ gpgme_error_t err; gpgme_key_t key; - err = gpgme_new (&list_ctx); - if ( gpg_err_code(err) != GPG_ERR_NO_ERROR ) { + err = gpgme_new(&list_ctx); + if (gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto leave; } - err = gpgme_op_keylist_start (list_ctx, keyid, 1); - if ( gpg_err_code(err) != GPG_ERR_NO_ERROR ) { + err = gpgme_op_keylist_start(list_ctx, keyid, 1); + if (gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto leave; } err = gpgme_op_keylist_next(list_ctx, &key); - while ( gpg_err_code(err) != GPG_ERR_NO_ERROR ) { - key_list = g_slist_append (key_list, key); + while (gpg_err_code(err) != GPG_ERR_NO_ERROR) { + key_list = g_slist_append(key_list, key); err = gpgme_op_keylist_next(list_ctx, &key); } if (gpg_err_code(err) != GPG_ERR_EOF) { @@ -624,18 +651,19 @@ } err = 0; if (key_list == NULL) { - eb_debug (DBG_CRYPT,"no keys found for keyid \"%s\"\n", keyid); + eb_debug(DBG_CRYPT, "no keys found for keyid \"%s\"\n", keyid); } -leave: + leave: if (gpg_err_code(err) != GPG_ERR_NO_ERROR) { - eb_debug (DBG_CRYPT,"create_signers_list failed: %s\n", gpgme_strerror (err)); + eb_debug(DBG_CRYPT, "create_signers_list failed: %s\n", + gpgme_strerror(err)); for (p = key_list; p != NULL; p = p->next) - gpgme_key_unref ((gpgme_key_t) p->data); - g_slist_free (key_list); + gpgme_key_unref((gpgme_key_t) p->data); + g_slist_free(key_list); } if (list_ctx) - gpgme_release (list_ctx); + gpgme_release(list_ctx); return err ? NULL : key_list; } @@ -645,87 +673,89 @@ * the file or NULL in case of error. */ void -pgp_encrypt ( gpgme_data_t plain, gpgme_data_t *cipher, gpgme_key_t *kset, int sign ) +pgp_encrypt(gpgme_data_t plain, gpgme_data_t *cipher, gpgme_key_t *kset, + int sign) { gpgme_ctx_t ctx = NULL; - gpgme_error_t err ; + gpgme_error_t err; GSList *p; GSList *key_list = NULL; - - if(sign && mykey[0]) { + if (sign && mykey[0]) { key_list = create_signers_list(mykey); } - - err = gpgme_new (&ctx); + + err = gpgme_new(&ctx); if (gpg_err_code(err) == GPG_ERR_NO_ERROR) - err = gpgme_data_new (cipher); + err = gpgme_data_new(cipher); if (gpg_err_code(err) == GPG_ERR_NO_ERROR && sign) { - + if (!getenv("GPG_AGENT_INFO")) { - gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, NULL); + gpgme_set_passphrase_cb(ctx, gpgmegtk_passphrase_cb, + NULL); } if (kset != NULL) { - gpgme_set_textmode (ctx, 1); - gpgme_set_armor (ctx, 1); + gpgme_set_textmode(ctx, 1); + gpgme_set_armor(ctx, 1); } - gpgme_signers_clear (ctx); + gpgme_signers_clear(ctx); for (p = key_list; p != NULL; p = p->next) { - err = gpgme_signers_add (ctx, (gpgme_key_t) p->data); + err = gpgme_signers_add(ctx, (gpgme_key_t) p->data); } if (kset != NULL) { mygpgme_data_rewind(plain); - err = gpgme_op_encrypt_sign(ctx, kset, 0, plain, *cipher); + err = gpgme_op_encrypt_sign(ctx, kset, 0, plain, + *cipher); } else { mygpgme_data_rewind(plain); - err = gpgme_op_sign (ctx, plain, *cipher, GPGME_SIG_MODE_CLEAR); + err = gpgme_op_sign(ctx, plain, *cipher, + GPGME_SIG_MODE_CLEAR); } for (p = key_list; p != NULL; p = p->next) - gpgme_key_unref ((gpgme_key_t) p->data); - g_slist_free (key_list); - } - else if (gpg_err_code(err) == GPG_ERR_NO_ERROR) { - gpgme_set_armor (ctx, 1); + gpgme_key_unref((gpgme_key_t) p->data); + g_slist_free(key_list); + } else if (gpg_err_code(err) == GPG_ERR_NO_ERROR) { + gpgme_set_armor(ctx, 1); mygpgme_data_rewind(plain); - err = gpgme_op_encrypt (ctx, kset, 0, plain, *cipher); + err = gpgme_op_encrypt(ctx, kset, 0, plain, *cipher); } - + if (gpg_err_code(err) != GPG_ERR_NO_ERROR) { - eb_debug(DBG_CRYPT, "pgp_encrypt failed: %s\n", gpgme_strerror(err)); - gpgme_data_release (*cipher); + eb_debug(DBG_CRYPT, "pgp_encrypt failed: %s\n", + gpgme_strerror(err)); + gpgme_data_release(*cipher); *cipher = NULL; } - gpgme_release (ctx); + gpgme_release(ctx); } gpgme_error_t -gpgmegtk_passphrase_cb (void *opaque, const char *desc, const char *passphrase_info, int prev_was_bad, int fd) +gpgmegtk_passphrase_cb(void *opaque, const char *desc, + const char *passphrase_info, int prev_was_bad, int fd) { const char *pass; - + if (store_passphrase && aycrypt_last_pass != NULL && !prev_was_bad) { write(fd, aycrypt_last_pass, strlen(aycrypt_last_pass)); write(fd, "\n", 1); return GPG_ERR_NO_ERROR; } - pass = passphrase_mbox (desc, prev_was_bad); + pass = passphrase_mbox(desc, prev_was_bad); if (!pass) { eb_debug(DBG_CRYPT, "Cancelled passphrase entry\n"); write(fd, "\n", 1); return GPG_ERR_CANCELED; - } - else { + } else { if (store_passphrase) { if (aycrypt_last_pass) g_free(aycrypt_last_pass); aycrypt_last_pass = g_strdup(pass); } } - write (fd, pass, strlen(pass)); - write (fd, "\n", 1); + write(fd, pass, strlen(pass)); + write(fd, "\n", 1); return GPG_ERR_NO_ERROR; } - Index: select-keys.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aycryption/select-keys.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- select-keys.c 7 Sep 2009 07:52:50 -0000 1.8 +++ select-keys.c 17 Sep 2009 12:04:58 -0000 1.9 @@ -38,7 +38,7 @@ #define DIM(v) (sizeof(v)/sizeof((v)[0])) #define DIMof(type,member) DIM(((type *)0)->member) -enum col_titles { +enum col_titles { COL_ALGO, COL_KEYID, COL_NAME, @@ -48,41 +48,37 @@ N_COL_TITLES }; -static void set_row (GtkListStore *clist_store, gpgme_key_t key); -static void fill_clist (struct select_keys_s *sk, const char *pattern); -static void create_dialog (struct select_keys_s *sk); -static void open_dialog (struct select_keys_s *sk); -static void close_dialog (struct select_keys_s *sk); -static gint delete_event_cb (GtkWidget *widget, - GdkEventAny *event, gpointer data); -static void key_pressed_cb (GtkWidget *widget, - GdkEventKey *event, gpointer data); -static void select_btn_cb (GtkWidget *widget, gpointer data); -static void cancel_btn_cb (GtkWidget *widget, gpointer data); -static void other_btn_cb (GtkWidget *widget, gpointer data); - +static void set_row(GtkListStore *clist_store, gpgme_key_t key); +static void fill_clist(struct select_keys_s *sk, const char *pattern); +static void create_dialog(struct select_keys_s *sk); +static void open_dialog(struct select_keys_s *sk); +static void close_dialog(struct select_keys_s *sk); +static gint delete_event_cb(GtkWidget *widget, + GdkEventAny *event, gpointer data); +static void key_pressed_cb(GtkWidget *widget, + GdkEventKey *event, gpointer data); +static void select_btn_cb(GtkWidget *widget, gpointer data); +static void cancel_btn_cb(GtkWidget *widget, gpointer data); +static void other_btn_cb(GtkWidget *widget, gpointer data); char *aycrypt_last_pass = NULL; int aycrypt_pass_ack = 0; static void -update_progress (struct select_keys_s *sk, int running, const char *pattern) +update_progress(struct select_keys_s *sk, int running, const char *pattern) { static int windmill[] = { '-', '\\', '|', '/' }; char *buf; if (!running) - buf = g_strdup_printf (_("Please select key for `%s'"), - pattern); - else - buf = g_strdup_printf (_("Collecting info for `%s' ... %c"), - pattern, - windmill[running%DIM(windmill)]); - gtk_label_set_text (sk->toplabel, buf); - g_free (buf); + buf = g_strdup_printf(_("Please select key for `%s'"), pattern); + else + buf = g_strdup_printf(_("Collecting info for `%s' ... %c"), + pattern, windmill[running % DIM(windmill)]); + gtk_label_set_text(sk->toplabel, buf); + g_free(buf); } - /** * select_keys_get_recipients: * @recp_names: A list of email addresses @@ -94,65 +90,65 @@ * Return value: NULL on error or a list of list of recipients. **/ struct select_keys_s -gpgmegtk_recipient_selection (GSList *recp_names, int crypt, int sign) +gpgmegtk_recipient_selection(GSList *recp_names, int crypt, int sign) { struct select_keys_s sk; GSList *recp_walk = recp_names; - memset (&sk, 0, sizeof sk); + memset(&sk, 0, sizeof sk); sk.do_crypt = crypt; sk.do_sign = sign; - open_dialog (&sk); + open_dialog(&sk); - gtk_list_store_clear (GTK_LIST_STORE(gtk_tree_view_get_model(sk.clist))); + gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(sk.clist))); do { - sk.pattern = recp_walk? recp_walk->data:NULL; - printf("sk.pattern = %s\n",sk.pattern); - fill_clist (&sk, sk.pattern); - update_progress (&sk, 0, recp_names?recp_names->data:NULL); - + sk.pattern = recp_walk ? recp_walk->data : NULL; + printf("sk.pattern = %s\n", sk.pattern); + fill_clist(&sk, sk.pattern); + update_progress(&sk, 0, recp_names ? recp_names->data : NULL); + if (recp_walk) recp_walk = recp_walk->next; } while (recp_walk); - gtk_main (); + gtk_main(); - close_dialog (&sk); + close_dialog(&sk); if (!sk.okay) { - g_free (sk.kset); - sk.kset = NULL; sk.key = NULL; + g_free(sk.kset); + sk.kset = NULL; + sk.key = NULL; } else { /* Terminating the key list with a NULL */ - sk.kset = g_realloc( sk.kset, sizeof(gpgme_key_t) * (sk.num_keys + 1) ); + sk.kset = + g_realloc(sk.kset, + sizeof(gpgme_key_t) * (sk.num_keys + 1)); sk.kset[sk.num_keys] = NULL; } return sk; -} +} /* Release key data */ -static gboolean destroy_key(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) +static gboolean destroy_key(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data) { gpgme_key_t key; - gtk_tree_model_get(model, iter, - COL_GPG_KEY, &key, - -1); + gtk_tree_model_get(model, iter, COL_GPG_KEY, &key, -1); - if(key) - gpgme_key_release (key); + if (key) + gpgme_key_release(key); return FALSE; } -static void -destroy_keys (GtkWidget *widget, gpointer data) +static void destroy_keys(GtkWidget *widget, gpointer data) { GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); gtk_tree_model_foreach(model, destroy_key, NULL); } -static void -set_row (GtkListStore *clist_store, gpgme_key_t key) +static void set_row(GtkListStore *clist_store, gpgme_key_t key) { const char *s; const char *text[N_COL_TITLES]; @@ -161,38 +157,39 @@ gpgme_key_t temp; gboolean finished = FALSE; - if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(clist_store), &row)) - gtk_tree_model_get(GTK_TREE_MODEL(clist_store), &row, - COL_GPG_KEY, &temp, -1); - - while ( !temp->subkeys && !finished ) { - if ( !strcmp(key->subkeys->keyid, temp->subkeys->keyid) ) - return; /* already found */ - if( !gtk_tree_model_iter_next(GTK_TREE_MODEL(clist_store), &row)) + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(clist_store), &row)) + gtk_tree_model_get(GTK_TREE_MODEL(clist_store), &row, + COL_GPG_KEY, &temp, -1); + + while (!temp->subkeys && !finished) { + if (!strcmp(key->subkeys->keyid, temp->subkeys->keyid)) + return; /* already found */ + if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(clist_store), + &row)) finished = TRUE; else - gtk_tree_model_get(GTK_TREE_MODEL(clist_store), &row, - COL_GPG_KEY, &temp, -1); + gtk_tree_model_get(GTK_TREE_MODEL(clist_store), &row, + COL_GPG_KEY, &temp, -1); } - if(key->subkeys) + if (key->subkeys) printf("Found key: %s\n", key->uids->email); /* first check whether the key is capable of encryption which is not * the case for revoked, expired or sign-only keys */ - if ( !key->can_encrypt ) { + if (!key->can_encrypt) { printf("Cannot encrypt\n"); return; } - - algo_buf = g_strdup_printf ("%u/%s", - key->subkeys->length, - gpgme_pubkey_algo_name (key->subkeys->pubkey_algo ) ); + + algo_buf = g_strdup_printf("%u/%s", + key->subkeys->length, + gpgme_pubkey_algo_name(key->subkeys->pubkey_algo)); text[COL_ALGO] = algo_buf; s = key->subkeys->keyid; - if (strlen (s) == 16) - s += 8; /* show only the short keyID */ + if (strlen(s) == 16) + s += 8; /* show only the short keyID */ text[COL_KEYID] = s; s = key->uids->name; @@ -201,26 +198,25 @@ s = key->uids->email; text[COL_EMAIL] = s; - switch (key->uids->validity) - { + switch (key->uids->validity) { case GPGME_VALIDITY_UNDEFINED: - s="q"; + s = "q"; break; case GPGME_VALIDITY_NEVER: - s="n"; + s = "n"; break; case GPGME_VALIDITY_MARGINAL: - s="m"; + s = "m"; break; case GPGME_VALIDITY_FULL: - s="f"; + s = "f"; break; case GPGME_VALIDITY_ULTIMATE: - s="u"; + s = "u"; break; case GPGME_VALIDITY_UNKNOWN: default: - s="?"; + s = "?"; break; } @@ -228,55 +224,53 @@ gtk_list_store_append(clist_store, &newrow); gtk_list_store_set(clist_store, &newrow, - COL_ALGO, text[COL_ALGO], - COL_KEYID, text[COL_KEYID], - COL_NAME, text[COL_NAME], - COL_EMAIL, text[COL_EMAIL], - COL_VALIDITY, text[COL_VALIDITY], - COL_GPG_KEY, key, - -1); + COL_ALGO, text[COL_ALGO], + COL_KEYID, text[COL_KEYID], + COL_NAME, text[COL_NAME], + COL_EMAIL, text[COL_EMAIL], + COL_VALIDITY, text[COL_VALIDITY], COL_GPG_KEY, key, -1); - g_free (algo_buf); + g_free(algo_buf); } - -static void -fill_clist (struct select_keys_s *sk, const char *pattern) +static void fill_clist(struct select_keys_s *sk, const char *pattern) { GtkListStore *clist_store; gpgme_ctx_t ctx; gpgme_error_t err; gpgme_key_t key; - int running=0; + int running = 0; - g_return_if_fail (sk); - clist_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(sk->clist))); - g_return_if_fail (clist_store); + g_return_if_fail(sk); + clist_store = + GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(sk-> + clist))); + g_return_if_fail(clist_store); - err = gpgme_new (&ctx); - g_assert (!err); + err = gpgme_new(&ctx); + g_assert(!err); sk->select_ctx = ctx; - update_progress (sk, ++running, pattern); - while (gtk_events_pending ()) - gtk_main_iteration (); + update_progress(sk, ++running, pattern); + while (gtk_events_pending()) + gtk_main_iteration(); - err = gpgme_op_keylist_start (ctx, pattern, 0); + err = gpgme_op_keylist_start(ctx, pattern, 0); if (err) { sk->select_ctx = NULL; return; } - update_progress (sk, ++running, pattern); - while ( !(err = gpgme_op_keylist_next ( ctx, &key )) ) { - set_row (clist_store, key ); + update_progress(sk, ++running, pattern); + while (!(err = gpgme_op_keylist_next(ctx, &key))) { + set_row(clist_store, key); key = NULL; - update_progress (sk, ++running, pattern); - while (gtk_events_pending ()) - gtk_main_iteration (); + update_progress(sk, ++running, pattern); + while (gtk_events_pending()) + gtk_main_iteration(); } sk->select_ctx = NULL; - gpgme_release (ctx); + gpgme_release(ctx); } static void crypt_changed_cb(GtkWidget *w, void *data) @@ -291,56 +285,48 @@ sk->do_sign = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)); } - /* Sorting function for Name column */ -static gint cmp_name (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer data) +static gint cmp_name(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, + gpointer data) { - gpgme_key_t pa,pb; + gpgme_key_t pa, pb; const char *sa, *sb; - gtk_tree_model_get(model, a, - COL_GPG_KEY, &pa, - -1); - gtk_tree_model_get(model, b, - COL_GPG_KEY, &pb, - -1); + gtk_tree_model_get(model, a, COL_GPG_KEY, &pa, -1); + gtk_tree_model_get(model, b, COL_GPG_KEY, &pb, -1); - sa = pa?pa->uids->name:NULL; - sb = pb?pb->uids->name:NULL; + sa = pa ? pa->uids->name : NULL; + sb = pb ? pb->uids->name : NULL; - if(!sa) + if (!sa) return !!sb; - if(!sb) + if (!sb) return -1; return strcasecmp(sa, sb); } /* Sorting function for email column */ -static gint cmp_email (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer data) +static gint cmp_email(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, + gpointer data) { - gpgme_key_t pa,pb; + gpgme_key_t pa, pb; const char *sa, *sb; - gtk_tree_model_get(model, a, - COL_GPG_KEY, &pa, - -1); - gtk_tree_model_get(model, b, - COL_GPG_KEY, &pb, - -1); + gtk_tree_model_get(model, a, COL_GPG_KEY, &pa, -1); + gtk_tree_model_get(model, b, COL_GPG_KEY, &pb, -1); - sa = pa?pa->uids->email:NULL; - sb = pb?pb->uids->email:NULL; + sa = pa ? pa->uids->email : NULL; + sb = pb ? pb->uids->email : NULL; - if(!sa) + if (!sa) return !!sb; - if(!sb) + if (!sb) return -1; return strcasecmp(sa, sb); } -static void -create_dialog (struct select_keys_s *sk) +static void create_dialog(struct select_keys_s *sk) { GtkWidget *window; GtkWidget *vbox, *vbox2, *hbox; @@ -350,178 +336,172 @@ GtkListStore *clist_store; GtkWidget *label; GtkWidget *vbox3; - GtkWidget *select_btn, *cancel_btn, *other_btn, *do_crypt_btn, *do_sign_btn; + GtkWidget *select_btn, *cancel_btn, *other_btn, *do_crypt_btn, + *do_sign_btn; const char *titles[N_COL_TITLES]; GtkTreeViewColumn *column; GtkCellRenderer *renderer; - g_assert (!sk->window); - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_size_request (window, 520, 280); - gtk_container_set_border_width (GTK_CONTAINER (window), 8); - gtk_window_set_title (GTK_WINDOW (window), _("Select Keys")); - g_signal_connect (window, "delete-event", G_CALLBACK (delete_event_cb), sk); - g_signal_connect (window, "key-press-event", G_CALLBACK (key_pressed_cb), sk); + g_assert(!sk->window); + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_widget_set_size_request(window, 520, 280); + gtk_container_set_border_width(GTK_CONTAINER(window), 8); + gtk_window_set_title(GTK_WINDOW(window), _("Select Keys")); + g_signal_connect(window, "delete-event", G_CALLBACK(delete_event_cb), + sk); + g_signal_connect(window, "key-press-event", G_CALLBACK(key_pressed_cb), + sk); - vbox = gtk_vbox_new (FALSE, 8); - gtk_container_add (GTK_CONTAINER (window), vbox); + vbox = gtk_vbox_new(FALSE, 8); + gtk_container_add(GTK_CONTAINER(window), vbox); - hbox = gtk_hbox_new(FALSE, 4); + hbox = gtk_hbox_new(FALSE, 4); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - label = gtk_label_new ( "" ); + label = gtk_label_new(""); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - hbox = gtk_hbox_new (FALSE, 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); - - scrolledwin = gtk_scrolled_window_new (NULL, NULL); - gtk_box_pack_start (GTK_BOX (hbox), scrolledwin, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwin), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - - titles[COL_ALGO] = _("Size"); - titles[COL_KEYID] = _("Key ID"); - titles[COL_NAME] = _("Name"); - titles[COL_EMAIL] = _("Address"); - titles[COL_VALIDITY] = _("Val"); + hbox = gtk_hbox_new(FALSE, 8); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 2); + + scrolledwin = gtk_scrolled_window_new(NULL, NULL); + gtk_box_pack_start(GTK_BOX(hbox), scrolledwin, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + titles[COL_ALGO] = _("Size"); + titles[COL_KEYID] = _("Key ID"); + titles[COL_NAME] = _("Name"); + titles[COL_EMAIL] = _("Address"); + titles[COL_VALIDITY] = _("Val"); clist_store = gtk_list_store_new(N_COL_TITLES, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_POINTER); - - clist = gtk_tree_view_new_with_model( GTK_TREE_MODEL(clist_store) ); - gtk_container_add (GTK_CONTAINER (scrolledwin), clist); - gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(clist)), GTK_SELECTION_BROWSE); + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER); + + clist = gtk_tree_view_new_with_model(GTK_TREE_MODEL(clist_store)); + gtk_container_add(GTK_CONTAINER(scrolledwin), clist); + gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW + (clist)), GTK_SELECTION_BROWSE); renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(titles[COL_ALGO], renderer, - "text", COL_ALGO, - NULL); + column = gtk_tree_view_column_new_with_attributes(titles[COL_ALGO], + renderer, "text", COL_ALGO, NULL); g_object_set(column, "min-width", 72, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(clist), column); renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(titles[COL_KEYID], renderer, - "text", COL_KEYID, - NULL); + column = gtk_tree_view_column_new_with_attributes(titles[COL_KEYID], + renderer, "text", COL_KEYID, NULL); g_object_set(column, "min-width", 76, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(clist), column); renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(titles[COL_NAME], renderer, - "text", COL_NAME, - NULL); + column = gtk_tree_view_column_new_with_attributes(titles[COL_NAME], + renderer, "text", COL_NAME, NULL); g_object_set(column, "min-width", 130, NULL); gtk_tree_view_column_set_sort_column_id(column, COL_NAME); gtk_tree_view_append_column(GTK_TREE_VIEW(clist), column); renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(titles[COL_EMAIL], renderer, - "text", COL_EMAIL, - NULL); + column = gtk_tree_view_column_new_with_attributes(titles[COL_EMAIL], + renderer, "text", COL_EMAIL, NULL); g_object_set(column, "min-width", 130, NULL); gtk_tree_view_column_set_sort_column_id(column, COL_EMAIL); gtk_tree_view_append_column(GTK_TREE_VIEW(clist), column); renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(titles[COL_VALIDITY], renderer, - "text", COL_VALIDITY, - NULL); + column = gtk_tree_view_column_new_with_attributes(titles[COL_VALIDITY], + renderer, "text", COL_VALIDITY, NULL); g_object_set(column, "min-width", 20, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(clist), column); gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(clist_store), - COL_NAME, cmp_name, sk, NULL); + COL_NAME, cmp_name, sk, NULL); gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(clist_store), - COL_EMAIL, cmp_email, sk, NULL); + COL_EMAIL, cmp_email, sk, NULL); g_signal_connect(clist, "destroy", G_CALLBACK(destroy_keys), NULL); - hbox = gtk_hbox_new (FALSE, 8); - gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + hbox = gtk_hbox_new(FALSE, 8); + gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + + bbox = gtk_hbox_new(FALSE, 2); + select_btn = + gtkut_create_label_button(_("Select"), + G_CALLBACK(select_btn_cb), sk); + cancel_btn = + gtkut_create_label_button(_("Cancel"), + G_CALLBACK(cancel_btn_cb), sk); + other_btn = + gtkut_create_label_button(_("Other..."), + G_CALLBACK(other_btn_cb), sk); + vbox3 = gtk_vbox_new(FALSE, 2); + do_crypt_btn = + gtkut_check_button(vbox3, _("Enable encryption"), sk->do_crypt, + (GCallback) crypt_changed_cb, sk); + do_sign_btn = + gtkut_check_button(vbox3, _("Enable signing"), sk->do_sign, + (GCallback) sign_changed_cb, sk); + + gtk_box_pack_end(GTK_BOX(hbox), select_btn, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(hbox), other_btn, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(hbox), cancel_btn, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(hbox), vbox3, FALSE, FALSE, 0); - bbox = gtk_hbox_new (FALSE, 2); - select_btn = gtkut_create_label_button (_("Select"), G_CALLBACK (select_btn_cb), sk); - cancel_btn = gtkut_create_label_button (_("Cancel"), G_CALLBACK (cancel_btn_cb), sk); - other_btn = gtkut_create_label_button (_("Other..."), G_CALLBACK (other_btn_cb), sk); - vbox3 = gtk_vbox_new(FALSE,2); - do_crypt_btn = gtkut_check_button( vbox3, _("Enable encryption"), sk->do_crypt, - (GCallback) crypt_changed_cb, sk ); - do_sign_btn = gtkut_check_button( vbox3, _("Enable signing"), sk->do_sign, - (GCallback) sign_changed_cb, sk ); - - gtk_box_pack_end (GTK_BOX (hbox), select_btn, FALSE, FALSE, 0); - gtk_box_pack_end (GTK_BOX (hbox), other_btn, FALSE, FALSE, 0); - gtk_box_pack_end (GTK_BOX (hbox), cancel_btn, FALSE, FALSE, 0); - gtk_box_pack_end (GTK_BOX (hbox), vbox3, FALSE, FALSE, 0); - - gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); - - vbox2 = gtk_vbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(hbox), bbox, FALSE, FALSE, 0); - gtk_widget_show_all (window); + vbox2 = gtk_vbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 0); + + gtk_widget_show_all(window); sk->window = window; - sk->toplabel = GTK_LABEL (label); - sk->clist = GTK_TREE_VIEW (clist); + sk->toplabel = GTK_LABEL(label); + sk->clist = GTK_TREE_VIEW(clist); } - -static void -open_dialog (struct select_keys_s *sk) +static void open_dialog(struct select_keys_s *sk) { if (!sk->window) - create_dialog (sk); + create_dialog(sk); sk->okay = 0; - sk->sort_column = N_COL_TITLES; /* use an invalid value */ + sk->sort_column = N_COL_TITLES; /* use an invalid value */ sk->sort_type = GTK_SORT_ASCENDING; - gtk_widget_show (sk->window); + gtk_widget_show(sk->window); } - -static void -close_dialog (struct select_keys_s *sk) +static void close_dialog(struct select_keys_s *sk) { - g_return_if_fail (sk); - gtk_widget_destroy (sk->window); + g_return_if_fail(sk); + gtk_widget_destroy(sk->window); sk->window = NULL; } - static gint -delete_event_cb (GtkWidget *widget, GdkEventAny *event, gpointer data) +delete_event_cb(GtkWidget *widget, GdkEventAny *event, gpointer data) { struct select_keys_s *sk = data; sk->okay = 0; - gtk_main_quit (); + gtk_main_quit(); return TRUE; } - -static void -key_pressed_cb (GtkWidget *widget, GdkEventKey *event, gpointer data) +static void key_pressed_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { struct select_keys_s *sk = data; - g_return_if_fail (sk); + g_return_if_fail(sk); if (event && event->keyval == GDK_Escape) { sk->okay = 0; - gtk_main_quit (); + gtk_main_quit(); } } - -static void -select_btn_cb (GtkWidget *widget, gpointer data) +static void select_btn_cb(GtkWidget *widget, gpointer data) { struct select_keys_s *sk = (struct select_keys_s *)data; @@ -530,78 +510,72 @@ GtkTreeSelection *selection; GtkTreeModel *model; - g_return_if_fail (sk); + g_return_if_fail(sk); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sk->clist)); model = gtk_tree_view_get_model(GTK_TREE_VIEW(sk->clist)); - if(!gtk_tree_selection_get_selected(selection, NULL, &selected)) + if (!gtk_tree_selection_get_selected(selection, NULL, &selected)) return; - gtk_tree_model_get(model, &selected, - COL_GPG_KEY, &key, - -1); + gtk_tree_model_get(model, &selected, COL_GPG_KEY, &key, -1); if (key) { const char *s = key->subkeys->fpr; - if ( key->uids->validity < GPGME_VALIDITY_FULL ) { + if (key->uids->validity < GPGME_VALIDITY_FULL) { } - - sk->kset = g_realloc( sk->kset, sizeof(gpgme_key_t) * (sk->num_keys + 1) ); + + sk->kset = + g_realloc(sk->kset, + sizeof(gpgme_key_t) * (sk->num_keys + 1)); gpgme_key_ref(key); sk->kset[sk->num_keys] = key; sk->num_keys++; sk->okay = 1; sk->key = strdup(s); - gtk_main_quit (); + gtk_main_quit(); } } - -static void -cancel_btn_cb (GtkWidget *widget, gpointer data) +static void cancel_btn_cb(GtkWidget *widget, gpointer data) { struct select_keys_s *sk = data; - g_return_if_fail (sk); + g_return_if_fail(sk); sk->okay = 0; if (sk->select_ctx) - gpgme_cancel (sk->select_ctx); - gtk_main_quit (); + gpgme_cancel(sk->select_ctx); + gtk_main_quit(); } -static void -other_selected_cb(const char *text, void *data) +static void other_selected_cb(const char *text, void *data) { struct select_keys_s *sk = data; if (!text) return; - fill_clist (sk, text); - update_progress (sk, 0, sk->pattern); + fill_clist(sk, text); + update_progress(sk, 0, sk->pattern); } -static void -other_btn_cb (GtkWidget *widget, gpointer data) +static void other_btn_cb(GtkWidget *widget, gpointer data) { struct select_keys_s *sk = data; - g_return_if_fail (sk); - do_text_input_window( _("Enter another user or key ID:"), _(""), other_selected_cb, sk); + g_return_if_fail(sk); + do_text_input_window(_("Enter another user or key ID:"), _(""), + other_selected_cb, sk); } -static void -passphrase_ok_cb(GtkWidget *widget, gpointer data) +static void passphrase_ok_cb(GtkWidget *widget, gpointer data) { aycrypt_pass_ack = TRUE; gtk_main_quit(); } - -static void -passphrase_cancel_cb(GtkWidget *widget, gpointer data) +static void passphrase_cancel_cb(GtkWidget *widget, gpointer data) { aycrypt_pass_ack = FALSE; gtk_main_quit(); @@ -614,8 +588,7 @@ return TRUE; } - -static gboolean +static gboolean passphrase_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (event && event->keyval == GDK_Escape) { @@ -625,8 +598,7 @@ return FALSE; } -static GtkWidget * -create_description (const gchar *desc, int prev_was_bad) +static GtkWidget *create_description(const gchar *desc, int prev_was_bad) { const gchar *uid = NULL; gchar *buf; @@ -637,19 +609,18 @@ if (!uid) uid = _("[no user id]"); - buf = g_strdup_printf (_("%sPlease enter the passphrase for:\n\n" - " %.*s \n"), - prev_was_bad ? _("Bad passphrase! Try again...\n\n") : "", - (int)strlen (uid), uid); + buf = g_strdup_printf(_("%sPlease enter the passphrase for:\n\n" + " %.*s \n"), + prev_was_bad ? _("Bad passphrase! Try again...\n\n") : "", + (int)strlen(uid), uid); - label = gtk_label_new (buf); - g_free (buf); + label = gtk_label_new(buf); + g_free(buf); return label; } -const char* -passphrase_mbox (const char *desc, int prev_was_bad) +const char *passphrase_mbox(const char *desc, int prev_was_bad) { char *the_passphrase = NULL; GtkWidget *vbox; @@ -668,16 +639,18 @@ gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); gtk_window_set_modal(GTK_WINDOW(window), TRUE); gtk_window_set_resizable(GTK_WINDOW(window), FALSE); - g_signal_connect(window, "delete-event", G_CALLBACK(passphrase_deleted), NULL); - g_signal_connect(window, "key-press-event", G_CALLBACK(passphrase_key_pressed), NULL); + g_signal_connect(window, "delete-event", G_CALLBACK(passphrase_deleted), + NULL); + g_signal_connect(window, "key-press-event", + G_CALLBACK(passphrase_key_pressed), NULL); vbox = gtk_vbox_new(FALSE, 8); gtk_container_add(GTK_CONTAINER(window), vbox); if (desc) { GtkWidget *label; - label = create_description (desc, prev_was_bad); - gtk_box_pack_start (GTK_BOX(vbox), label, TRUE, TRUE, 0); + label = create_description(desc, prev_was_bad); + gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); } table = gtk_table_new(2, 2, FALSE); @@ -686,46 +659,48 @@ gtk_table_set_row_spacings(GTK_TABLE(table), 12); gtk_table_set_col_spacings(GTK_TABLE(table), 8); - pass_label = gtk_label_new(""); - gtk_table_attach (GTK_TABLE(table), pass_label, 0, 1, 0, 1, - GTK_FILL, GTK_EXPAND|GTK_FILL, 0, 0); - gtk_misc_set_alignment (GTK_MISC (pass_label), 1, 0.5); + gtk_table_attach(GTK_TABLE(table), pass_label, 0, 1, 0, 1, + GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); + gtk_misc_set_alignment(GTK_MISC(pass_label), 1, 0.5); pass_entry = gtk_entry_new(); - gtk_table_attach (GTK_TABLE(table), pass_entry, 1, 2, 0, 1, - GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); - gtk_entry_set_visibility (GTK_ENTRY(pass_entry), FALSE); - gtk_widget_grab_focus (pass_entry); - - - confirm_box = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX(confirm_box), GTK_BUTTONBOX_END); + gtk_table_attach(GTK_TABLE(table), pass_entry, 1, 2, 0, 1, + GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0); + gtk_entry_set_visibility(GTK_ENTRY(pass_entry), FALSE); + gtk_widget_grab_focus(pass_entry); + + confirm_box = gtk_hbutton_box_new(); + gtk_button_box_set_layout(GTK_BUTTON_BOX(confirm_box), + GTK_BUTTONBOX_END); - ok_button = gtk_button_new_with_label (_("OK")); - gtk_box_pack_start (GTK_BOX(confirm_box), ok_button, TRUE, TRUE, 0); + ok_button = gtk_button_new_with_label(_("OK")); + gtk_box_pack_start(GTK_BOX(confirm_box), ok_button, TRUE, TRUE, 0); - cancel_button = gtk_button_new_with_label (_("Cancel")); + cancel_button = gtk_button_new_with_label(_("Cancel")); gtk_box_pack_start(GTK_BOX(confirm_box), cancel_button, TRUE, TRUE, 0); gtk_box_pack_end(GTK_BOX(vbox), confirm_box, FALSE, FALSE, 0); - g_signal_connect(ok_button, "clicked", G_CALLBACK(passphrase_ok_cb), NULL); - g_signal_connect(pass_entry, "activate", G_CALLBACK(passphrase_ok_cb), NULL); - g_signal_connect(cancel_button, "clicked", G_CALLBACK(passphrase_cancel_cb), NULL); - - gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable (GTK_WINDOW(window), FALSE); - + g_signal_connect(ok_button, "clicked", G_CALLBACK(passphrase_ok_cb), + NULL); + g_signal_connect(pass_entry, "activate", G_CALLBACK(passphrase_ok_cb), + NULL); + g_signal_connect(cancel_button, "clicked", + G_CALLBACK(passphrase_cancel_cb), NULL); + + gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(window), FALSE); + gtk_widget_show_all(window); gtk_main(); if (aycrypt_pass_ack) { - the_passphrase = gtk_editable_get_chars(GTK_EDITABLE(pass_entry), 0, -1); + the_passphrase = + gtk_editable_get_chars(GTK_EDITABLE(pass_entry), 0, -1); } - gtk_widget_destroy (window); + gtk_widget_destroy(window); return the_passphrase; } - Index: select-keys.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aycryption/select-keys.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- select-keys.h 3 Aug 2007 20:38:38 -0000 1.3 +++ select-keys.h 17 Sep 2009 12:04:58 -0000 1.4 @@ -23,25 +23,26 @@ #include <gpgme.h> struct select_keys_s { - int okay; - void *window; - void *toplabel; - void *clist; - const char *pattern; - gpgme_key_t *kset; - unsigned int num_keys; - gpgme_ctx_t select_ctx; - char *key; - int sort_type; - int sort_column; - int do_crypt; - int do_sign; + int okay; + void *window; + void *toplabel; + void *clist; + const char *pattern; + gpgme_key_t *kset; + unsigned int num_keys; + gpgme_ctx_t select_ctx; + char *key; + int sort_type; + int sort_column; + int do_crypt; + int do_sign; }; extern char *aycrypt_last_pass; extern int aycrypt_pass_ack; -struct select_keys_s gpgmegtk_recipient_selection (GSList *recp_names, int crypt, int sign); -const char *passphrase_mbox (const char *desc, int prev_was_bad); +struct select_keys_s gpgmegtk_recipient_selection(GSList *recp_names, int crypt, + int sign); +const char *passphrase_mbox(const char *desc, int prev_was_bad); -#endif /* GPGMEGTK_SELECT_KEYS_H */ +#endif /* GPGMEGTK_SELECT_KEYS_H */ |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/jabber In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/jabber Modified Files: jabber.c libEBjabber.c libEBjabber.h Log Message: reformatted source code Index: jabber.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/jabber.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- jabber.c 6 Sep 2009 18:23:08 -0000 1.60 +++ jabber.c 17 Sep 2009 12:04:59 -0000 1.61 @@ -62,27 +62,26 @@ ************************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info jabber_LTX_plugin_info - #define SERVICE_INFO jabber_LTX_SERVICE_INFO - #define plugin_init jabber_LTX_plugin_init - #define plugin_finish jabber_LTX_plugin_finish - #define module_version jabber_LTX_module_version +#define plugin_info jabber_LTX_plugin_info +#define SERVICE_INFO jabber_LTX_SERVICE_INFO +#define plugin_init jabber_LTX_plugin_init [...1464 lines suppressed...] eb_timeout_remove(jlad->typing_tag); } tcd->from = from; tcd->to = to; - jlad->typing_tag = eb_timeout_add(5000, (void *)eb_jabber_send_typing_stop, tcd); + jlad->typing_tag = + eb_timeout_add(5000, (void *)eb_jabber_send_typing_stop, tcd); JABBER_Send_typing(jlad->JConn, from->handle, to->handle, 1); return 4; } -static int eb_jabber_send_cr_typing( eb_chat_room *chatroom ) +static int eb_jabber_send_cr_typing(eb_chat_room *chatroom) { if (!iGetLocalPref("do_typing_notify")) return 20; - + return 4; } Index: libEBjabber.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libEBjabber.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- libEBjabber.c 30 Aug 2009 13:55:35 -0000 1.30 +++ libEBjabber.c 17 Sep 2009 12:04:59 -0000 1.31 @@ -33,19 +33,17 @@ #include "messages.h" #include "dialog.h" - #ifdef __MINGW32__ #include <glib.h> #define snprintf _snprintf #endif - extern void JABBERStatusChange(struct jabber_buddy *jb); [...1683 lines suppressed...] +void j_on_pick_account(void *data) +{ JABBER_Dialog_PTR jd; - JABBER_Conn *JConn=NULL; + JABBER_Conn *JConn = NULL; - jd=(JABBER_Dialog_PTR)data; - JConn=JCfindJID(jd->response); + jd = (JABBER_Dialog_PTR) data; + JConn = JCfindJID(jd->response); eb_debug(DBG_JBR, "Found JConn for %s: %p\n", jd->requestor, JConn); /* Call it again, this time with a good JConn */ - if(!JConn) { - fprintf(stderr, "NULL Jabber connector for buddy, should not happen!\n"); + if (!JConn) { + fprintf(stderr, + "NULL Jabber connector for buddy, should not happen!\n"); return; } JABBER_AddContact(JConn, jd->requestor); Index: libEBjabber.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libEBjabber.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libEBjabber.h 30 Aug 2009 13:55:35 -0000 1.11 +++ libEBjabber.h 17 Sep 2009 12:04:59 -0000 1.12 @@ -16,8 +16,7 @@ extern GList *agent_list; -enum -{ +enum { JABBER_ONLINE, JABBER_AWAY, JABBER_DND, @@ -43,37 +42,35 @@ */ typedef struct JABBERCONN { - char passwd[LINE_LENGTH+1]; - char jid[LINE_LENGTH+1]; /* The jabber id, of the form user@host/resource */ - int listenerID; - jconn conn; /* The actualy jabber connection struct */ - int reg_flag; /* Indicates whether we have registered successfully with the jabber server */ - struct JABBERCONN *next; - AyConnection *connection; - int state; + char passwd[LINE_LENGTH + 1]; + char jid[LINE_LENGTH + 1]; /* The jabber id, of the form user@host/resource */ + int listenerID; + jconn conn; /* The actualy jabber connection struct */ + int reg_flag; /* Indicates whether we have registered successfully with the jabber server */ + struct JABBERCONN *next; + AyConnection *connection; + int state; int server_features; int do_request_gmail; } JABBER_Conn; typedef struct INSTANT_MESSAGE { - char *msg; /* message itself */ - char *sender; /* sender of the message */ - JABBER_Conn *JConn; + char *msg; /* message itself */ + char *sender; /* sender of the message */ + JABBER_Conn *JConn; } JABBER_InstantMessage, *JABBER_InstantMessage_PTR; - /* Use this struct to hold any service specific information you need about * local accounts * below are just some suggested values */ -typedef struct _eb_jabber_local_account_data -{ +typedef struct _eb_jabber_local_account_data { char password[MAX_PREF_LEN]; // account password - int fd; // the file descriptor - int status; // the current status of the user + int fd; // the file descriptor + int status; // the current status of the user int prompt_password; - JABBER_Conn *JConn; + JABBER_Conn *JConn; int activity_tag; int connect_tag; int typing_tag; @@ -81,33 +78,31 @@ int request_gmail; char server_port[MAX_PREF_LEN]; char ssl_server_port[MAX_PREF_LEN]; - char connect_server[MAX_PREF_LEN]; + char connect_server[MAX_PREF_LEN]; LList *jabber_contacts; } eb_jabber_local_account_data; -struct jabber_buddy -{ - char *name; /* Users name */ - char *jid; /* the buddy's id */ - char *sub; /* Subscriptions state */ - int status; /* Their current state */ - char *description; /* Their current status */ +struct jabber_buddy { + char *name; /* Users name */ + char *jid; /* the buddy's id */ + char *sub; /* Subscriptions state */ + int status; /* Their current state */ + char *description; /* Their current status */ JABBER_Conn *JConn; }; - /* ** Dialog message */ typedef struct DIALOG_MSG { - char *handle; - char *requestor; - char *message; - char *heading; - char *response; - JABBER_Conn *JConn; - void (*callback)(void *data); + char *handle; + char *requestor; + char *message; + char *heading; + char *response; + JABBER_Conn *JConn; + void (*callback) (void *data); } JABBER_Dialog, *JABBER_Dialog_PTR; /* @@ -115,11 +110,11 @@ */ typedef struct AUTH_MSG { - char *handle; - char *requestor; - JABBER_Conn *conn; + char *handle; + char *requestor; + JABBER_Conn *conn; } JABBER_AuthMessage, *JABBER_AuthMessage_PTR; - + /* ** Name: JABBER_AuthorizeContact ** Purpose: This function sends an authorize message to the server @@ -140,7 +135,8 @@ ** Output: 0 on success, -1 on failure */ -int JABBER_Login(char *handle, char *passwd, char *host, eb_jabber_local_account_data *jlad, int port); +int JABBER_Login(char *handle, char *passwd, char *host, + eb_jabber_local_account_data *jlad, int port); /* ** Name: JABBER_SendMessage ** Purpose: This function encapuslates the sending of an instant message @@ -228,10 +224,12 @@ ** Output: 0 on success, -1 on failure */ -int JABBER_SendChatRoomMessage(JABBER_Conn *JConn, char *room_name, char *message, char *nick); +int JABBER_SendChatRoomMessage(JABBER_Conn *JConn, char *room_name, + char *message, char *nick); /* Debugging routines */ void j_list_agents(); -void JABBER_Send_typing (JABBER_Conn *JConn, const char *from, const char *to, int typing); +void JABBER_Send_typing(JABBER_Conn *JConn, const char *from, const char *to, + int typing); -#endif /* __LIB_JABBER__ */ +#endif /* __LIB_JABBER__ */ |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/aim-toc In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/aim-toc Modified Files: aim-toc.c aim.h Log Message: reformatted source code Index: aim-toc.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-toc/aim-toc.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- aim-toc.c 22 May 2009 06:02:23 -0000 1.62 +++ aim-toc.c 17 Sep 2009 12:04:58 -0000 1.63 @@ -65,7 +65,6 @@ #include "pixmaps/aim_online.xpm" #include "pixmaps/aim_away.xpm" - #define DBG_TOC do_aim_debug int do_aim_debug = 0; @@ -79,7 +78,6 @@ #define plugin_finish aim_toc_LTX_plugin_finish #define module_version aim_toc_LTX_module_version [...1923 lines suppressed...] @@ -1476,8 +1503,8 @@ toc_new_group = eb_aim_new_group; toc_logged_in = eb_aim_logged_in; toc_async_socket = eb_aim_async_socket; - - sc = g_new0( struct service_callbacks, 1 ); + + sc = g_new0(struct service_callbacks, 1); sc->query_connected = eb_aim_query_connected; sc->login = eb_aim_login; sc->logout = eb_aim_logout; @@ -1511,7 +1538,7 @@ sc->get_color = eb_toc_get_color; sc->get_smileys = eb_toc_get_smileys; - + sc->change_group = eb_aim_change_group; sc->add_group = eb_aim_add_group; sc->del_group = eb_aim_del_group; Index: aim.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-toc/aim.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- aim.h 1 Apr 2003 07:24:26 -0000 1.1.1.1 +++ aim.h 17 Sep 2009 12:04:58 -0000 1.2 @@ -29,9 +29,9 @@ #ifndef __EB_AIM_H__ #define __EB_AIM_H__ - + #include "service.h" -struct service_callbacks * aim_query_callbacks(); +struct service_callbacks *aim_query_callbacks(); #endif /*__AIM_H__*/ |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/jabber/libjabber/include/jabber In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/jabber/libjabber/include/jabber Modified Files: jabber.h log.h Log Message: reformatted source code Index: jabber.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libjabber/include/jabber/jabber.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jabber.h 13 Aug 2009 20:20:38 -0000 1.8 +++ jabber.h 17 Sep 2009 12:04:59 -0000 1.9 @@ -69,26 +69,24 @@ #define JID_USER 2 #define JID_SERVER 4 -typedef struct jid_struct -{ - pool p; - char* resource; - char* user; - char* server; - unsigned short port; - char* full; - struct jid_struct *next; /* for lists of jids */ -} *jid; - -jid jid_new(pool p, char *idstr); /* Creates a jabber id from the idstr */ -void jid_set(jid id, char *str, int item); /* Individually sets jid components */ -char* jid_full(jid id); /* Builds a string type=user/resource@server from the jid data */ -int jid_cmp(jid a, jid b); /* Compares two jid's, returns 0 for perfect match */ -int jid_cmpx(jid a, jid b, int parts); /* Compares just the parts specified as JID_|JID_ */ -jid jid_append(jid a, jid b); /* Appending b to a (list), no dups */ -xmlnode jid_xres(jid id); /* Returns xmlnode representation of the resource?query=string */ -xmlnode jid_nodescan(jid id, xmlnode x); /* Scans the children of the node for a matching jid attribute */ - + typedef struct jid_struct { + pool p; + char *resource; + char *user; + char *server; + unsigned short port; + char *full; + struct jid_struct *next; /* for lists of jids */ + } *jid; + + jid jid_new(pool p, char *idstr); /* Creates a jabber id from the idstr */ + void jid_set(jid id, char *str, int item); /* Individually sets jid components */ + char *jid_full(jid id); /* Builds a string type=user/resource@server from the jid data */ + int jid_cmp(jid a, jid b); /* Compares two jid's, returns 0 for perfect match */ + int jid_cmpx(jid a, jid b, int parts); /* Compares just the parts specified as JID_|JID_ */ + jid jid_append(jid a, jid b); /* Appending b to a (list), no dups */ + xmlnode jid_xres(jid id); /* Returns xmlnode representation of the resource?query=string */ + xmlnode jid_nodescan(jid id, xmlnode x); /* Scans the children of the node for a matching jid attribute */ /* --------------------------------------------------------- */ /* */ @@ -119,76 +117,69 @@ #define JPACKET__HEADLINE 15 #define JPACKET__INVISIBLE 16 -typedef struct jpacket_struct -{ - unsigned char type; - int subtype; - int flag; - void* aux1; - xmlnode x; - jid to; - jid from; - char* iqns; - xmlnode iq; - pool p; -} *jpacket, _jpacket; - -jpacket jpacket_new(xmlnode x); /* Creates a jabber packet from the xmlnode */ -jpacket jpacket_reset(jpacket p); /* Resets the jpacket values based on the xmlnode */ -int jpacket_subtype(jpacket p); /* Returns the subtype value (looks at xmlnode for it) */ - + typedef struct jpacket_struct { + unsigned char type; + int subtype; + int flag; + void *aux1; + xmlnode x; + jid to; + jid from; + char *iqns; + xmlnode iq; + pool p; + } *jpacket, _jpacket; + + jpacket jpacket_new(xmlnode x); /* Creates a jabber packet from the xmlnode */ + jpacket jpacket_reset(jpacket p); /* Resets the jpacket values based on the xmlnode */ + int jpacket_subtype(jpacket p); /* Returns the subtype value (looks at xmlnode for it) */ /* --------------------------------------------------------- */ /* */ /* Presence Proxy DB structures & constants */ /* */ /* --------------------------------------------------------- */ -typedef struct ppdb_struct -{ - jid id; /* entry data */ - int pri; - xmlnode x; - struct ppdb_struct* user; /* linked list for user@server */ - pool p; /* db-level data */ - struct ppdb_struct* next; -} _ppdb, *ppdb; - -ppdb ppdb_insert(ppdb db, jid id, xmlnode x); /* Inserts presence into the proxy */ -xmlnode ppdb_primary(ppdb db, jid id); /* Fetches the matching primary presence for the id */ -void ppdb_free(ppdb db); /* Frees the db and all entries */ -xmlnode ppdb_get(ppdb db, jid id); /* Called successively to return each presence xmlnode */ - /* for the id and children, returns NULL at the end */ - + typedef struct ppdb_struct { + jid id; /* entry data */ + int pri; + xmlnode x; + struct ppdb_struct *user; /* linked list for user@server */ + pool p; /* db-level data */ + struct ppdb_struct *next; + } _ppdb, *ppdb; + + ppdb ppdb_insert(ppdb db, jid id, xmlnode x); /* Inserts presence into the proxy */ + xmlnode ppdb_primary(ppdb db, jid id); /* Fetches the matching primary presence for the id */ + void ppdb_free(ppdb db); /* Frees the db and all entries */ + xmlnode ppdb_get(ppdb db, jid id); /* Called successively to return each presence xmlnode */ + /* for the id and children, returns NULL at the end */ /* --------------------------------------------------------- */ /* */ /* Simple Jabber Rate limit functions */ /* */ /* --------------------------------------------------------- */ -typedef struct jlimit_struct -{ - char *key; - int start; - int points; - int maxt, maxp; - pool p; -} *jlimit, _jlimit; - -jlimit jlimit_new(int maxt, int maxp); -void jlimit_free(jlimit r); -int jlimit_check(jlimit r, char *key, int points); - + typedef struct jlimit_struct { + char *key; + int start; + int points; + int maxt, maxp; + pool p; + } *jlimit, _jlimit; + + jlimit jlimit_new(int maxt, int maxp); + void jlimit_free(jlimit r); + int jlimit_check(jlimit r, char *key, int points); /* --------------------------------------------------------- */ /* */ /* Error structures & constants */ /* */ /* --------------------------------------------------------- */ -typedef struct terror_struct -{ - int code; - char msg[64]; -} terror; + typedef struct terror_struct { + int code; + char msg[64]; + } terror; #define TERROR_BAD (terror){400,"Bad Request"} #define TERROR_AUTH (terror){401,"Unauthorized"} @@ -250,8 +241,6 @@ #define NS_DISCOINFO "http://jabber.org/protocol/disco#info" - - /* --------------------------------------------------------- */ /* */ /* Message Types */ @@ -263,25 +252,23 @@ #define TMSG_GROUPCHAT "groupchat" #define TMSG_HEADLINE "headline" - /* --------------------------------------------------------- */ /* */ /* JUtil functions */ /* */ /* --------------------------------------------------------- */ -xmlnode jutil_presnew(int type, char *to, char *status); /* Create a skeleton presence packet */ -xmlnode jutil_iqnew(int type, char *ns); /* Create a skeleton iq packet */ -xmlnode jutil_msgnew(char *type, char *to, char *subj, char *body); - /* Create a skeleton message packet */ -xmlnode jutil_header(char* xmlns, char* server); /* Create a skeleton stream packet */ -int jutil_priority(xmlnode x); /* Determine priority of this packet */ -void jutil_tofrom(xmlnode x); /* Swaps to/from fields on a packet */ -xmlnode jutil_iqresult(xmlnode x); /* Generate a skeleton iq/result, given a iq/query */ -char* jutil_timestamp(void); /* Get stringified timestamp */ -void jutil_error(xmlnode x, terror E); /* Append an <error> node to x */ -void jutil_delay(xmlnode msg, char *reason); /* Append a delay packet to msg */ -char* jutil_regkey(char *key, char *seed); /* pass a seed to generate a key, pass the key again to validate (returns it) */ - + xmlnode jutil_presnew(int type, char *to, char *status); /* Create a skeleton presence packet */ + xmlnode jutil_iqnew(int type, char *ns); /* Create a skeleton iq packet */ + xmlnode jutil_msgnew(char *type, char *to, char *subj, char *body); + /* Create a skeleton message packet */ + xmlnode jutil_header(char *xmlns, char *server); /* Create a skeleton stream packet */ + int jutil_priority(xmlnode x); /* Determine priority of this packet */ + void jutil_tofrom(xmlnode x); /* Swaps to/from fields on a packet */ + xmlnode jutil_iqresult(xmlnode x); /* Generate a skeleton iq/result, given a iq/query */ + char *jutil_timestamp(void); /* Get stringified timestamp */ + void jutil_error(xmlnode x, terror E); /* Append an <error> node to x */ + void jutil_delay(xmlnode msg, char *reason); /* Append a delay packet to msg */ + char *jutil_regkey(char *key, char *seed); /* pass a seed to generate a key, pass the key again to validate (returns it) */ /* --------------------------------------------------------- */ /* */ @@ -293,54 +280,49 @@ #define JCONN_STATE_ON 2 #define JCONN_STATE_AUTH 3 -typedef struct jconn_struct -{ - /* Core structure */ - pool p; /* Memory allocation pool */ - int state; /* Connection state flag */ - jid user; /* User info */ - char *pass; /* User passwd */ - char *serv; /* Server to connect to (overrides one in JID) */ - - /* Stream stuff */ - char *sid; /* stream id from server, for digest auth */ - XML_Parser parser; /* Parser instance */ - xmlnode current; /* Current node in parsing instance.. */ - - /* Event callback ptrs */ - void (*on_state)(struct jconn_struct *j, int state); - void (*on_packet)(struct jconn_struct *j, jpacket p); - - int usessl; -} *jconn, jconn_struct; - -typedef void (*jconn_state_h)(jconn j, int state); -typedef void (*jconn_packet_h)(jconn j, jpacket p); - - -jconn jab_new(char *user, char *pass, char *serv); -void jab_delete(jconn j); -void jab_state_handler(jconn j, jconn_state_h h); -void jab_packet_handler(jconn j, jconn_packet_h h); -int jab_start(jconn j); -void jab_stop(jconn j); + typedef struct jconn_struct { + /* Core structure */ + pool p; /* Memory allocation pool */ + int state; /* Connection state flag */ + jid user; /* User info */ + char *pass; /* User passwd */ + char *serv; /* Server to connect to (overrides one in JID) */ + + /* Stream stuff */ + char *sid; /* stream id from server, for digest auth */ + XML_Parser parser; /* Parser instance */ + xmlnode current; /* Current node in parsing instance.. */ + + /* Event callback ptrs */ + void (*on_state) (struct jconn_struct *j, int state); + void (*on_packet) (struct jconn_struct *j, jpacket p); + + int usessl; + } *jconn, jconn_struct; + + typedef void (*jconn_state_h) (jconn j, int state); + typedef void (*jconn_packet_h) (jconn j, jpacket p); + + jconn jab_new(char *user, char *pass, char *serv); + void jab_delete(jconn j); + void jab_state_handler(jconn j, jconn_state_h h); + void jab_packet_handler(jconn j, jconn_packet_h h); + int jab_start(jconn j); + void jab_stop(jconn j); //int jab_getfd(jconn j); -jid jab_getjid(jconn j); -char *jab_getsid(jconn j); - -void jab_send(jconn j, xmlnode x); -void jab_send_raw(jconn j, const char *str); -int jab_recv(jconn j); -void jab_poll(jconn j); - -void jab_auth(jconn j); -void jab_reg(jconn j); + jid jab_getjid(jconn j); + char *jab_getsid(jconn j); + void jab_send(jconn j, xmlnode x); + void jab_send_raw(jconn j, const char *str); + int jab_recv(jconn j); + void jab_poll(jconn j); + void jab_auth(jconn j); + void jab_reg(jconn j); #ifdef __cplusplus } #endif - -#endif /* INCL_JABBER_H */ +#endif /* INCL_JABBER_H */ Index: log.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/jabber/libjabber/include/jabber/log.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- log.h 1 Apr 2003 07:24:35 -0000 1.1.1.1 +++ log.h 17 Sep 2009 12:04:59 -0000 1.2 @@ -23,14 +23,10 @@ #define LOGSIZE_HDR 1024 #define LOGSIZE_TAIL 2048 - #ifdef DEBUG - void jdebug(char *zone, const char *msgfmt, ...); +void jdebug(char *zone, const char *msgfmt, ...); #else - #define jdebug if(0) warn +#define jdebug if(0) warn #endif - - -#endif /* INCL_LOG_H */ - +#endif /* INCL_LOG_H */ |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/image_filter In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/image_filter Modified Files: img2jpc.c video_capture.c Log Message: reformatted source code Index: img2jpc.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/image_filter/img2jpc.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- img2jpc.c 27 Jul 2009 16:42:03 -0000 1.9 +++ img2jpc.c 17 Sep 2009 12:04:58 -0000 1.10 @@ -13,21 +13,18 @@ #include <jasper/jasper.h> - /******************************************************************************* * Begin Module Code ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info img2jpc_LTX_plugin_info - #define module_version img2jpc_LTX_module_version +#define plugin_info img2jpc_LTX_plugin_info +#define module_version img2jpc_LTX_module_version #endif - static int plugin_init(); static int plugin_finish(); - /* Module Exports */ PLUGIN_INFO plugin_info = { PLUGIN_FILTER, @@ -41,17 +38,21 @@ NULL, NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} -static unsigned char * img_2_jpg(const unsigned char *in_img, long *size); -static unsigned char * img_2_jpc(const unsigned char *in_img, long *size); +static unsigned char *img_2_jpg(const unsigned char *in_img, long *size); +static unsigned char *img_2_jpc(const unsigned char *in_img, long *size); -static unsigned char *(*old_img_2_jpg)(const unsigned char *, long *) = NULL; -static unsigned char *(*old_img_2_jpc)(const unsigned char *, long *) = NULL; +static unsigned char *(*old_img_2_jpg) (const unsigned char *, long *) = NULL; +static unsigned char *(*old_img_2_jpc) (const unsigned char *, long *) = NULL; -static int do_jpc_encoding=0; +static int do_jpc_encoding = 0; static int plugin_init() { @@ -62,10 +63,10 @@ plugin_info.prefs = il; il->widget.checkbox.value = &do_jpc_encoding; il->name = "do_jpc_encoding"; - il->label= _("Send JPEG2000 images (creates huge data transfers)"); + il->label = _("Send JPEG2000 images (creates huge data transfers)"); il->type = EB_INPUT_CHECKBOX; - if(!jas_init()) { + if (!jas_init()) { old_img_2_jpg = image_2_jpg; image_2_jpg = img_2_jpg; @@ -91,56 +92,58 @@ * End Module Code ******************************************************************************/ -static unsigned char * img_2_img(const unsigned char *in_img, long *size, int outfmt, const char *soutfmt, const char *enc_opts) +static unsigned char *img_2_img(const unsigned char *in_img, long *size, + int outfmt, const char *soutfmt, const char *enc_opts) { - unsigned char * out_img = NULL; + unsigned char *out_img = NULL; jas_stream_t *in, *out; jas_image_t *image; int infmt; /* - static int ctr; - char fn[100]; - FILE *fp; - snprintf(fn, sizeof(fn), "ayttm-img-%03d.jpc", ctr++); - fp = fopen(fn, "wb"); - if(fp) { - fwrite(in_img, 1, *size, fp); - fclose(fp); - } - */ - if(jas_init()) { + static int ctr; + char fn[100]; + FILE *fp; + snprintf(fn, sizeof(fn), "ayttm-img-%03d.jpc", ctr++); + fp = fopen(fn, "wb"); + if(fp) { + fwrite(in_img, 1, *size, fp); + fclose(fp); + } + */ + if (jas_init()) { eb_debug(DBG_MOD, "Could not init jasper\n"); return ay_memdup(in_img, *size); } - if(!(in = jas_stream_memopen((char *)in_img, *size))) { + if (!(in = jas_stream_memopen((char *)in_img, *size))) { eb_debug(DBG_MOD, "Could not open jasper input stream\n"); return ay_memdup(in_img, *size); } infmt = jas_image_getfmt(in); - eb_debug(DBG_MOD, "Got input image format: %d %s\n", infmt, jas_image_fmttostr(infmt)); - if(infmt <= 0) + eb_debug(DBG_MOD, "Got input image format: %d %s\n", infmt, + jas_image_fmttostr(infmt)); + if (infmt <= 0) return ay_memdup(in_img, *size); - if(!strcmp(jas_image_fmttostr(infmt), soutfmt)) { + if (!strcmp(jas_image_fmttostr(infmt), soutfmt)) { /* image is already in correct format */ jas_stream_close(in); return ay_memdup(in_img, *size); } - if(!(image = jas_image_decode(in, infmt, NULL))) { + if (!(image = jas_image_decode(in, infmt, NULL))) { eb_debug(DBG_MOD, "Could not decode image format\n"); return ay_memdup(in_img, *size); } - if(!(out = jas_stream_memopen((char *)out_img, 0))) { + if (!(out = jas_stream_memopen((char *)out_img, 0))) { eb_debug(DBG_MOD, "Could not open output stream\n"); return ay_memdup(in_img, *size); } eb_debug(DBG_MOD, "Encoding to format: %d %s\n", outfmt, soutfmt); - if((jas_image_encode(image, out, outfmt, (char *) enc_opts))) { + if ((jas_image_encode(image, out, outfmt, (char *)enc_opts))) { eb_debug(DBG_MOD, "Could not encode image format\n"); return ay_memdup(in_img, *size); } @@ -149,27 +152,27 @@ *size = ((jas_stream_memobj_t *)out->obj_)->bufsize_; eb_debug(DBG_MOD, "Encoded size is: %ld\n", *size); jas_stream_close(in); - out_img=ay_memdup(((jas_stream_memobj_t *)out->obj_)->buf_, *size); + out_img = ay_memdup(((jas_stream_memobj_t *)out->obj_)->buf_, *size); jas_stream_close(out); jas_image_destroy(image); return out_img; } -static unsigned char * img_2_jpg(const unsigned char *in_img, long *size) +static unsigned char *img_2_jpg(const unsigned char *in_img, long *size) { static int outfmt; - if(!outfmt) + if (!outfmt) outfmt = jas_image_strtofmt("jpg"); return img_2_img(in_img, size, outfmt, "jpg", NULL); } -static unsigned char * img_2_jpc(const unsigned char *in_img, long *size) +static unsigned char *img_2_jpc(const unsigned char *in_img, long *size) { static int outfmt; - if(!do_jpc_encoding) + if (!do_jpc_encoding) return ay_memdup(in_img, *size); - if(!outfmt) + if (!outfmt) outfmt = jas_image_strtofmt("jpc"); return img_2_img(in_img, size, outfmt, "jpc", "rate=0.0219\nmode=real"); } Index: video_capture.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/image_filter/video_capture.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- video_capture.c 27 Jul 2009 16:42:03 -0000 1.4 +++ video_capture.c 17 Sep 2009 12:04:58 -0000 1.5 @@ -35,15 +35,15 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info video_capture_LTX_plugin_info - #define module_version video_capture_LTX_module_version +#define plugin_info video_capture_LTX_plugin_info +#define module_version video_capture_LTX_module_version #endif - static int plugin_init(); static int plugin_finish(); -static char frame_grabber[MAX_PREF_LEN]= AYTTM_BIN_DIR "/ayttm_streamer_wrapper.sh -d %d"; +static char frame_grabber[MAX_PREF_LEN] = + AYTTM_BIN_DIR "/ayttm_streamer_wrapper.sh -d %d"; /* Module Exports */ PLUGIN_INFO plugin_info = { @@ -58,13 +58,17 @@ 0, 0 }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static long int grab_frame(unsigned char **image); -static long int (*old_grab_frame)(unsigned char **); +static long int (*old_grab_frame) (unsigned char **); static int plugin_init() { @@ -73,7 +77,7 @@ plugin_info.prefs = il; il->widget.entry.value = frame_grabber; il->name = "frame_grabber"; - il->label= _("Frame grabber command:"); + il->label = _("Frame grabber command:"); il->type = EB_INPUT_ENTRY; old_grab_frame = video_grab_frame; @@ -97,32 +101,32 @@ { FILE *grabber_fp; unsigned char buff[1024]; - unsigned char *outbuf=0; - long int nsize=0, n; + unsigned char *outbuf = 0; + long int nsize = 0, n; char *cmd = strdup(frame_grabber); - while(strstr(cmd, "%d")) { + while (strstr(cmd, "%d")) { char *tmp = strstr(cmd, "%d"); - char *rest=0; - if(*(tmp+2)) - rest = strdup(tmp+2); + char *rest = 0; + if (*(tmp + 2)) + rest = strdup(tmp + 2); *tmp = 0; cmd = ay_string_append(cmd, eb_config_dir()); - if(rest) + if (rest) cmd = ay_string_append(cmd, rest); } grabber_fp = popen(cmd, "r"); ay_free(cmd); - if(!grabber_fp) + if (!grabber_fp) return -1; - while(! (feof(grabber_fp) || ferror(grabber_fp)) ) { + while (!(feof(grabber_fp) || ferror(grabber_fp))) { n = fread(buff, 1, sizeof(buff), grabber_fp); - outbuf = ay_renew(unsigned char, outbuf, n+nsize); - memcpy(outbuf+nsize, buff, n); - nsize+=n; + outbuf = ay_renew(unsigned char, outbuf, n + nsize); + memcpy(outbuf + nsize, buff, n); + nsize += n; } pclose(grabber_fp); @@ -130,4 +134,3 @@ *image = outbuf; return nsize; } - |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/aim-toc/libtoc In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/aim-toc/libtoc Modified Files: libtoc.c libtoc.h Log Message: reformatted source code Index: libtoc.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-toc/libtoc/libtoc.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libtoc.c 22 May 2009 06:02:23 -0000 1.19 +++ libtoc.c 17 Sep 2009 12:04:58 -0000 1.20 @@ -52,7 +52,6 @@ #define snprintf _snprintf #endif - #define TOC_HOST "toc.oscar.aol.com" #define TOC_PORT 80 #ifndef MSG_NOSIGNAL @@ -74,27 +73,24 @@ static char user_info_id[1024]; [...1997 lines suppressed...] } - int main() { - toc_conn * conn; - char buff[] = "toc_send_im tsearle256 \"if you see this message send a message to tsearle256\""; - proxy_set_proxy( PROXY_NONE, "", 0 ); + toc_conn *conn; + char buff[] = + "toc_send_im tsearle256 \"if you see this message send a message to tsearle256\""; + proxy_set_proxy(PROXY_NONE, "", 0); conn = toc_signon("", ""); toc_im_in = toc_test_im_in; eb_input_add(conn->fd, EB_INPUT_READ, toc_callback_handler, conn); @@ -1699,4 +1616,3 @@ gtk_main(); } #endif - Index: libtoc.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-toc/libtoc/libtoc.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libtoc.h 22 May 2009 06:02:23 -0000 1.11 +++ libtoc.h 17 Sep 2009 12:04:58 -0000 1.12 @@ -24,76 +24,75 @@ #include <stdio.h> #include "llist.h" -typedef struct _toc_conn -{ - int fd; - int seq_num; - void * account; - char server[255]; - short port; - char *username; - char *password; - int input; +typedef struct _toc_conn { + int fd; + int seq_num; + void *account; + char server[255]; + short port; + char *username; + char *password; + int input; } toc_conn; -typedef struct _toc_file_conn -{ +typedef struct _toc_file_conn { char header1[7]; char header2[2048]; - int fd; + int fd; unsigned long amount; - FILE * file; - int handle; - int progress; + FILE *file; + int handle; + int progress; } toc_file_conn; -void (*toc_new_user)(toc_conn *conn, char * group, char * handle); -void (*toc_new_group)(char * group); -int (*toc_begin_file_receive)( const char * filename, unsigned long size ); -void (*toc_update_file_status)( int tag, unsigned long progress ); -void (*toc_complete_file_receive)( int tag ); -void (*toc_im_in)(toc_conn * conn, char * user, char * message ); -void (*toc_chat_im_in)(toc_conn * conn, char * id, char * user, char * message ); -void (*update_user_status)(toc_conn *conn, char * user, int online, time_t idle, int evil, int unavailable ); -void (*toc_error_message)(char * message); -void (*toc_disconnect)(toc_conn * conn); -void (*toc_chat_invite)(toc_conn * conn, char * id, char * name, - char * sender, char * message ); -void (*toc_join_ack)(toc_conn * conn, char * id, char * name); -void (*toc_join_error)(toc_conn * conn, char * name); -void (*toc_chat_update_buddy)(toc_conn * conn, char * id, - char * user, int online ); -void (*toc_file_offer)( toc_conn * conn, char * nick, char * ip, short port, - char * cookie, char * filename ); - -void (*toc_user_info)(toc_conn * conn, char * user, char * message ); -void (*toc_logged_in)(toc_conn *conn); -int (*toc_async_socket)(const char *host, int port, void *cb, void *data); - -void toc_callback( toc_conn * conn ); -int toc_signon( const char * username, const char * password, - const char * server, short port, const char * info ); -void toc_send_keep_alive( toc_conn * conn ); -void toc_signoff( toc_conn * conn ); -void toc_send_im( toc_conn * conn, const char * username, const char * message ); -void toc_get_info( toc_conn * conn, const char * user ); -void toc_add_buddies( toc_conn * conn, const char * group, LList * list ); -void toc_add_buddy( toc_conn * conn, char * user, const char * group ); -void toc_set_idle( toc_conn * conn, int idle ); -void toc_set_away( toc_conn * conn, const char * message); -void toc_invite( toc_conn * conn, const char * id, const char * buddy, const char * message ); -void toc_chat_join( toc_conn * conn, const char * chat_room_name ); -void toc_chat_send( toc_conn * conn, const char * id, const char * message); -void toc_chat_leave( toc_conn * conn, const char * id ); -void toc_chat_accept( toc_conn * conn, const char * id); -void toc_file_accept( toc_conn * conn, const char * nick, const char * ip, short port, - const char * cookie, const char * filename ); -void toc_file_cancel( toc_conn * conn, const char * nick, const char * cookie ); -void toc_talk_accept( toc_conn * conn, const char * nick, const char * ip, short port, - const char * cookie ); -void toc_remove_buddy( toc_conn * conn, const char * user, const char * group ); +void (*toc_new_user) (toc_conn *conn, char *group, char *handle); +void (*toc_new_group) (char *group); +int (*toc_begin_file_receive) (const char *filename, unsigned long size); +void (*toc_update_file_status) (int tag, unsigned long progress); +void (*toc_complete_file_receive) (int tag); +void (*toc_im_in) (toc_conn *conn, char *user, char *message); +void (*toc_chat_im_in) (toc_conn *conn, char *id, char *user, char *message); +void (*update_user_status) (toc_conn *conn, char *user, int online, time_t idle, + int evil, int unavailable); +void (*toc_error_message) (char *message); +void (*toc_disconnect) (toc_conn *conn); +void (*toc_chat_invite) (toc_conn *conn, char *id, char *name, + char *sender, char *message); +void (*toc_join_ack) (toc_conn *conn, char *id, char *name); +void (*toc_join_error) (toc_conn *conn, char *name); +void (*toc_chat_update_buddy) (toc_conn *conn, char *id, + char *user, int online); +void (*toc_file_offer) (toc_conn *conn, char *nick, char *ip, short port, + char *cookie, char *filename); + +void (*toc_user_info) (toc_conn *conn, char *user, char *message); +void (*toc_logged_in) (toc_conn *conn); +int (*toc_async_socket) (const char *host, int port, void *cb, void *data); + +void toc_callback(toc_conn *conn); +int toc_signon(const char *username, const char *password, + const char *server, short port, const char *info); +void toc_send_keep_alive(toc_conn *conn); +void toc_signoff(toc_conn *conn); +void toc_send_im(toc_conn *conn, const char *username, const char *message); +void toc_get_info(toc_conn *conn, const char *user); +void toc_add_buddies(toc_conn *conn, const char *group, LList *list); +void toc_add_buddy(toc_conn *conn, char *user, const char *group); +void toc_set_idle(toc_conn *conn, int idle); +void toc_set_away(toc_conn *conn, const char *message); +void toc_invite(toc_conn *conn, const char *id, const char *buddy, + const char *message); +void toc_chat_join(toc_conn *conn, const char *chat_room_name); +void toc_chat_send(toc_conn *conn, const char *id, const char *message); +void toc_chat_leave(toc_conn *conn, const char *id); +void toc_chat_accept(toc_conn *conn, const char *id); +void toc_file_accept(toc_conn *conn, const char *nick, const char *ip, + short port, const char *cookie, const char *filename); +void toc_file_cancel(toc_conn *conn, const char *nick, const char *cookie); +void toc_talk_accept(toc_conn *conn, const char *nick, const char *ip, + short port, const char *cookie); +void toc_remove_buddy(toc_conn *conn, const char *user, const char *group); void toc_add_group(toc_conn *conn, const char *group); void toc_remove_group(toc_conn *conn, const char *group); - #endif |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:39
|
Update of /cvsroot/ayttm/ayttm/modules/aim-oscar In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/aim-oscar Modified Files: aim-oscar.c Log Message: reformatted source code Index: aim-oscar.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/aim-oscar/aim-oscar.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- aim-oscar.c 6 Sep 2009 18:23:08 -0000 1.32 +++ aim-oscar.c 17 Sep 2009 12:04:57 -0000 1.33 @@ -72,25 +72,27 @@ ************************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info aim_oscar_LTX_plugin_info - #define SERVICE_INFO aim_oscar_LTX_SERVICE_INFO - #define plugin_init aim_oscar_LTX_plugin_init - #define plugin_finish aim_oscar_LTX_plugin_finish - #define module_version aim_oscar_LTX_module_version +#define plugin_info aim_oscar_LTX_plugin_info +#define SERVICE_INFO aim_oscar_LTX_SERVICE_INFO +#define plugin_init aim_oscar_LTX_plugin_init [...3427 lines suppressed...] + eb_aim_local_account_data *alad, aim_conn_t *conn) { LList *node; eb_chat_room *result = NULL; @@ -2568,12 +2649,13 @@ while (node) { ecr = (eb_chat_room *)node->data; - if (((struct oscar_chat_room *)ecr->protocol_local_chat_room_data)->conn == conn) { + if (((struct oscar_chat_room *)ecr-> + protocol_local_chat_room_data)->conn == conn) { result = ecr; break; } - node = l_list_next (node); + node = l_list_next(node); } return result; |
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:13
|
Update of /cvsroot/ayttm/ayttm/src/gtk In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/src/gtk Modified Files: about_window.c gtk_tree_view_tooltip.c gtk_tree_view_tooltip.h gtkspell.c gtkspell.h gtkutils.c gtkutils.h html_text_buffer.c html_text_buffer.h Log Message: reformatted source code Index: about_window.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/src/gtk/about_window.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- about_window.c 3 Aug 2007 20:38:41 -0000 1.2 +++ about_window.c 17 Sep 2009 12:05:02 -0000 1.3 @@ -20,10 +20,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - */ + */ #include <assert.h> - + #include "intl.h" #include "ui_about_window.h" @@ -31,7 +31,6 @@ #include "pixmaps/ayttmlogo.xpm" - /* the one and only about window */ static GtkWidget *sAboutWindow = NULL; @@ -39,170 +38,177 @@ Functions */ -static void destroy_about( void ) +static void destroy_about(void) { - if ( sAboutWindow != NULL ) - gtk_widget_destroy( sAboutWindow ); + if (sAboutWindow != NULL) + gtk_widget_destroy(sAboutWindow); sAboutWindow = NULL; } -static GtkTable *sMakeDeveloperTable( int inNumDevelopers, const tDeveloperInfo *inDevInfo ) +static GtkTable *sMakeDeveloperTable(int inNumDevelopers, + const tDeveloperInfo *inDevInfo) { - GtkTable *table = GTK_TABLE( gtk_table_new( inNumDevelopers, 3, FALSE ) ); - GtkLabel *label = NULL; - int i = 0; - - - for ( i = 0; i < inNumDevelopers; i++ ) - { - label = GTK_LABEL( gtk_label_new( inDevInfo[i].m_name ) ); - gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 ); - gtk_widget_show( GTK_WIDGET(label ) ); - gtk_table_attach( table, GTK_WIDGET( label ), 0, 1, i, i+1, GTK_FILL, GTK_FILL, 10, 0 ); - - label = GTK_LABEL( gtk_label_new( inDevInfo[i].m_email ) ); - gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 ); - gtk_widget_show( GTK_WIDGET( label ) ); - gtk_table_attach( table, GTK_WIDGET( label ), 1, 2, i, i+1, GTK_FILL, GTK_FILL, 10, 0 ); - - label = GTK_LABEL( gtk_label_new( inDevInfo[i].m_role ) ); - gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 ); - gtk_widget_show( GTK_WIDGET( label ) ); - gtk_table_attach(table, GTK_WIDGET( label ), 2, 3, i, i+1, GTK_FILL, GTK_FILL, 10, 0 ); + GtkTable *table = GTK_TABLE(gtk_table_new(inNumDevelopers, 3, FALSE)); + GtkLabel *label = NULL; + int i = 0; + + for (i = 0; i < inNumDevelopers; i++) { + label = GTK_LABEL(gtk_label_new(inDevInfo[i].m_name)); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_widget_show(GTK_WIDGET(label)); + gtk_table_attach(table, GTK_WIDGET(label), 0, 1, i, i + 1, + GTK_FILL, GTK_FILL, 10, 0); + + label = GTK_LABEL(gtk_label_new(inDevInfo[i].m_email)); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_widget_show(GTK_WIDGET(label)); + gtk_table_attach(table, GTK_WIDGET(label), 1, 2, i, i + 1, + GTK_FILL, GTK_FILL, 10, 0); + + label = GTK_LABEL(gtk_label_new(inDevInfo[i].m_role)); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_widget_show(GTK_WIDGET(label)); + gtk_table_attach(table, GTK_WIDGET(label), 2, 3, i, i + 1, + GTK_FILL, GTK_FILL, 10, 0); } - gtk_widget_show( GTK_WIDGET( table ) ); - - return( table ); -} + gtk_widget_show(GTK_WIDGET(table)); + return (table); +} -void ay_ui_about_window_create( const tAboutInfo *inAboutInfo ) +void ay_ui_about_window_create(const tAboutInfo *inAboutInfo) { - GtkWidget *logo = NULL; - GtkWidget *ok = NULL; - GtkLabel *label = NULL; - GtkTable *table = NULL; - GtkWidget *separator = NULL; - GtkBox *vbox = NULL; - GtkBox *vbox2 = NULL; - GtkStyle *style = NULL; - GdkPixbuf *pm = NULL; - GtkWidget *scroll = NULL; - + GtkWidget *logo = NULL; + GtkWidget *ok = NULL; + GtkLabel *label = NULL; + GtkTable *table = NULL; + GtkWidget *separator = NULL; + GtkBox *vbox = NULL; + GtkBox *vbox2 = NULL; + GtkStyle *style = NULL; + GdkPixbuf *pm = NULL; + GtkWidget *scroll = NULL; - if ( sAboutWindow != NULL ) - { + if (sAboutWindow != NULL) { gtk_widget_show(sAboutWindow); return; } - assert( inAboutInfo != NULL ); - + assert(inAboutInfo != NULL); + /* create the window and set some attributes */ - sAboutWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_realize( sAboutWindow ); - gtk_window_set_position( GTK_WINDOW(sAboutWindow), GTK_WIN_POS_MOUSE ); - gtk_window_set_resizable( GTK_WINDOW(sAboutWindow), FALSE ); - gtk_window_set_title( GTK_WINDOW(sAboutWindow), _("About Ayttm") ); - gtk_container_set_border_width( GTK_CONTAINER(sAboutWindow), 5 ); + sAboutWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_widget_realize(sAboutWindow); + gtk_window_set_position(GTK_WINDOW(sAboutWindow), GTK_WIN_POS_MOUSE); + gtk_window_set_resizable(GTK_WINDOW(sAboutWindow), FALSE); + gtk_window_set_title(GTK_WINDOW(sAboutWindow), _("About Ayttm")); + gtk_container_set_border_width(GTK_CONTAINER(sAboutWindow), 5); - vbox = GTK_BOX( gtk_vbox_new(FALSE, 0) ); - gtk_widget_show( GTK_WIDGET(vbox) ); + vbox = GTK_BOX(gtk_vbox_new(FALSE, 0)); + gtk_widget_show(GTK_WIDGET(vbox)); /* logo */ - style = gtk_widget_get_style( sAboutWindow ); - pm = gdk_pixbuf_new_from_xpm_data( (const char **)ayttmlogo_xpm ); + style = gtk_widget_get_style(sAboutWindow); + pm = gdk_pixbuf_new_from_xpm_data((const char **)ayttmlogo_xpm); - logo = gtk_image_new_from_pixbuf( pm ); - gtk_box_pack_start( vbox, logo, FALSE, FALSE, 5 ); - gtk_widget_show( logo ); + logo = gtk_image_new_from_pixbuf(pm); + gtk_box_pack_start(vbox, logo, FALSE, FALSE, 5); + gtk_widget_show(logo); /* version */ - label = GTK_LABEL(gtk_label_new( inAboutInfo->m_version )); - gtk_widget_show( GTK_WIDGET(label) ); + label = GTK_LABEL(gtk_label_new(inAboutInfo->m_version)); + gtk_widget_show(GTK_WIDGET(label)); gtk_box_pack_start(vbox, GTK_WIDGET(label), FALSE, FALSE, 5); /* separator */ separator = gtk_hseparator_new(); - gtk_widget_show( separator ); - gtk_box_pack_start( vbox, separator, FALSE, FALSE, 5 ); + gtk_widget_show(separator); + gtk_box_pack_start(vbox, separator, FALSE, FALSE, 5); /* scroll */ - scroll = gtk_scrolled_window_new( NULL, NULL ); - gtk_widget_show( scroll ); - gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC ); + scroll = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(scroll); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - vbox2 = GTK_BOX( gtk_vbox_new(FALSE, 0) ); - gtk_widget_show( GTK_WIDGET(vbox2) ); + vbox2 = GTK_BOX(gtk_vbox_new(FALSE, 0)); + gtk_widget_show(GTK_WIDGET(vbox2)); /* text */ - label = GTK_LABEL( gtk_label_new( _("Ayttm is brought to you by:") ) ); - gtk_label_set_justify( label, GTK_JUSTIFY_LEFT ); - gtk_misc_set_alignment( GTK_MISC(label), 0.0, 0.5 ); - gtk_widget_show( GTK_WIDGET(label) ); - gtk_box_pack_start( vbox2, GTK_WIDGET(label), TRUE, TRUE, 5 ); + label = GTK_LABEL(gtk_label_new(_("Ayttm is brought to you by:"))); + gtk_label_set_justify(label, GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_widget_show(GTK_WIDGET(label)); + gtk_box_pack_start(vbox2, GTK_WIDGET(label), TRUE, TRUE, 5); /* list of Ayttm developers */ - table = sMakeDeveloperTable( inAboutInfo->m_num_ay_developers, inAboutInfo->m_ay_developers ); - gtk_box_pack_start( vbox2, GTK_WIDGET(table), TRUE, TRUE, 5 ); + table = sMakeDeveloperTable(inAboutInfo->m_num_ay_developers, + inAboutInfo->m_ay_developers); + gtk_box_pack_start(vbox2, GTK_WIDGET(table), TRUE, TRUE, 5); /* separator */ separator = gtk_hseparator_new(); - gtk_widget_show( separator ); - gtk_box_pack_start( vbox2, separator, TRUE, TRUE, 5 ); + gtk_widget_show(separator); + gtk_box_pack_start(vbox2, separator, TRUE, TRUE, 5); /* text */ - label = GTK_LABEL( gtk_label_new( _("\"With a little help from\":") ) ); - gtk_label_set_justify( label, GTK_JUSTIFY_LEFT ); - gtk_misc_set_alignment( GTK_MISC(label), 0.0, 0.5 ); - gtk_widget_show( GTK_WIDGET(label) ); - gtk_box_pack_start( vbox2, GTK_WIDGET(label), TRUE, TRUE, 5 ); + label = GTK_LABEL(gtk_label_new(_("\"With a little help from\":"))); + gtk_label_set_justify(label, GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_widget_show(GTK_WIDGET(label)); + gtk_box_pack_start(vbox2, GTK_WIDGET(label), TRUE, TRUE, 5); /* list of kudos to people who've helped us */ - table = sMakeDeveloperTable( inAboutInfo->m_num_ay_kudos, inAboutInfo->m_ay_kudos ); - gtk_box_pack_start( vbox2, GTK_WIDGET(table), TRUE, TRUE, 5 ); + table = sMakeDeveloperTable(inAboutInfo->m_num_ay_kudos, + inAboutInfo->m_ay_kudos); + gtk_box_pack_start(vbox2, GTK_WIDGET(table), TRUE, TRUE, 5); /* separator */ separator = gtk_hseparator_new(); - gtk_widget_show( separator ); - gtk_box_pack_start( vbox2, separator, TRUE, TRUE, 5 ); + gtk_widget_show(separator); + gtk_box_pack_start(vbox2, separator, TRUE, TRUE, 5); /* another separator */ separator = gtk_hseparator_new(); - gtk_widget_show( separator ); - gtk_box_pack_start( vbox2, separator, TRUE, TRUE, 5 ); - + gtk_widget_show(separator); + gtk_box_pack_start(vbox2, separator, TRUE, TRUE, 5); + /* text */ - label = GTK_LABEL( gtk_label_new( _("Ayttm is based on Everybuddy 0.4.3 which was brought to you by:") ) ); - gtk_label_set_justify( label, GTK_JUSTIFY_LEFT ); - gtk_misc_set_alignment( GTK_MISC(label), 0.0, 0.5 ); - gtk_widget_show( GTK_WIDGET(label) ); - gtk_box_pack_start( vbox2, GTK_WIDGET(label), TRUE, TRUE, 5 ); + label = GTK_LABEL(gtk_label_new(_ + ("Ayttm is based on Everybuddy 0.4.3 which was brought to you by:"))); + gtk_label_set_justify(label, GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_widget_show(GTK_WIDGET(label)); + gtk_box_pack_start(vbox2, GTK_WIDGET(label), TRUE, TRUE, 5); /* list of Everybuddy developers */ - table = sMakeDeveloperTable( inAboutInfo->m_num_eb_developers, inAboutInfo->m_eb_developers ); - gtk_box_pack_start( vbox2, GTK_WIDGET(table), TRUE, TRUE, 5 ); + table = sMakeDeveloperTable(inAboutInfo->m_num_eb_developers, + inAboutInfo->m_eb_developers); + gtk_box_pack_start(vbox2, GTK_WIDGET(table), TRUE, TRUE, 5); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(scroll), GTK_WIDGET(vbox2) ); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), + GTK_WIDGET(vbox2)); - gtk_box_pack_start( vbox, GTK_WIDGET(scroll), TRUE, TRUE, 5 ); - - /* close button */ - ok = gtk_button_new_with_label( _("Close") ); - g_signal_connect_swapped( ok, "clicked", G_CALLBACK(destroy_about), sAboutWindow ); + gtk_box_pack_start(vbox, GTK_WIDGET(scroll), TRUE, TRUE, 5); - gtk_box_pack_start( vbox, ok, FALSE, FALSE, 0 ); - GTK_WIDGET_SET_FLAGS( ok, GTK_CAN_DEFAULT ); - gtk_widget_show( ok ); - - g_signal_connect_swapped(sAboutWindow, "destroy", G_CALLBACK(destroy_about), sAboutWindow); - - gtk_container_add( GTK_CONTAINER(sAboutWindow), GTK_WIDGET(vbox) ); - - gtk_widget_set_size_request( sAboutWindow, -1, 400 ); - gtk_widget_show( sAboutWindow ); - gtk_widget_grab_default( ok ); - gtk_widget_grab_focus( ok ); + /* close button */ + ok = gtk_button_new_with_label(_("Close")); + g_signal_connect_swapped(ok, "clicked", G_CALLBACK(destroy_about), + sAboutWindow); + + gtk_box_pack_start(vbox, ok, FALSE, FALSE, 0); + GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT); + gtk_widget_show(ok); + + g_signal_connect_swapped(sAboutWindow, "destroy", + G_CALLBACK(destroy_about), sAboutWindow); + + gtk_container_add(GTK_CONTAINER(sAboutWindow), GTK_WIDGET(vbox)); + + gtk_widget_set_size_request(sAboutWindow, -1, 400); + gtk_widget_show(sAboutWindow); + gtk_widget_grab_default(ok); + gtk_widget_grab_focus(ok); } Index: gtk_tree_view_tooltip.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtk_tree_view_tooltip.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtk_tree_view_tooltip.c 24 Aug 2009 13:19:43 -0000 1.7 +++ gtk_tree_view_tooltip.c 17 Sep 2009 12:05:03 -0000 1.8 @@ -24,7 +24,8 @@ #include <gtk/gtk.h> /* Initialize the GtkTreeViewTooltipClass */ -static void gtk_tree_view_tooltip_class_init(GtkTreeViewTooltipClass *tooltipclass) +static void gtk_tree_view_tooltip_class_init(GtkTreeViewTooltipClass + *tooltipclass) { return; } @@ -32,42 +33,42 @@ /* Initialize a GtkTreeViewTooltip instance */ void gtk_tree_view_tooltip_init(GtkTreeViewTooltip *tooltip) { - tooltip->window = NULL; - tooltip->tip_icon = NULL; - tooltip->tip_title_label = NULL; - tooltip->tip_tiptext_label = NULL; - - tooltip->tip_flag_column = -1; - tooltip->icon_column = -1; - tooltip->title_column = -1; - tooltip->tiptext_column = -1; - tooltip->source = 0; - - tooltip->treeview = NULL; - tooltip->active_path = NULL; - tooltip->enable_tips = FALSE; + tooltip->window = NULL; + tooltip->tip_icon = NULL; + tooltip->tip_title_label = NULL; + tooltip->tip_tiptext_label = NULL; + + tooltip->tip_flag_column = -1; + tooltip->icon_column = -1; + tooltip->title_column = -1; + tooltip->tiptext_column = -1; + tooltip->source = 0; + + tooltip->treeview = NULL; + tooltip->active_path = NULL; + tooltip->enable_tips = FALSE; } /* Closes the tooltip window */ void gtk_tree_view_tooltip_reset(GtkTreeViewTooltip *tooltip) { - g_return_if_fail(tooltip!=NULL); + g_return_if_fail(tooltip != NULL); - if(tooltip->source) { + if (tooltip->source) { g_source_remove(tooltip->source); g_free(tooltip->data); tooltip->source = 0; } - if(tooltip->window && GTK_WIDGET_VISIBLE(tooltip->window)) + if (tooltip->window && GTK_WIDGET_VISIBLE(tooltip->window)) gtk_widget_destroy(tooltip->window); - tooltip->window = NULL; - tooltip->tip_icon = NULL; - tooltip->tip_title_label = NULL; - tooltip->tip_tiptext_label = NULL; + tooltip->window = NULL; + tooltip->tip_icon = NULL; + tooltip->tip_title_label = NULL; + tooltip->tip_tiptext_label = NULL; - tooltip->enable_tips = FALSE; + tooltip->enable_tips = FALSE; } /* Shows the tooltip window */ @@ -90,28 +91,32 @@ g_free(data); /* We don't need to re-create it if it already exists, just update it in that case */ - if(!tooltip->window) { + if (!tooltip->window) { hbox = gtk_hbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0); - + iconwid = gtk_image_new_from_pixbuf(tooltip->tip_icon); gtk_widget_show(iconwid); - - gtk_box_pack_start(GTK_BOX(vbox), tooltip->tip_title_label, TRUE, FALSE, 2); - gtk_box_pack_end(GTK_BOX(vbox), tooltip->tip_tiptext_label, TRUE, FALSE, 2); - + + gtk_box_pack_start(GTK_BOX(vbox), tooltip->tip_title_label, + TRUE, FALSE, 2); + gtk_box_pack_end(GTK_BOX(vbox), tooltip->tip_tiptext_label, + TRUE, FALSE, 2); + gtk_widget_show(tooltip->tip_title_label); gtk_widget_show(tooltip->tip_tiptext_label); gtk_widget_show(vbox); - + gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 5); gtk_box_pack_end(GTK_BOX(hbox), vbox, TRUE, TRUE, 5); gtk_widget_show(hbox); tooltip->window = gtk_window_new(GTK_WINDOW_POPUP); - gtk_window_set_type_hint(GTK_WINDOW(tooltip->window), GDK_WINDOW_TYPE_HINT_TOOLTIP); + gtk_window_set_type_hint(GTK_WINDOW(tooltip->window), + GDK_WINDOW_TYPE_HINT_TOOLTIP); gtk_container_add(GTK_CONTAINER(tooltip->window), hbox); - gtk_container_set_border_width(GTK_CONTAINER(tooltip->window), 5); + gtk_container_set_border_width(GTK_CONTAINER(tooltip->window), + 5); gtk_window_set_resizable(GTK_WINDOW(tooltip->window), FALSE); } gtk_window_move(GTK_WINDOW(tooltip->window), x, y); @@ -124,14 +129,16 @@ } /* All the funny stuff happens here... showing and hiding of the tooltip and all that */ -static void treeview_tooltip_event_handler(GtkTreeView *treeview, GdkEvent *event, gpointer data) +static void treeview_tooltip_event_handler(GtkTreeView *treeview, + GdkEvent *event, gpointer data) { GtkTreeViewTooltip *tooltip = GTK_TREE_VIEW_TOOLTIP(data); - - if((tooltip->icon_column == -1 && tooltip->title_column == -1 && tooltip->tiptext_column == -1)) + + if ((tooltip->icon_column == -1 && tooltip->title_column == -1 + && tooltip->tiptext_column == -1)) return; - - switch(event->type) { + + switch (event->type) { case GDK_LEAVE_NOTIFY: case GDK_BUTTON_PRESS: case GDK_BUTTON_RELEASE: @@ -141,96 +148,109 @@ gtk_tree_view_tooltip_reset(tooltip); return; case GDK_MOTION_NOTIFY: - { - GtkTreePath *path; - gchar *title = NULL; - GdkPixbuf *icon = NULL; - gchar *tiptext = NULL; - GdkRectangle rect; - int x, y, wx, wy; - gboolean tips_enabled; - CoordData *cdata = NULL; - - GtkTreeIter iter; - GtkTreeModel *model = gtk_tree_view_get_model(treeview); - GdkEventMotion *eventmotion = (GdkEventMotion *)event; - - /* Are we over a valid row at all? */ - if(!gtk_tree_view_get_path_at_pos(treeview, - eventmotion->x, eventmotion->y, - &path, NULL, - NULL, NULL)) - { - return; - } - - /* Have we moved on to the next row? */ - if(tooltip->active_path && - !gtk_tree_path_compare(tooltip->active_path, path)) { - return; - } - - gtk_tree_view_tooltip_reset(tooltip); + GtkTreePath *path; + gchar *title = NULL; + GdkPixbuf *icon = NULL; + gchar *tiptext = NULL; + GdkRectangle rect; + int x, y, wx, wy; + gboolean tips_enabled; + CoordData *cdata = NULL; + + GtkTreeIter iter; + GtkTreeModel *model = gtk_tree_view_get_model(treeview); + GdkEventMotion *eventmotion = (GdkEventMotion *)event; + + /* Are we over a valid row at all? */ + if (!gtk_tree_view_get_path_at_pos(treeview, + eventmotion->x, eventmotion->y, + &path, NULL, NULL, NULL)) { + return; + } - gtk_tree_path_free(tooltip->active_path); - tooltip->active_path = gtk_tree_path_copy(path); - gtk_tree_path_free(path); - - gtk_tree_model_get_iter(model, &iter, tooltip->active_path); - if(tooltip->tip_flag_column!=-1) { - gtk_tree_model_get(model, &iter, - tooltip->tip_flag_column, &tips_enabled, -1); - - if(!tips_enabled) + /* Have we moved on to the next row? */ + if (tooltip->active_path && + !gtk_tree_path_compare(tooltip->active_path, + path)) { return; - } - if(tooltip->icon_column!=-1) { - gtk_tree_model_get(model, &iter, - tooltip->icon_column, &icon, -1); - tooltip->tip_icon = icon; - } - if(tooltip->title_column!=-1) { - gchar *markup; + } - gtk_tree_model_get(model, &iter, - tooltip->title_column, &title, -1); - - if(!tooltip->tip_title_label) - tooltip->tip_title_label = gtk_label_new(NULL); - - markup = g_markup_printf_escaped("<span size=\'large\'><b>%s</b></span>", title); - gtk_label_set_markup(GTK_LABEL(tooltip->tip_title_label), markup); - } - if(tooltip->tiptext_column!=-1) { - gtk_tree_model_get(model, &iter, - tooltip->tiptext_column, &tiptext, -1); - - if(!tooltip->tip_tiptext_label) { - tooltip->tip_tiptext_label = gtk_label_new(NULL); - gtk_label_set_line_wrap(GTK_LABEL(tooltip->tip_tiptext_label), TRUE); + gtk_tree_view_tooltip_reset(tooltip); + + gtk_tree_path_free(tooltip->active_path); + tooltip->active_path = gtk_tree_path_copy(path); + gtk_tree_path_free(path); + + gtk_tree_model_get_iter(model, &iter, + tooltip->active_path); + if (tooltip->tip_flag_column != -1) { + gtk_tree_model_get(model, &iter, + tooltip->tip_flag_column, &tips_enabled, + -1); + + if (!tips_enabled) + return; + } + if (tooltip->icon_column != -1) { + gtk_tree_model_get(model, &iter, + tooltip->icon_column, &icon, -1); + tooltip->tip_icon = icon; + } + if (tooltip->title_column != -1) { + gchar *markup; + + gtk_tree_model_get(model, &iter, + tooltip->title_column, &title, -1); + + if (!tooltip->tip_title_label) + tooltip->tip_title_label = + gtk_label_new(NULL); + + markup = g_markup_printf_escaped + ("<span size=\'large\'><b>%s</b></span>", + title); + gtk_label_set_markup(GTK_LABEL(tooltip-> + tip_title_label), markup); } - - gtk_label_set_markup(GTK_LABEL(tooltip->tip_tiptext_label), tiptext); + if (tooltip->tiptext_column != -1) { + gtk_tree_model_get(model, &iter, + tooltip->tiptext_column, &tiptext, -1); + + if (!tooltip->tip_tiptext_label) { + tooltip->tip_tiptext_label = + gtk_label_new(NULL); + gtk_label_set_line_wrap(GTK_LABEL + (tooltip->tip_tiptext_label), + TRUE); + } + + gtk_label_set_markup(GTK_LABEL(tooltip-> + tip_tiptext_label), tiptext); + } + + /* Now to get the coordinates of the popup */ + gtk_tree_view_get_cell_area(treeview, + tooltip->active_path, NULL, &rect); + gtk_tree_view_tree_to_widget_coords(treeview, rect.x, + rect.y, &wx, &wy); + + y = eventmotion->y_root + rect.height - eventmotion->y + + rect.y; + x = eventmotion->x_root - eventmotion->x + + rect.width / 2; + + cdata = g_new0(CoordData, 1); + cdata->tooltip = tooltip; + cdata->x = x; + cdata->y = y; + + tooltip->data = cdata; + + tooltip->source = + g_timeout_add(1000, tooltip_show_tip, cdata); + return; } - - /* Now to get the coordinates of the popup */ - gtk_tree_view_get_cell_area(treeview, tooltip->active_path, NULL, &rect); - gtk_tree_view_tree_to_widget_coords(treeview, rect.x, rect.y, &wx, &wy); - - y = eventmotion->y_root + rect.height - eventmotion->y + rect.y; - x = eventmotion->x_root - eventmotion->x + rect.width/2; - - cdata = g_new0(CoordData, 1); - cdata->tooltip = tooltip; - cdata->x = x; - cdata->y = y; - - tooltip->data = cdata; - - tooltip->source = g_timeout_add(1000, tooltip_show_tip, cdata); - return; - } default: return; @@ -244,16 +264,14 @@ gtk_tree_view_tooltip_reset(tooltip); } - /********* Public Functions **********/ -GType gtk_tree_view_tooltip_get_type (void) +GType gtk_tree_view_tooltip_get_type(void) { static GType treeview_tooltip_type = 0; - if( !treeview_tooltip_type ) { - static const GTypeInfo treeview_tooltip_info = - { + if (!treeview_tooltip_type) { + static const GTypeInfo treeview_tooltip_info = { sizeof(GtkTreeViewTooltipClass), NULL, NULL, @@ -266,24 +284,20 @@ }; treeview_tooltip_type = g_type_register_static(G_TYPE_OBJECT, - "GtkTreeViewTooltip", - &treeview_tooltip_info, - 0); + "GtkTreeViewTooltip", &treeview_tooltip_info, 0); } return treeview_tooltip_type; } - - GtkTreeViewTooltip *gtk_tree_view_tooltip_new(void) { - return GTK_TREE_VIEW_TOOLTIP( g_object_new(GTK_TREE_VIEW_TOOLTIP_TYPE, NULL) ); + return GTK_TREE_VIEW_TOOLTIP(g_object_new(GTK_TREE_VIEW_TOOLTIP_TYPE, + NULL)); } - - -GtkTreeViewTooltip *gtk_tree_view_tooltip_new_for_treeview(GtkTreeView *treeview) +GtkTreeViewTooltip *gtk_tree_view_tooltip_new_for_treeview(GtkTreeView + *treeview) { GtkTreeViewTooltip *tooltip = gtk_tree_view_tooltip_new(); gtk_tree_view_tooltip_set_treeview(tooltip, treeview); @@ -291,27 +305,28 @@ return tooltip; } - - -void gtk_tree_view_tooltip_set_treeview(GtkTreeViewTooltip *tooltip, GtkTreeView *treeview) +void gtk_tree_view_tooltip_set_treeview(GtkTreeViewTooltip *tooltip, + GtkTreeView *treeview) { - g_return_if_fail(tooltip!=NULL); + g_return_if_fail(tooltip != NULL); tooltip->treeview = treeview; - if(!treeview) + if (!treeview) return; - g_signal_connect_after(treeview, "event-after", G_CALLBACK(treeview_tooltip_event_handler), tooltip); - g_signal_connect(treeview, "unmap", G_CALLBACK(treeview_tooltip_unmap), tooltip); - g_signal_connect(treeview, "unrealize", G_CALLBACK(treeview_tooltip_unmap), tooltip); - g_signal_connect(treeview, "destroy", G_CALLBACK(treeview_tooltip_unmap), tooltip); + g_signal_connect_after(treeview, "event-after", + G_CALLBACK(treeview_tooltip_event_handler), tooltip); + g_signal_connect(treeview, "unmap", G_CALLBACK(treeview_tooltip_unmap), + tooltip); + g_signal_connect(treeview, "unrealize", + G_CALLBACK(treeview_tooltip_unmap), tooltip); + g_signal_connect(treeview, "destroy", + G_CALLBACK(treeview_tooltip_unmap), tooltip); } - - -void gtk_tree_view_tooltip_set_tip_columns(GtkTreeViewTooltip *tooltip, gint tip_flag_col, gint icon_col, - gint title_col, gint tiptext_col) +void gtk_tree_view_tooltip_set_tip_columns(GtkTreeViewTooltip *tooltip, + gint tip_flag_col, gint icon_col, gint title_col, gint tiptext_col) { tooltip->tip_flag_column = tip_flag_col; tooltip->icon_column = icon_col; @@ -319,31 +334,22 @@ tooltip->tiptext_column = tiptext_col; } - - gint gtk_tree_view_tooltip_get_tip_icon_column(GtkTreeViewTooltip *tooltip) { return tooltip->icon_column; } - - gint gtk_tree_view_tooltip_get_tip_title_column(GtkTreeViewTooltip *tooltip) { return tooltip->title_column; } - - gint gtk_tree_view_tooltip_get_tip_text_column(GtkTreeViewTooltip *tooltip) { return tooltip->tiptext_column; } - - gint gtk_tree_view_tooltip_get_tip_flag_column(GtkTreeViewTooltip *tooltip) { return tooltip->tip_flag_column; } - Index: gtk_tree_view_tooltip.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtk_tree_view_tooltip.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gtk_tree_view_tooltip.h 24 Aug 2009 13:19:43 -0000 1.4 +++ gtk_tree_view_tooltip.h 17 Sep 2009 12:05:03 -0000 1.5 @@ -21,7 +21,6 @@ * */ - #ifndef __GTK_TREE_VIEW_TOOLTIP__ #define __GTK_TREE_VIEW_TOOLTIP__ @@ -33,18 +32,15 @@ #include <gdk-pixbuf/gdk-pixbuf.h> G_BEGIN_DECLS - #define GTK_TREE_VIEW_TOOLTIP_TYPE (gtk_tree_view_tooltip_get_type ()) #define GTK_TREE_VIEW_TOOLTIP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TREE_VIEW_TOOLTIP_TYPE, GtkTreeViewTooltip)) #define GTK_TREE_VIEW_TOOLTIP_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST ((cls), GTK_TREE_VIEW_TOOLTIP_TYPE, GtkTreeViewTooltipClass)) #define GTK_IS_TREE_VIEW_TOOLTIP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TREE_VIEW_TOOLTIP_TYPE)) #define GTK_IS_TREE_VIEW_TOOLTIP_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE ((cls), GTK_TREE_VIEW_TOOLTIP_TYPE)) +typedef struct _GtkTreeViewTooltip GtkTreeViewTooltip; +typedef struct _GtkTreeViewTooltipClass GtkTreeViewTooltipClass; -typedef struct _GtkTreeViewTooltip GtkTreeViewTooltip; -typedef struct _GtkTreeViewTooltipClass GtkTreeViewTooltipClass; - -struct _GtkTreeViewTooltip -{ +struct _GtkTreeViewTooltip { GObject parent; GtkWidget *window; @@ -65,20 +61,19 @@ gpointer data; }; -struct _GtkTreeViewTooltipClass -{ +struct _GtkTreeViewTooltipClass { GObjectClass parent_class; }; /* * Get the type number of GtkTreeViewTooltip as registered with GLib */ -GType gtk_tree_view_tooltip_get_type (); +GType gtk_tree_view_tooltip_get_type(); /* * Create a new GtkTreeViewTooltip */ -GtkTreeViewTooltip* gtk_tree_view_tooltip_new (void); +GtkTreeViewTooltip *gtk_tree_view_tooltip_new(void); /* * Create a new GtkTreeViewTooltip for a given tree view object @@ -86,7 +81,8 @@ * Arguments: * @ treeview: The GtkTreeView to which the newly created tooltip must attach */ -GtkTreeViewTooltip* gtk_tree_view_tooltip_new_for_treeview (GtkTreeView *treeview); +GtkTreeViewTooltip *gtk_tree_view_tooltip_new_for_treeview(GtkTreeView + *treeview); /* * Attach the tooltip object to a tree view @@ -95,7 +91,8 @@ * @ tooltip: The GtkTreeViewTooltip object * @ treeview: The GtkTreeView object to which tooltip must attach */ -void gtk_tree_view_tooltip_set_treeview (GtkTreeViewTooltip *tooltip, GtkTreeView *treeview); +void gtk_tree_view_tooltip_set_treeview(GtkTreeViewTooltip *tooltip, + GtkTreeView *treeview); /* * Set the columns on the tree model from which the tooltip should read its data. @@ -108,30 +105,28 @@ * @ title_col: Column number for the bold title of the tip * @ tiptext_col: Column number for the detailed tip */ -void gtk_tree_view_tooltip_set_tip_columns (GtkTreeViewTooltip *tooltip, gint tip_flag_col, gint icon_col, - gint title_col, gint tiptext_col); +void gtk_tree_view_tooltip_set_tip_columns(GtkTreeViewTooltip *tooltip, + gint tip_flag_col, gint icon_col, gint title_col, gint tiptext_col); /* * Returns the column number for the tip flag */ -gint gtk_tree_view_tooltip_get_tip_flag_column (GtkTreeViewTooltip *tooltip); +gint gtk_tree_view_tooltip_get_tip_flag_column(GtkTreeViewTooltip *tooltip); /* * Returns the column number for the tip icon */ -gint gtk_tree_view_tooltip_get_tip_icon_column (GtkTreeViewTooltip *tooltip); +gint gtk_tree_view_tooltip_get_tip_icon_column(GtkTreeViewTooltip *tooltip); /* * Returns the column number for the tip title */ -gint gtk_tree_view_tooltip_get_tip_title_column (GtkTreeViewTooltip *tooltip); +gint gtk_tree_view_tooltip_get_tip_title_column(GtkTreeViewTooltip *tooltip); /* * Returns the column number for the tip text */ -gint gtk_tree_view_tooltip_get_tip_text_column (GtkTreeViewTooltip *tooltip); - +gint gtk_tree_view_tooltip_get_tip_text_column(GtkTreeViewTooltip *tooltip); G_END_DECLS -#endif /*End __GTK_TREE_VIEW_TOOLTIP__*/ - +#endif /*End __GTK_TREE_VIEW_TOOLTIP__ */ Index: gtkspell.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtkspell.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkspell.c 26 Aug 2009 09:26:14 -0000 1.8 +++ gtkspell.c 17 Sep 2009 12:05:03 -0000 1.9 @@ -31,7 +31,6 @@ #include "util.h" #include "platform_defs.h" - /* size of the text buffer used in various word-processing routines. */ #define BUFSIZE 1024 /* number of suggestions to display on each menu. */ @@ -44,8 +43,7 @@ GtkTextTag *error_tag = NULL; - -static gboolean iswordsep(char c) +static gboolean iswordsep(char c) { return !isalpha(c) && c != '\''; } @@ -53,47 +51,48 @@ /* * Gets the text and boundaries of the word under a given position */ -static gboolean get_word_from_pos(GtkTextBuffer* gtktext, GtkTextIter pos, char* buf, - GtkTextIter *pstart,GtkTextIter *pend) +static gboolean get_word_from_pos(GtkTextBuffer *gtktext, GtkTextIter pos, + char *buf, GtkTextIter *pstart, GtkTextIter *pend) { GtkTextIter word_start, word_end; gchar *tmp; - if( !gtk_text_iter_inside_word(&pos) && gtk_text_iter_get_char(&pos)!='\'' ) + if (!gtk_text_iter_inside_word(&pos) + && gtk_text_iter_get_char(&pos) != '\'') return FALSE; /* Get the end iter */ word_end = pos; - if( !gtk_text_iter_forward_word_end(&word_end) ) + if (!gtk_text_iter_forward_word_end(&word_end)) return FALSE; - if( gtk_text_iter_get_char(&word_end) == '\'' ) { + if (gtk_text_iter_get_char(&word_end) == '\'') { gtk_text_iter_forward_char(&word_end); - if(g_unichar_isalpha(gtk_text_iter_get_char(&word_end))) { - if(!gtk_text_iter_forward_word_end(&word_end)) + if (g_unichar_isalpha(gtk_text_iter_get_char(&word_end))) { + if (!gtk_text_iter_forward_word_end(&word_end)) return FALSE; } } - if(pend) + if (pend) *pend = word_end; /* Get the word start iter */ word_start = pos; - if( !gtk_text_iter_backward_word_start(&word_start) ) + if (!gtk_text_iter_backward_word_start(&word_start)) return FALSE; - if( gtk_text_iter_get_char(&word_start) == '\'' ) { + if (gtk_text_iter_get_char(&word_start) == '\'') { gtk_text_iter_backward_char(&word_start); - if(g_unichar_isalpha( gtk_text_iter_get_char(&word_start) )) { - if(!gtk_text_iter_backward_word_start(&word_start)) + if (g_unichar_isalpha(gtk_text_iter_get_char(&word_start))) { + if (!gtk_text_iter_backward_word_start(&word_start)) return FALSE; } } - if(pstart) + if (pstart) *pstart = word_start; gtk_text_iter_forward_char(&word_end); @@ -107,11 +106,12 @@ /* * Gets word under the cursor */ -static gboolean get_curword(GtkTextBuffer* buffer, char* buf, - GtkTextIter *pstart, GtkTextIter *pend) +static gboolean get_curword(GtkTextBuffer *buffer, char *buf, + GtkTextIter *pstart, GtkTextIter *pend) { GtkTextIter iter; - gtk_text_buffer_get_iter_at_mark(buffer, &iter, gtk_text_buffer_get_insert(buffer)); + gtk_text_buffer_get_iter_at_mark(buffer, &iter, + gtk_text_buffer_get_insert(buffer)); return get_word_from_pos(buffer, iter, buf, pstart, pend); } @@ -119,11 +119,11 @@ /* * Check word under the cursor and mark it if its spelling is incorrect */ -static gboolean check_at(GtkTextBuffer *gtktext, GtkTextIter *from_pos) +static gboolean check_at(GtkTextBuffer *gtktext, GtkTextIter *from_pos) { GtkTextIter start, end; - char buf[BUFSIZE]={0}; + char buf[BUFSIZE] = { 0 }; if (!get_word_from_pos(gtktext, *from_pos, buf, &start, &end)) { return FALSE; @@ -132,7 +132,7 @@ if (ay_spell_check(buf)) { gtk_text_buffer_remove_tag(gtktext, error_tag, &start, &end); return FALSE; - } else { + } else { gtk_text_buffer_apply_tag(gtktext, error_tag, &start, &end); return TRUE; } @@ -141,22 +141,20 @@ /* * Check the entire buffer and mark spelling erors */ -void gtkspell_check_all(GtkTextBuffer *gtktext) +void gtkspell_check_all(GtkTextBuffer *gtktext) { GtkTextIter pos; GtkTextIter end; gtk_text_buffer_get_bounds(gtktext, &pos, &end); - - while ( gtk_text_iter_compare(&pos, &end) < 0 ) { - while ( gtk_text_iter_compare(&pos, &end) <0 && - iswordsep(gtk_text_iter_get_char(&pos))) - { + + while (gtk_text_iter_compare(&pos, &end) < 0) { + while (gtk_text_iter_compare(&pos, &end) < 0 && + iswordsep(gtk_text_iter_get_char(&pos))) { gtk_text_iter_forward_char(&pos); } - while ( gtk_text_iter_compare(&pos, &end) <0 && - !iswordsep(gtk_text_iter_get_char(&pos))) - { + while (gtk_text_iter_compare(&pos, &end) < 0 && + !iswordsep(gtk_text_iter_get_char(&pos))) { gtk_text_iter_forward_char(&pos); } gtk_text_iter_backward_char(&pos); @@ -168,16 +166,19 @@ * Text insert callback */ static void entry_insert_cb(GtkTextBuffer *gtktext, GtkTextIter *ppos, - gchar *newtext, guint len, gpointer d) + gchar *newtext, guint len, gpointer d) { GtkTextIter end; - g_signal_handlers_block_by_func(gtktext, G_CALLBACK(entry_insert_cb), NULL); + g_signal_handlers_block_by_func(gtktext, G_CALLBACK(entry_insert_cb), + NULL); gtk_text_buffer_insert_at_cursor(gtktext, newtext, len); - g_signal_handlers_unblock_by_func(gtktext, G_CALLBACK(entry_insert_cb), NULL); + g_signal_handlers_unblock_by_func(gtktext, G_CALLBACK(entry_insert_cb), + NULL); g_signal_stop_emission_by_name(gtktext, "insert-text"); - gtk_text_buffer_get_iter_at_mark(gtktext, ppos, gtk_text_buffer_get_insert(gtktext)); + gtk_text_buffer_get_iter_at_mark(gtktext, ppos, + gtk_text_buffer_get_insert(gtktext)); gtk_text_buffer_get_end_iter(gtktext, &end); if (iswordsep(newtext[0])) { @@ -189,7 +190,8 @@ } /* did we just split a word? */ - if (gtk_text_iter_get_offset(ppos) < gtk_text_iter_get_offset(&end)) { + if (gtk_text_iter_get_offset(ppos) < + gtk_text_iter_get_offset(&end)) { gtk_text_iter_forward_char(ppos); check_at(gtktext, ppos); gtk_text_iter_backward_char(ppos); @@ -198,9 +200,9 @@ /* check as they type, *except* if they're typing at the end (the most * common case. */ - if (gtk_text_iter_get_offset(ppos) < gtk_text_iter_get_offset(&end) && - !iswordsep(gtk_text_iter_get_char(ppos))) - { + if (gtk_text_iter_get_offset(ppos) < + gtk_text_iter_get_offset(&end) + && !iswordsep(gtk_text_iter_get_char(ppos))) { gtk_text_iter_backward_char(ppos); check_at(gtktext, ppos); gtk_text_iter_forward_char(ppos); @@ -213,7 +215,7 @@ * Text delete callback */ static void entry_delete_cb(GtkTextBuffer *gtktext, - GtkTextIter *start, GtkTextIter *end, gpointer d) + GtkTextIter *start, GtkTextIter *end, gpointer d) { check_at(gtktext, start); } @@ -221,13 +223,13 @@ /* * Replace word with selected spelling suggestion */ -static void replace_word(GtkWidget *w, gpointer d) +static void replace_word(GtkWidget *w, gpointer d) { GtkTextIter start, end; int newword_len; const gchar *newword; - char buf[BUFSIZE]={0}; + char buf[BUFSIZE] = { 0 }; int offset; /* we don't save their position, @@ -241,22 +243,25 @@ newword_len = strlen(newword); gtk_text_buffer_delete(GTK_TEXT_BUFFER(d), &start, &end); - + gtk_text_buffer_get_iter_at_offset(GTK_TEXT_BUFFER(d), &start, offset); gtk_text_buffer_place_cursor(GTK_TEXT_BUFFER(d), &start); - gtk_text_buffer_insert(GTK_TEXT_BUFFER(d), &start, newword, newword_len); + gtk_text_buffer_insert(GTK_TEXT_BUFFER(d), &start, newword, + newword_len); } /* * Add spelling suggestions into a menu. */ -static GtkMenu *make_menu(GList *l, GtkTextBuffer *gtktext) +static GtkMenu *make_menu(GList *l, GtkTextBuffer *gtktext) { GtkWidget *menu, *item; char *caption; - menu = gtk_menu_new(); + menu = gtk_menu_new(); { - caption = g_strdup_printf(_("Not in dictionary: %s"), (char*)l->data); + caption = + g_strdup_printf(_("Not in dictionary: %s"), + (char *)l->data); item = gtk_menu_item_new_with_label(caption); /* I'd like to make it so this item is never selectable, like * the menu titles in the GNOME panel... unfortunately, the GNOME @@ -270,7 +275,8 @@ l = l->next; if (l == NULL) { - item = gtk_menu_item_new_with_label(_("(no suggestions)")); + item = gtk_menu_item_new_with_label(_ + ("(no suggestions)")); gtk_widget_show(item); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); } else { @@ -280,24 +286,32 @@ if (l->data == NULL && l->next != NULL) { count = 0; curmenu = gtk_menu_new(); - item = gtk_menu_item_new_with_label(_("Other Possibilities...")); + item = gtk_menu_item_new_with_label(_ + ("Other Possibilities...")); gtk_widget_show(item); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), curmenu); - gtk_menu_shell_append(GTK_MENU_SHELL(curmenu), item); + gtk_menu_item_set_submenu(GTK_MENU_ITEM + (item), curmenu); + gtk_menu_shell_append(GTK_MENU_SHELL + (curmenu), item); l = l->next; } else if (count > MENUCOUNT) { count -= MENUCOUNT; - item = gtk_menu_item_new_with_label("More..."); + item = gtk_menu_item_new_with_label + ("More..."); gtk_widget_show(item); - gtk_menu_shell_append(GTK_MENU_SHELL(curmenu), item); + gtk_menu_shell_append(GTK_MENU_SHELL + (curmenu), item); curmenu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), curmenu); + gtk_menu_item_set_submenu(GTK_MENU_ITEM + (item), curmenu); } - item = gtk_menu_item_new_with_label((char*)l->data); + item = gtk_menu_item_new_with_label((char *)l-> + data); g_signal_connect(item, "activate", - G_CALLBACK(replace_word), gtktext); + G_CALLBACK(replace_word), gtktext); gtk_widget_show(item); - gtk_menu_shell_append(GTK_MENU_SHELL(curmenu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(curmenu), + item); count++; } while ((l = l->next) != NULL); } @@ -308,80 +322,84 @@ /* * Position the popup menu at the cursor */ -void position_popup_menu(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) +void position_popup_menu(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, + gpointer data) { GdkEventButton *eb = data; - if(eb) { + if (eb) { *x = eb->x_root; *y = eb->y_root; - } - else { + } else { GdkRectangle location; GtkTextIter cur_pos; int wx, wy; - GtkTextView *text_view = g_object_get_data(G_OBJECT(menu), "parent_textview"); + GtkTextView *text_view = + g_object_get_data(G_OBJECT(menu), "parent_textview"); GtkTextBuffer *gtktext = gtk_text_view_get_buffer(text_view); - GdkWindow *parent = gtk_widget_get_parent_window(GTK_WIDGET(text_view)); + GdkWindow *parent = + gtk_widget_get_parent_window(GTK_WIDGET(text_view)); gdk_window_get_position(parent, &wx, &wy); gtk_text_buffer_get_iter_at_mark(gtktext, &cur_pos, - gtk_text_buffer_get_insert(gtktext)); + gtk_text_buffer_get_insert(gtktext)); gtk_text_view_get_iter_location(text_view, &cur_pos, &location); - gtk_text_view_buffer_to_window_coords(text_view, GTK_TEXT_WINDOW_WIDGET, - location.x, location.y, x, y); + gtk_text_view_buffer_to_window_coords(text_view, + GTK_TEXT_WINDOW_WIDGET, location.x, location.y, x, y); - *x += GTK_WIDGET(text_view)->allocation.x + wx + location.width/2; - *y += GTK_WIDGET(text_view)->allocation.y + wy + location.height/2; + *x += GTK_WIDGET(text_view)->allocation.x + wx + + location.width / 2; + *y += GTK_WIDGET(text_view)->allocation.y + wy + + location.height / 2; } } /* * Popup a menu filled with spelling suggestions */ -static void popup_menu(GtkTextView *text_view, GdkEventButton *eb) +static void popup_menu(GtkTextView *text_view, GdkEventButton *eb) { - char buf[BUFSIZE]={0}; + char buf[BUFSIZE] = { 0 }; GtkTextBuffer *gtktext = gtk_text_view_get_buffer(text_view); GtkTextIter pos; int bx, by, trailing; int button, event_time; GList *list; - - if(eb) { + + if (eb) { button = eb->button; event_time = eb->time; - gtk_text_view_window_to_buffer_coords(text_view, GTK_TEXT_WINDOW_TEXT, - eb->x, eb->y, &bx, &by); - gtk_text_view_get_iter_at_position(text_view, &pos, &trailing, bx, by); + gtk_text_view_window_to_buffer_coords(text_view, + GTK_TEXT_WINDOW_TEXT, eb->x, eb->y, &bx, &by); + gtk_text_view_get_iter_at_position(text_view, &pos, &trailing, + bx, by); gtk_text_buffer_place_cursor(gtktext, &pos); get_word_from_pos(gtktext, pos, buf, NULL, NULL); - } - else { + } else { button = 0; event_time = gtk_get_current_event_time(); get_curword(gtktext, buf, NULL, NULL); } - - if(ay_spell_check(buf)) + if (ay_spell_check(buf)) return; - list = llist_to_glist( ay_spell_check_suggest(buf), 1 ); + list = llist_to_glist(ay_spell_check_suggest(buf), 1); list = g_list_prepend(list, strdup(buf)); if (list != NULL) { GtkMenu *menu = make_menu(list, gtktext); g_object_set_data(G_OBJECT(menu), "parent_textview", text_view); - gtk_menu_popup(menu, NULL, NULL, position_popup_menu, eb, button, event_time); + gtk_menu_popup(menu, NULL, NULL, position_popup_menu, eb, + button, event_time); while (list) { - GList * l = g_list_next(list); + GList *l = g_list_next(list); g_free(list->data); g_list_free_1(list); list = l; @@ -401,9 +419,11 @@ * UPDATE: Nothing whacky about it anymore. Move along. */ -static gboolean button_press_intercept_cb(GtkTextView *gtktext, GdkEventButton *event, gpointer d) { +static gboolean button_press_intercept_cb(GtkTextView *gtktext, + GdkEventButton *event, gpointer d) +{ - if(event->button == 3 && event->type == GDK_BUTTON_PRESS) { + if (event->button == 3 && event->type == GDK_BUTTON_PRESS) { popup_menu(gtktext, event); return TRUE; } @@ -420,7 +440,7 @@ /* * Get rid of all the spelling error notifications */ -void gtkspell_uncheck_all(GtkTextBuffer *gtktext) +void gtkspell_uncheck_all(GtkTextBuffer *gtktext) { GtkTextIter start, end; @@ -431,31 +451,35 @@ /* * The fun starts here. */ -void gtkspell_attach(GtkTextView *text_view) +void gtkspell_attach(GtkTextView *text_view) { GtkTextBuffer *buffer = gtk_text_view_get_buffer(text_view); error_tag = gtk_text_buffer_create_tag(buffer, "error_tag", - "underline", PANGO_UNDERLINE_ERROR, NULL); + "underline", PANGO_UNDERLINE_ERROR, NULL); - g_signal_connect(buffer, "insert-text", G_CALLBACK(entry_insert_cb), NULL); - g_signal_connect_after(buffer, "delete-range", G_CALLBACK(entry_delete_cb), NULL); + g_signal_connect(buffer, "insert-text", G_CALLBACK(entry_insert_cb), + NULL); + g_signal_connect_after(buffer, "delete-range", + G_CALLBACK(entry_delete_cb), NULL); g_signal_connect(text_view, "button-press-event", - G_CALLBACK(button_press_intercept_cb), NULL); + G_CALLBACK(button_press_intercept_cb), NULL); g_signal_connect(text_view, "popup-menu", - G_CALLBACK(popup_menu_callback), NULL); + G_CALLBACK(popup_menu_callback), NULL); } /* * The fun ends here. */ -void gtkspell_detach(GtkTextView *gtktext) +void gtkspell_detach(GtkTextView *gtktext) { GtkTextBuffer *buffer = gtk_text_view_get_buffer(gtktext); - - g_signal_handlers_disconnect_by_func(buffer, G_CALLBACK(entry_insert_cb), NULL); - g_signal_handlers_disconnect_by_func(buffer, G_CALLBACK(entry_delete_cb), NULL); - g_signal_handlers_disconnect_by_func(gtktext, G_CALLBACK(button_press_intercept_cb), NULL); + + g_signal_handlers_disconnect_by_func(buffer, + G_CALLBACK(entry_insert_cb), NULL); + g_signal_handlers_disconnect_by_func(buffer, + G_CALLBACK(entry_delete_cb), NULL); + g_signal_handlers_disconnect_by_func(gtktext, + G_CALLBACK(button_press_intercept_cb), NULL); gtkspell_uncheck_all(buffer); } - Index: gtkspell.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtkspell.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gtkspell.h 3 Aug 2007 20:38:42 -0000 1.4 +++ gtkspell.h 17 Sep 2009 12:05:03 -0000 1.5 @@ -26,7 +26,7 @@ extern "C" { #endif -extern void gtkspell_attach(GtkTextView *text); + extern void gtkspell_attach(GtkTextView *text); /* Attach GtkSpell to a GtkText Widget. * This enables checking as you type and the popup menu. * @@ -38,17 +38,17 @@ * text = gtk_text_new(NULL, NULL); * gtk_text_set_editable(GTK_TEXT(text), TRUE); * gtkspell_attach(GTK_TEXT(text)); - */ + */ -void gtkspell_detach(GtkTextView *gtktext); + void gtkspell_detach(GtkTextView *gtktext); /* Detach GtkSpell from a GtkText widget. * * Arguments: * - "text" is the widget from which GtkSpell should detach. * - */ + */ -void gtkspell_check_all(GtkTextBuffer *gtktext); + void gtkspell_check_all(GtkTextBuffer *gtktext); /* Check and highlight the misspelled words. * Note that the popup menu will not work unless you gtkspell_attach(). * @@ -56,7 +56,7 @@ * - "text" is the widget to check. */ -void gtkspell_uncheck_all(GtkTextBuffer *gtktext); + void gtkspell_uncheck_all(GtkTextBuffer *gtktext); /* Remove all of the highlighting from the widget. * * Arguments: @@ -66,5 +66,4 @@ #ifdef __cplusplus } #endif - -#endif /* __gtkspell_h__ */ +#endif /* __gtkspell_h__ */ Index: gtkutils.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtkutils.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gtkutils.c 7 Sep 2009 07:52:50 -0000 1.16 +++ gtkutils.c 17 Sep 2009 12:05:03 -0000 1.17 @@ -23,38 +23,38 @@ */ #include <assert.h> - + #include <gdk/gdkprivate.h> #include "gtkutils.h" #include "gtk_globals.h" #include "account.h" - -static void s_set_option( GtkWidget *inWidget, int *ioData ) +static void s_set_option(GtkWidget *inWidget, int *ioData) { - *ioData = !(*ioData); + *ioData = !(*ioData); } -GtkWidget *gtkut_button( const char *inText, int *inValue, GtkWidget *inPage, GtkAccelGroup *inAccelGroup ) +GtkWidget *gtkut_button(const char *inText, int *inValue, GtkWidget *inPage, + GtkAccelGroup *inAccelGroup) { - GtkWidget *button = gtk_check_button_new_with_mnemonic( inText ); - - assert( inValue != NULL ); - - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(button), *inValue ); - gtk_box_pack_start( GTK_BOX(inPage), button, FALSE, FALSE, 0 ); - g_signal_connect( button, "clicked", G_CALLBACK(s_set_option), inValue ); - gtk_widget_show( button ); + GtkWidget *button = gtk_check_button_new_with_mnemonic(inText); - return( button ); + assert(inValue != NULL); + + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), *inValue); + gtk_box_pack_start(GTK_BOX(inPage), button, FALSE, FALSE, 0); + g_signal_connect(button, "clicked", G_CALLBACK(s_set_option), inValue); + gtk_widget_show(button); + + return (button); } -GtkWidget *gtkut_create_icon_widget( const char **inXPM, GtkWidget *inParent ) +GtkWidget *gtkut_create_icon_widget(const char **inXPM, GtkWidget *inParent) { - GtkWidget *iconwid = NULL; - GdkPixbuf *buf = NULL; - + GtkWidget *iconwid = NULL; + GdkPixbuf *buf = NULL; + buf = gdk_pixbuf_new_from_xpm_data(inXPM); iconwid = gtk_image_new_from_pixbuf(buf); gtk_widget_show(iconwid); @@ -62,18 +62,19 @@ return (iconwid); } - -GtkWidget *gtkut_stock_button_new_with_label(const char *label, const char *stock) +GtkWidget *gtkut_stock_button_new_with_label(const char *label, + const char *stock) { GtkWidget *hbox = gtk_hbox_new(FALSE, 5); GtkWidget *button = gtk_button_new(); - GtkWidget *iconwid = gtk_image_new_from_stock(stock, GTK_ICON_SIZE_BUTTON); + GtkWidget *iconwid = + gtk_image_new_from_stock(stock, GTK_ICON_SIZE_BUTTON); GtkWidget *labelwid = gtk_label_new(label); - + gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2); gtk_box_pack_start(GTK_BOX(hbox), labelwid, FALSE, FALSE, 2); - gtk_container_add(GTK_CONTAINER(button), hbox); - + gtk_container_add(GTK_CONTAINER(button), hbox); + gtk_widget_show(iconwid); gtk_widget_show(labelwid); gtk_widget_show(hbox); @@ -82,62 +83,59 @@ return button; } - -GtkWidget *gtkut_create_icon_button( const char *inLabel, const char **inXPM, GtkWidget *inParent ) +GtkWidget *gtkut_create_icon_button(const char *inLabel, const char **inXPM, + GtkWidget *inParent) { - GtkWidget *button = NULL; - GtkWidget *label = NULL; - GtkWidget *hbox = NULL; - GtkWidget *iconwid = NULL; - GtkStyle *style = NULL; - const int min_width = 80; - int width = min_width; - int height = -1; - int using_label = (inLabel != NULL); - - if ( using_label ) - { - hbox = gtk_hbox_new( FALSE, 0 ); - gtk_widget_show( hbox ); + GtkWidget *button = NULL; + GtkWidget *label = NULL; + GtkWidget *hbox = NULL; + GtkWidget *iconwid = NULL; + GtkStyle *style = NULL; + const int min_width = 80; + int width = min_width; + int height = -1; + int using_label = (inLabel != NULL); + + if (using_label) { + hbox = gtk_hbox_new(FALSE, 0); + gtk_widget_show(hbox); } - - style = gtk_widget_get_style( inParent ); - - iconwid = gtkut_create_icon_widget( inXPM, inParent ); - height = gdk_pixbuf_get_height( gtk_image_get_pixbuf(GTK_IMAGE(iconwid)) )+5; - - if ( using_label ) - { - gtk_box_pack_start( GTK_BOX(hbox), iconwid, FALSE, FALSE, 0 ); - - label = gtk_label_new( inLabel ); - gtk_widget_show( label ); - gtk_box_pack_start( GTK_BOX(hbox), label, TRUE, TRUE, 0 ); + + style = gtk_widget_get_style(inParent); + + iconwid = gtkut_create_icon_widget(inXPM, inParent); + height = gdk_pixbuf_get_height(gtk_image_get_pixbuf(GTK_IMAGE(iconwid))) + + 5; + + if (using_label) { + gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 0); + + label = gtk_label_new(inLabel); + gtk_widget_show(label); + gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); } - + button = gtk_button_new(); - if ( using_label ) - { - gtk_container_add( GTK_CONTAINER(button), hbox ); - - if ( button->requisition.width > width ) + if (using_label) { + gtk_container_add(GTK_CONTAINER(button), hbox); + + if (button->requisition.width > width) width = button->requisition.width; - gtk_widget_set_size_request( button, width, height ); - } - else - { - gtk_container_add( GTK_CONTAINER(button), iconwid ); + gtk_widget_set_size_request(button, width, height); + } else { + gtk_container_add(GTK_CONTAINER(button), iconwid); } - - gtk_widget_show( button ); - - return( button ); + + gtk_widget_show(button); + + return (button); } -void gtkut_set_pixbuf( eb_local_account *ela, const char **inXPM, GdkPixbuf **outPixbuf ) +void gtkut_set_pixbuf(eb_local_account *ela, const char **inXPM, + GdkPixbuf **outPixbuf) { - if ( (inXPM == NULL) || (*outPixbuf == NULL) ) + if ((inXPM == NULL) || (*outPixbuf == NULL)) return; /* * FIXME: This is slowing things down for now as it compulsarily @@ -147,161 +145,157 @@ *outPixbuf = gdk_pixbuf_new_from_xpm_data(inXPM); } -void gtkut_set_pixbuf_from_xpm( const char **inXPM, GdkPixbuf **outPixbuf ) +void gtkut_set_pixbuf_from_xpm(const char **inXPM, GdkPixbuf **outPixbuf) { - if ( (inXPM == NULL) || (*outPixbuf == NULL) ) + if ((inXPM == NULL) || (*outPixbuf == NULL)) return; - + #ifndef __MINGW32__ - *outPixbuf = gdk_pixbuf_new_from_xpm_data( inXPM ); + *outPixbuf = gdk_pixbuf_new_from_xpm_data(inXPM); #endif } -void gtkut_widget_get_uposition( GtkWidget *inWidget, int *outXpos, int *outYpos ) +void gtkut_widget_get_uposition(GtkWidget *inWidget, int *outXpos, int *outYpos) { - int x = 0; - int y = 0; - int sx = 0; - int sy = 0; + int x = 0; + int y = 0; + int sx = 0; + int sy = 0; - - if ( outXpos != NULL ) + if (outXpos != NULL) *outXpos = 0; - - if ( outYpos != NULL ) + + if (outYpos != NULL) *outYpos = 0; - - if ( (inWidget == NULL) || (inWidget->window == NULL) ) - return; + + if ((inWidget == NULL) || (inWidget->window == NULL)) + return; sx = gdk_screen_width(); sy = gdk_screen_height(); - gdk_window_get_root_origin( inWidget->window, &x, &y ); + gdk_window_get_root_origin(inWidget->window, &x, &y); x %= sx; - if ( x < 0 ) + if (x < 0) x = 0; - + y %= sy; - if ( y < 0 ) + if (y < 0) y = 0; - - if ( outXpos != NULL ) + + if (outXpos != NULL) *outXpos = x; - - if ( outYpos != NULL ) + + if (outYpos != NULL) *outYpos = y; } -GtkWidget *gtkut_create_label_button( const char *inButtonText, GCallback inSignalFunc, void *inCallbackData ) +GtkWidget *gtkut_create_label_button(const char *inButtonText, + GCallback inSignalFunc, void *inCallbackData) { - GtkWidget *button = NULL; + GtkWidget *button = NULL; button = gtk_button_new_with_mnemonic(inButtonText); - gtk_widget_show( button ); - - g_signal_connect( button, "clicked", inSignalFunc, inCallbackData ); - - return( button ); -} - -GSList *gtkut_add_radio_button_to_group( GSList *ioGroup, GtkWidget *inParentBox, - const char *inButtonText, int inIsSelected, - GCallback inSignalFunc, void *inCallbackData ) -{ - GtkWidget *radio = NULL; - - - if ( inButtonText == NULL ) - radio = gtk_radio_button_new( ioGroup ); + gtk_widget_show(button); + + g_signal_connect(button, "clicked", inSignalFunc, inCallbackData); + + return (button); +} + +GSList *gtkut_add_radio_button_to_group(GSList *ioGroup, GtkWidget *inParentBox, + const char *inButtonText, int inIsSelected, + GCallback inSignalFunc, void *inCallbackData) +{ + GtkWidget *radio = NULL; + + if (inButtonText == NULL) + radio = gtk_radio_button_new(ioGroup); else - radio = gtk_radio_button_new_with_label( ioGroup, inButtonText ); - - gtk_widget_show( radio ); + radio = gtk_radio_button_new_with_label(ioGroup, inButtonText); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(radio), inIsSelected ); + gtk_widget_show(radio); - gtk_box_pack_start( GTK_BOX(inParentBox), radio, FALSE, FALSE, 0 ); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), inIsSelected); - g_signal_connect( radio, "clicked", inSignalFunc, inCallbackData ); + gtk_box_pack_start(GTK_BOX(inParentBox), radio, FALSE, FALSE, 0); - return( gtk_radio_button_get_group( GTK_RADIO_BUTTON(radio) ) ); -} + g_signal_connect(radio, "clicked", inSignalFunc, inCallbackData); + return (gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio))); +} -GtkWidget *gtkut_check_button( GtkWidget *inParentBox, const char *inButtonText, int inIsSelected, - GCallback inSignalFunc, void *inCallbackData ) +GtkWidget *gtkut_check_button(GtkWidget *inParentBox, const char *inButtonText, + int inIsSelected, GCallback inSignalFunc, void *inCallbackData) { GtkWidget *button = NULL; - - if ( inButtonText == NULL ) + if (inButtonText == NULL) button = gtk_check_button_new(); else - button = gtk_check_button_new_with_mnemonic( inButtonText ); - - gtk_widget_show( button ); - - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(button), inIsSelected ); - - gtk_box_pack_start( GTK_BOX(inParentBox), button, FALSE, FALSE, 0 ); - - g_signal_connect( GTK_OBJECT(button), "clicked", inSignalFunc, inCallbackData ); - - return( button ); -} + button = gtk_check_button_new_with_mnemonic(inButtonText); + + gtk_widget_show(button); + + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), inIsSelected); + gtk_box_pack_start(GTK_BOX(inParentBox), button, FALSE, FALSE, 0); -GtkWidget *gtkut_create_menu_button( GtkMenu *inMenu, const char *inLabel, - GCallback inSignalFunc, void *inCallbackData ) + g_signal_connect(GTK_OBJECT(button), "clicked", inSignalFunc, + inCallbackData); + + return (button); +} + +GtkWidget *gtkut_create_menu_button(GtkMenu *inMenu, const char *inLabel, + GCallback inSignalFunc, void *inCallbackData) { GtkWidget *button = NULL; - - assert( inMenu != NULL ); - - if ( inLabel == NULL ) + + assert(inMenu != NULL); + + if (inLabel == NULL) button = gtk_menu_item_new(); else - button = gtk_menu_item_new_with_label( inLabel ) ; - - if ( inSignalFunc != NULL ) - g_signal_connect( button, "activate", inSignalFunc, inCallbackData ); - - gtk_menu_shell_append( GTK_MENU_SHELL(inMenu), button ); - gtk_widget_show( button ); + button = gtk_menu_item_new_with_label(inLabel); - return( button ); + if (inSignalFunc != NULL) + g_signal_connect(button, "activate", inSignalFunc, + inCallbackData); + + gtk_menu_shell_append(GTK_MENU_SHELL(inMenu), button); + gtk_widget_show(button); + + return (button); } -GtkWidget *gtkut_attach_submenu( GtkMenu *inMenu, const char *inLabel, - GtkWidget *inSubmenu, int inActive ) +GtkWidget *gtkut_attach_submenu(GtkMenu *inMenu, const char *inLabel, + GtkWidget *inSubmenu, int inActive) { GtkWidget *button = NULL; - - if ( inLabel == NULL ) + if (inLabel == NULL) button = gtk_menu_item_new(); else - button = gtk_menu_item_new_with_label( inLabel ) ; - - gtk_widget_set_sensitive( button, inActive ); + button = gtk_menu_item_new_with_label(inLabel); - gtk_menu_shell_append( GTK_MENU_SHELL(inMenu), button ); + gtk_widget_set_sensitive(button, inActive); - gtk_menu_item_set_submenu( GTK_MENU_ITEM(button), inSubmenu ); - gtk_widget_show( button ); + gtk_menu_shell_append(GTK_MENU_SHELL(inMenu), button); - return( button ); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(button), inSubmenu); + gtk_widget_show(button); + + return (button); } -void gtkut_set_window_icon( GtkWindow *inWindow, const gchar **inXPM ) +void gtkut_set_window_icon(GtkWindow *inWindow, const gchar **inXPM) { - GdkPixbuf *the_pixbuf = NULL; - - if ( inXPM != NULL ) - { - the_pixbuf = gdk_pixbuf_new_from_xpm_data( inXPM ); - gtk_window_set_icon( inWindow, the_pixbuf); + GdkPixbuf *the_pixbuf = NULL; + + if (inXPM != NULL) { + the_pixbuf = gdk_pixbuf_new_from_xpm_data(inXPM); + gtk_window_set_icon(inWindow, the_pixbuf); } } Index: gtkutils.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtkutils.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtkutils.h 7 Sep 2009 07:52:50 -0000 1.11 +++ gtkutils.h 17 Sep 2009 12:05:03 -0000 1.12 @@ -32,7 +32,8 @@ extern "C" { #endif -GtkWidget *gtkut_button( const char *inText, int *inValue, GtkWidget *inPage, GtkAccelGroup *inAccelGroup ); + GtkWidget *gtkut_button(const char *inText, int *inValue, + GtkWidget *inPage, GtkAccelGroup *inAccelGroup); /** Create a widget with an xpm. @@ -41,7 +42,8 @@ @returns the new widget */ -GtkWidget *gtkut_create_icon_widget( const char **inXPM, GtkWidget *inParent ); + GtkWidget *gtkut_create_icon_widget(const char **inXPM, + GtkWidget *inParent); /** Create a button with an xpm and optional label. @@ -51,7 +53,8 @@ @returns the new button */ -GtkWidget *gtkut_create_icon_button( const char *inLabel, const char **inXPM, GtkWidget *inParent ); + GtkWidget *gtkut_create_icon_button(const char *inLabel, + const char **inXPM, GtkWidget *inParent); /** Create a button with a stock icon and custom label. @@ -61,11 +64,14 @@ @returns the new button */ -GtkWidget *gtkut_stock_button_new_with_label(const char *label, const char *stock); + GtkWidget *gtkut_stock_button_new_with_label(const char *label, + const char *stock); -void gtkut_set_pixbuf_from_xpm( const char **inXPM, GdkPixbuf **outPixbuf ); + void gtkut_set_pixbuf_from_xpm(const char **inXPM, + GdkPixbuf **outPixbuf); -void gtkut_set_pixbuf( eb_local_account *ela, const cha... [truncated message content] |
From: Siddhesh P. <sid...@us...> - 2009-09-16 06:26:04
|
Update of /cvsroot/ayttm/ayttm-html In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13395 Modified Files: Header.php style.css Log Message: * Main should actually be News * Put a link to home page on the Page title Index: Header.php =================================================================== RCS file: /cvsroot/ayttm/ayttm-html/Header.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Header.php 11 Sep 2009 14:36:18 -0000 1.1 +++ Header.php 16 Sep 2009 06:25:49 -0000 1.2 @@ -15,16 +15,16 @@ <link rel="stylesheet" href=".<? printf($EXTRA_PATH);?>/style.css" type="text/css"> </head> <body> -<div align="center"> +<div align="center"><a class="toptitle" href="http://ayttm.sourceforge.net"> <table width="100%" class="title"> <tr valign="middle"> <td valign="middle"><h1 style="padding-top:15px; text-align: left; margin-left: 20pt; font-variant: small-caps;">Ayttm: Universal Instant Messaging Client</h1></td> <td width="*" style="text-align:right;"><img style="padding-top:5px" src=".<? printf($EXTRA_PATH);?>/ayttm.png" alt="Ayttm logo" border="0" width=64 height=64></td> </tr> -</table> +</table></a> <br> | -<a class="main" href=".<? printf($EXTRA_PATH);?>/">Main</a> | +<a class="main" href=".<? printf($EXTRA_PATH);?>/">News</a> | <a class="main" href=".<? printf($EXTRA_PATH);?>/about.php">About</a> | <a class="main" href=".<? printf($EXTRA_PATH);?>/features.php">Features</a> | <a class="main" href=".<? printf($EXTRA_PATH);?>/smileys/">Themes</a> | Index: style.css =================================================================== RCS file: /cvsroot/ayttm/ayttm-html/style.css,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- style.css 11 Sep 2009 14:36:18 -0000 1.6 +++ style.css 16 Sep 2009 06:25:49 -0000 1.7 @@ -68,6 +68,22 @@ font-weight: bold; } +a.toptitle:visited { + color: #000; + } + +a.toptitle:active { + color: #000; + } + +a.toptitle:hover { + color: #000; + } + +a.toptitle { + color: #000; + } + hr { height: 1px; border: 0px; |