Changes in / [68b518d6:41ca004]
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
configure
r68b518d6 r41ca004 169 169 fi 170 170 171 GLIB=0172 173 171 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then 174 172 cat<<EOF>>Makefile.settings … … 177 175 EOF 178 176 echo '#define GLIB2' >> config.h 179 GLIB=2180 177 elif type glib-config > /dev/null 2> /dev/null; then 181 178 cat<<EOF>>Makefile.settings … … 184 181 EOF 185 182 echo '#define GLIB1' >> config.h 186 GLIB=1187 183 else 188 184 echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)' … … 190 186 fi 191 187 192 if [ GLIB = 1 -o-r /usr/include/iconv.h ]; then188 if [ -r /usr/include/iconv.h ]; then 193 189 :; 194 190 elif [ -r /usr/local/include/iconv.h ]; then -
ipc.h
r68b518d6 r41ca004 47 47 48 48 void ipc_to_master( char **cmd ); 49 void ipc_to_master_str( char *format, ... ) G_GNUC_PRINTF( 1, 2 );49 void ipc_to_master_str( char *format, ... ); 50 50 void ipc_to_children( char **cmd ); 51 void ipc_to_children_str( char *format, ... ) G_GNUC_PRINTF( 1, 2 );51 void ipc_to_children_str( char *format, ... ); 52 52 53 53 /* We need this function in inetd mode, so let's just make it non-static. */ -
irc.c
r68b518d6 r41ca004 832 832 irc_reply( irc, 332, "%s :BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", channel, c->title ); 833 833 else 834 irc_reply( irc, 331, "%s :No topic for this channel" , channel);834 irc_reply( irc, 331, "%s :No topic for this channel" ); 835 835 } 836 836 } … … 888 888 if( g_hash_table_lookup( irc->watches, nick ) ) 889 889 { 890 irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, (int)time( NULL ), "logged online" );890 irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged online" ); 891 891 } 892 892 g_free( nick ); … … 913 913 if( g_hash_table_lookup( irc->watches, nick ) ) 914 914 { 915 irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, (int)time( NULL ), "logged offline" );915 irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged offline" ); 916 916 } 917 917 g_free( nick ); … … 1013 1013 else if( c && c->gc && c->gc->prpl ) 1014 1014 { 1015 return( bim_chat_msg(c->gc, c->id, s ) );1015 return( serv_send_chat( irc, c->gc, c->id, s ) ); 1016 1016 } 1017 1017 … … 1023 1023 user_t *u = data; 1024 1024 1025 /* Shouldn't happen, but just to be sure. */1026 if( u->sendbuf_len < 2 )1027 return FALSE;1028 1029 1025 u->sendbuf[u->sendbuf_len-2] = 0; /* Cut off the last newline */ 1030 bim_buddy_msg( u->gc, u->handle, u->sendbuf, u->sendbuf_flags );1026 serv_send_im( u->gc->irc, u, u->sendbuf, u->sendbuf_flags ); 1031 1027 1032 1028 g_free( u->sendbuf ); … … 1049 1045 if( u->sendbuf_len > 0 && u->sendbuf_flags != flags) 1050 1046 { 1051 / * Flush the buffer */1047 //Flush the buffer 1052 1048 b_event_remove( u->sendbuf_timer ); 1053 1049 buddy_send_handler_delayed( u, -1, 0 ); … … 1057 1053 { 1058 1054 u->sendbuf_len = strlen( msg ) + 2; 1059 u->sendbuf = g_new (char, u->sendbuf_len );1055 u->sendbuf = g_new (char, u->sendbuf_len ); 1060 1056 u->sendbuf[0] = 0; 1061 1057 u->sendbuf_flags = flags; … … 1064 1060 { 1065 1061 u->sendbuf_len += strlen( msg ) + 1; 1066 u->sendbuf = g_renew ( char, u->sendbuf, u->sendbuf_len );1062 u->sendbuf = g_renew ( char, u->sendbuf, u->sendbuf_len ); 1067 1063 } 1068 1064 … … 1080 1076 else 1081 1077 { 1082 bim_buddy_msg( u->gc, u->handle, msg, flags );1078 serv_send_im( irc, u, msg, flags ); 1083 1079 } 1084 1080 } -
irc.h
r68b518d6 r41ca004 103 103 104 104 irc_t *irc_new( int fd ); 105 void irc_abort( irc_t *irc, int immed, char *format, ... ) G_GNUC_PRINTF( 3, 4 );105 void irc_abort( irc_t *irc, int immed, char *format, ... ); 106 106 void irc_free( irc_t *irc ); 107 107 … … 112 112 113 113 void irc_vawrite( irc_t *irc, char *format, va_list params ); 114 void irc_write( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );115 void irc_write_all( int now, char *format, ... ) G_GNUC_PRINTF( 2, 3 );116 void irc_reply( irc_t *irc, int code, char *format, ... ) G_GNUC_PRINTF( 3, 4 );117 G_MODULE_EXPORT int irc_usermsg( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );114 void irc_write( irc_t *irc, char *format, ... ); 115 void irc_write_all( int now, char *format, ... ); 116 void irc_reply( irc_t *irc, int code, char *format, ... ); 117 G_MODULE_EXPORT int irc_usermsg( irc_t *irc, char *format, ... ); 118 118 char **irc_tokenize( char *buffer ); 119 119 -
irc_commands.c
r68b518d6 r41ca004 385 385 386 386 if( u && u->online ) 387 irc_reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, (int)time( NULL ), "is online" );387 irc_reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "is online" ); 388 388 else 389 irc_reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", (int)time( NULL ), "is offline" );389 irc_reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", time( NULL ), "is offline" ); 390 390 } 391 391 else if( cmd[i][0] == '-' ) … … 448 448 449 449 if( gc && gc->flags & OPT_LOGGED_IN ) 450 bim_set_away( gc, u->away );450 proto_away( gc, u->away ); 451 451 } 452 452 } -
log.h
r68b518d6 r41ca004 54 54 void log_init(void); 55 55 void log_link(int level, int output); 56 void log_message(int level, char *message, ...) G_GNUC_PRINTF( 2, 3 );56 void log_message(int level, char *message, ...); 57 57 void log_error(char *functionname); 58 58 -
protocols/http_client.c
r68b518d6 r41ca004 240 240 241 241 got_reply: 242 /* Maybe if the webserver is overloaded, or when there's bad SSL243 support... */244 if( req->bytes_read == 0 )245 goto cleanup;246 247 242 /* Zero termination is very convenient. */ 248 243 req->reply_headers[req->bytes_read] = 0; -
protocols/nogaim.c
r68b518d6 r41ca004 36 36 #include <ctype.h> 37 37 38 static char *proto_away_alias[8][5] = 39 { 40 { "Away from computer", "Away", "Extended away", NULL }, 41 { "NA", "N/A", "Not available", NULL }, 42 { "Busy", "Do not disturb", "DND", "Occupied", NULL }, 43 { "Be right back", "BRB", NULL }, 44 { "On the phone", "Phone", "On phone", NULL }, 45 { "Out to lunch", "Lunch", "Food", NULL }, 46 { "Invisible", "Hidden" }, 47 { NULL } 48 }; 49 static char *proto_away_alias_find( GList *gcm, char *away ); 50 38 51 static int remove_chat_buddy_silent( struct conversation *b, char *handle ); 39 52 … … 143 156 GSList *get_connections() { return connections; } 144 157 158 int proto_away( struct gaim_connection *gc, char *away ) 159 { 160 GList *m, *ms; 161 char *s; 162 163 if( !away ) away = ""; 164 ms = m = gc->prpl->away_states( gc ); 165 166 while( m ) 167 { 168 if( *away ) 169 { 170 if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 ) 171 break; 172 } 173 else 174 { 175 if( g_strcasecmp( m->data, "Available" ) == 0 ) 176 break; 177 if( g_strcasecmp( m->data, "Online" ) == 0 ) 178 break; 179 } 180 m = m->next; 181 } 182 183 if( m ) 184 { 185 gc->prpl->set_away( gc, m->data, *away ? away : NULL ); 186 } 187 else 188 { 189 s = proto_away_alias_find( ms, away ); 190 if( s ) 191 { 192 gc->prpl->set_away( gc, s, away ); 193 if( set_getint( gc->irc, "debug" ) ) 194 serv_got_crap( gc, "Setting away state to %s", s ); 195 } 196 else 197 gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away ); 198 } 199 200 g_list_free( ms ); 201 202 return( 1 ); 203 } 204 205 static char *proto_away_alias_find( GList *gcm, char *away ) 206 { 207 GList *m; 208 int i, j; 209 210 for( i = 0; *proto_away_alias[i]; i ++ ) 211 { 212 for( j = 0; proto_away_alias[i][j]; j ++ ) 213 if( g_strncasecmp( away, proto_away_alias[i][j], strlen( proto_away_alias[i][j] ) ) == 0 ) 214 break; 215 216 if( !proto_away_alias[i][j] ) /* If we reach the end, this row */ 217 continue; /* is not what we want. Next! */ 218 219 /* Now find an entry in this row which exists in gcm */ 220 for( j = 0; proto_away_alias[i][j]; j ++ ) 221 { 222 m = gcm; 223 while( m ) 224 { 225 if( g_strcasecmp( proto_away_alias[i][j], m->data ) == 0 ) 226 return( proto_away_alias[i][j] ); 227 m = m->next; 228 } 229 } 230 } 231 232 return( NULL ); 233 } 234 145 235 /* multi.c */ 146 236 … … 267 357 /* Also necessary when we're not away, at least for some of the 268 358 protocols. */ 269 bim_set_away( gc, u->away );359 proto_away( gc, u->away ); 270 360 } 271 361 … … 391 481 else if( gc->user->proto_opt[0] && *gc->user->proto_opt[0] ) 392 482 { 393 char *colon; 394 395 if( ( colon = strchr( gc->user->proto_opt[0], ':' ) ) ) 396 u->host = g_strndup( gc->user->proto_opt[0], 397 colon - gc->user->proto_opt[0] ); 398 else 399 u->host = g_strdup( gc->user->proto_opt[0] ); 400 483 u->host = g_strdup( gc->user->proto_opt[0] ); 401 484 u->user = g_strdup( handle ); 402 485 … … 939 1022 } 940 1023 941 942 943 944 /* The plan is to not allow straight calls to prpl functions anymore, but do 945 them all from some wrappers. We'll start to define some down here: */ 946 947 int bim_buddy_msg( struct gaim_connection *gc, char *handle, char *msg, int flags ) 1024 int serv_send_im( irc_t *irc, user_t *u, char *msg, int flags ) 948 1025 { 949 1026 char *buf = NULL; 950 1027 int st; 951 1028 952 if( ( gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )1029 if( ( u->gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) ) 953 1030 { 954 1031 buf = escape_html( msg ); … … 956 1033 } 957 1034 958 st = gc->prpl->send_im( gc,handle, msg, strlen( msg ), flags );1035 st = ((struct gaim_connection *)u->gc)->prpl->send_im( u->gc, u->handle, msg, strlen( msg ), flags ); 959 1036 g_free( buf ); 960 1037 … … 962 1039 } 963 1040 964 int bim_chat_msg(struct gaim_connection *gc, int id, char *msg )1041 int serv_send_chat( irc_t *irc, struct gaim_connection *gc, int id, char *msg ) 965 1042 { 966 1043 char *buf = NULL; … … 978 1055 return st; 979 1056 } 980 981 static char *bim_away_alias_find( GList *gcm, char *away );982 983 int bim_set_away( struct gaim_connection *gc, char *away )984 {985 GList *m, *ms;986 char *s;987 988 if( !away ) away = "";989 ms = m = gc->prpl->away_states( gc );990 991 while( m )992 {993 if( *away )994 {995 if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )996 break;997 }998 else999 {1000 if( g_strcasecmp( m->data, "Available" ) == 0 )1001 break;1002 if( g_strcasecmp( m->data, "Online" ) == 0 )1003 break;1004 }1005 m = m->next;1006 }1007 1008 if( m )1009 {1010 gc->prpl->set_away( gc, m->data, *away ? away : NULL );1011 }1012 else1013 {1014 s = bim_away_alias_find( ms, away );1015 if( s )1016 {1017 gc->prpl->set_away( gc, s, away );1018 if( set_getint( gc->irc, "debug" ) )1019 serv_got_crap( gc, "Setting away state to %s", s );1020 }1021 else1022 gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );1023 }1024 1025 g_list_free( ms );1026 1027 return( 1 );1028 }1029 1030 static char *bim_away_alias_list[8][5] =1031 {1032 { "Away from computer", "Away", "Extended away", NULL },1033 { "NA", "N/A", "Not available", NULL },1034 { "Busy", "Do not disturb", "DND", "Occupied", NULL },1035 { "Be right back", "BRB", NULL },1036 { "On the phone", "Phone", "On phone", NULL },1037 { "Out to lunch", "Lunch", "Food", NULL },1038 { "Invisible", "Hidden" },1039 { NULL }1040 };1041 1042 static char *bim_away_alias_find( GList *gcm, char *away )1043 {1044 GList *m;1045 int i, j;1046 1047 for( i = 0; *bim_away_alias_list[i]; i ++ )1048 {1049 for( j = 0; bim_away_alias_list[i][j]; j ++ )1050 if( g_strncasecmp( away, bim_away_alias_list[i][j], strlen( bim_away_alias_list[i][j] ) ) == 0 )1051 break;1052 1053 if( !bim_away_alias_list[i][j] ) /* If we reach the end, this row */1054 continue; /* is not what we want. Next! */1055 1056 /* Now find an entry in this row which exists in gcm */1057 for( j = 0; bim_away_alias_list[i][j]; j ++ )1058 {1059 m = gcm;1060 while( m )1061 {1062 if( g_strcasecmp( bim_away_alias_list[i][j], m->data ) == 0 )1063 return( bim_away_alias_list[i][j] );1064 m = m->next;1065 }1066 }1067 }1068 1069 return( NULL );1070 }1071 1072 void bim_add_allow( struct gaim_connection *gc, char *handle )1073 {1074 if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )1075 {1076 gc->permit = g_slist_prepend( gc->permit, g_strdup( handle ) );1077 }1078 1079 gc->prpl->add_permit( gc, handle );1080 }1081 1082 void bim_rem_allow( struct gaim_connection *gc, char *handle )1083 {1084 GSList *l;1085 1086 if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )1087 {1088 g_free( l->data );1089 gc->permit = g_slist_delete_link( gc->permit, l );1090 }1091 1092 gc->prpl->rem_permit( gc, handle );1093 }1094 1095 void bim_add_block( struct gaim_connection *gc, char *handle )1096 {1097 if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )1098 {1099 gc->deny = g_slist_prepend( gc->deny, g_strdup( handle ) );1100 }1101 1102 gc->prpl->add_deny( gc, handle );1103 }1104 1105 void bim_rem_block( struct gaim_connection *gc, char *handle )1106 {1107 GSList *l;1108 1109 if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )1110 {1111 g_free( l->data );1112 gc->deny = g_slist_delete_link( gc->deny, l );1113 }1114 1115 gc->prpl->rem_deny( gc, handle );1116 } -
protocols/nogaim.h
r68b518d6 r41ca004 52 52 #define BUDDY_ALIAS_MAXLEN 388 /* because MSN names can be 387 characters */ 53 53 54 #define WEBSITE "http://www.bitl bee.org/"54 #define WEBSITE "http://www.bitlee.org/" 55 55 #define IM_FLAG_AWAY 0x0020 56 56 #define OPT_CONN_HTML 0x00000001 … … 194 194 195 195 /* nogaim.c */ 196 int bim_set_away( struct gaim_connection *gc, char *away ); 197 int bim_buddy_msg( struct gaim_connection *gc, char *handle, char *msg, int flags ); 198 int bim_chat_msg( struct gaim_connection *gc, int id, char *msg ); 199 200 void bim_add_allow( struct gaim_connection *gc, char *handle ); 201 void bim_rem_allow( struct gaim_connection *gc, char *handle ); 202 void bim_add_block( struct gaim_connection *gc, char *handle ); 203 void bim_rem_block( struct gaim_connection *gc, char *handle ); 196 int serv_send_im(irc_t *irc, user_t *u, char *msg, int flags); 197 int serv_send_chat(irc_t *irc, struct gaim_connection *gc, int id, char *msg ); 204 198 205 199 void nogaim_init(); 200 int proto_away( struct gaim_connection *gc, char *away ); 206 201 char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value ); 207 202 … … 215 210 G_MODULE_EXPORT void hide_login_progress( struct gaim_connection *gc, char *msg ); 216 211 G_MODULE_EXPORT void hide_login_progress_error( struct gaim_connection *gc, char *msg ); 217 G_MODULE_EXPORT void serv_got_crap( struct gaim_connection *gc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );212 G_MODULE_EXPORT void serv_got_crap( struct gaim_connection *gc, char *format, ... ); 218 213 G_MODULE_EXPORT void account_online( struct gaim_connection *gc ); 219 214 G_MODULE_EXPORT void signoff( struct gaim_connection *gc ); -
protocols/oscar/aim.h
r68b518d6 r41ca004 728 728 }; 729 729 730 #define AIM_CHATFLAGS_NOREFLECT 0x0001 731 #define AIM_CHATFLAGS_AWAY 0x0002 732 #define AIM_CHATFLAGS_UNICODE 0x0004 733 #define AIM_CHATFLAGS_ISO_8859_1 0x0008 734 730 #define AIM_CHATFLAGS_NOREFLECT 0x0001 731 #define AIM_CHATFLAGS_AWAY 0x0002 735 732 int aim_chat_send_im(aim_session_t *sess, aim_conn_t *conn, guint16 flags, const char *msg, int msglen); 736 733 int aim_chat_join(aim_session_t *sess, aim_conn_t *conn, guint16 exchange, const char *roomname, guint16 instance); -
protocols/oscar/chat.c
r68b518d6 r41ca004 159 159 if (flags & AIM_CHATFLAGS_AWAY) 160 160 aim_addtlvtochain_noval(&otl, 0x0007); 161 162 /* [WvG] This wasn't there originally, but we really should send 163 the right charset flags, as we also do with normal 164 messages. Hope this will work. :-) */ 165 /* 166 if (flags & AIM_CHATFLAGS_UNICODE) 167 aimbs_put16(&fr->data, 0x0002); 168 else if (flags & AIM_CHATFLAGS_ISO_8859_1) 169 aimbs_put16(&fr->data, 0x0003); 170 else 171 aimbs_put16(&fr->data, 0x0000); 172 173 aimbs_put16(&fr->data, 0x0000); 174 */ 175 161 176 162 /* 177 163 * SubTLV: Type 1: Message -
protocols/oscar/im.c
r68b518d6 r41ca004 1469 1469 case 0x9c: /* ICQ 5 seems to send this */ 1470 1470 aim_send_im_ch2_statusmessage(sess, userinfo->sn, args->cookie, 1471 gc->away ? gc->away : "", sess->aim_icq_state, dc);1471 gc->away, sess->aim_icq_state, dc); 1472 1472 break; 1473 1473 -
protocols/oscar/oscar.c
r68b518d6 r41ca004 2 2 * gaim 3 3 * 4 * Some code copyright (C) 2002-2006, Jelmer Vernooij <jelmer@samba.org>5 * and the BitlBee team.6 4 * Some code copyright (C) 1998-1999, Mark Spencer <markster@marko.net> 7 5 * libfaim code copyright 1998, 1999 Adam Fritzler <afritz@auk.cx> … … 138 136 int i, j; 139 137 char *x = strchr(name, '-'); 140 if (!x) return g_strdup(name);138 if (!x) return NULL; 141 139 x = strchr(++x, '-'); 142 if (!x) return g_strdup(name);140 if (!x) return NULL; 143 141 tmp = g_strdup(++x); 144 142 … … 392 390 if (g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.icq.com") != 0 && 393 391 g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.oscar.aol.com") != 0) { 394 serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails." ,user->proto_opt[USEROPT_AUTH]);392 serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails."); 395 393 } 396 394 … … 2519 2517 int ret; 2520 2518 guint8 len = strlen(message); 2521 guint16 flags;2522 2519 char *s; 2523 2520 … … 2528 2525 if (*s & 128) 2529 2526 break; 2530 2531 flags = AIM_CHATFLAGS_NOREFLECT; 2532 2527 2533 2528 /* Message contains high ASCII chars, time for some translation! */ 2534 2529 if (*s) { … … 2537 2532 If we can't, fall back to UTF16. */ 2538 2533 if ((ret = do_iconv("UTF-8", "ISO8859-1", message, s, len, BUF_LONG)) >= 0) { 2539 flags |= AIM_CHATFLAGS_ISO_8859_1;2540 2534 len = ret; 2541 2535 } else if ((ret = do_iconv("UTF-8", "UNICODEBIG", message, s, len, BUF_LONG)) >= 0) { 2542 flags |= AIM_CHATFLAGS_UNICODE;2543 2536 len = ret; 2544 2537 } else { … … 2551 2544 } 2552 2545 2553 ret = aim_chat_send_im(od->sess, ccon->conn, flags, s, len);2546 ret = aim_chat_send_im(od->sess, ccon->conn, AIM_CHATFLAGS_NOREFLECT, s, len); 2554 2547 2555 2548 if (s != message) { … … 2624 2617 int ret; 2625 2618 static int chat_id = 0; 2626 char * chatname ;2627 2628 chatname = g_strdup_printf("%s%d", gc->username, chat_id++);2619 char * chatname = g_new0(char, strlen(gc->username)+4); 2620 2621 g_snprintf(chatname, strlen(gc->username) + 4, "%s%d", gc->username, chat_id++); 2629 2622 2630 2623 ret = oscar_chat_join(gc, chatname); -
root_commands.c
r68b518d6 r41ca004 56 56 cmd[k++] = s; 57 57 s --; 58 }59 else60 {61 break;62 58 } 63 59 } … … 558 554 else 559 555 { 560 bim_rem_allow( gc, cmd[2] );561 bim_add_block( gc, cmd[2] );562 irc_usermsg( irc, "Buddy `%s' moved from your allow- to your block-list", cmd[2] );556 gc->prpl->rem_permit( gc, cmd[2] ); 557 gc->prpl->add_deny( gc, cmd[2] ); 558 irc_usermsg( irc, "Buddy `%s' moved from your permit- to your deny-list", cmd[2] ); 563 559 } 564 560 } … … 617 613 else 618 614 { 619 bim_rem_block( gc, cmd[2] );620 bim_add_allow( gc, cmd[2] );621 622 irc_usermsg( irc, "Buddy `%s' moved from your block- to your allow-list", cmd[2] );615 gc->prpl->rem_deny( gc, cmd[2] ); 616 gc->prpl->add_permit( gc, cmd[2] ); 617 618 irc_usermsg( irc, "Buddy `%s' moved from your deny- to your permit-list", cmd[2] ); 623 619 } 624 620 } -
user.c
r68b518d6 r41ca004 168 168 u->nick = g_strdup( newnick ); 169 169 if( !u->user ) u->user = u->nick; 170 if( !u->host ) u-> host = u->nick;171 if( !u->realname ) u-> realname = u->nick;170 if( !u->host ) u->user = u->host; 171 if( !u->realname ) u->user = u->realname; 172 172 173 173 /* Remove the old reference to this user from the hash and create a -
util.c
r68b518d6 r41ca004 39 39 #include <glib.h> 40 40 #include <time.h> 41 #ifdef GLIB242 #define iconv_t GIConv43 #define iconv_open g_iconv_open44 #define iconv_close g_iconv_close45 #define iconv g_iconv46 #else47 41 #include <iconv.h> 48 #endif49 42 50 43 void strip_linefeed(gchar *text)
Note: See TracChangeset
for help on using the changeset viewer.