Changes in / [767a148:a81d679]
- Files:
-
- 1 deleted
- 20 edited
-
bitlbee.h (modified) (1 diff)
-
configure (modified) (3 diffs)
-
debian/bitlbee.init (modified) (1 diff)
-
debian/changelog (modified) (1 diff)
-
debian/config (modified) (1 diff)
-
debian/control (modified) (1 diff)
-
debian/patches/bitlbee.conf.diff (modified) (1 diff)
-
debian/po/POTFILES.in (modified) (1 diff)
-
debian/po/ru.po (deleted)
-
debian/postinst (modified) (2 diffs)
-
debian/prerm (modified) (1 diff)
-
doc/user-guide/commands.xml (modified) (2 diffs)
-
irc.c (modified) (1 diff)
-
protocols/jabber/jabber.c (modified) (3 diffs)
-
protocols/jabber/jabber.h (modified) (3 diffs)
-
protocols/jabber/jabber_util.c (modified) (15 diffs)
-
protocols/jabber/message.c (modified) (1 diff)
-
protocols/jabber/presence.c (modified) (1 diff)
-
protocols/oscar/oscar.c (modified) (2 diffs)
-
root_commands.c (modified) (3 diffs)
-
tests/check_jabber_util.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
bitlbee.h
r767a148 ra81d679 163 163 164 164 char *set_eval_root_nick( set_t *set, char *new_nick ); 165 char *set_eval_control_channel( set_t *set, char *new_name );166 165 167 166 extern global_t global; -
configure
r767a148 ra81d679 20 20 ipcsocket='/var/run/bitlbee.sock' 21 21 pcdir='$prefix/lib/pkgconfig' 22 systemlibdirs="/lib / lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"22 systemlibdirs="/lib /usr/lib /usr/local/lib" 23 23 24 24 msn=1 … … 156 156 157 157 echo CFLAGS=$CFLAGS >> Makefile.settings 158 echo CFLAGS+=-I`pwd` - I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings158 echo CFLAGS+=-I`pwd` -iquote`pwd`/lib -iquote`pwd`/protocols -I. >> Makefile.settings 159 159 160 160 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings … … 295 295 detect_resolv_dynamic() 296 296 { 297 TMPFILE=$(mktemp) 298 ret=1 299 echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null 297 echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null 300 298 if [ "$?" = "0" ]; then 301 299 echo 'EFLAGS+=-lresolv' >> Makefile.settings 302 ret=0 303 fi 304 305 rm -f $TMPFILE 306 return $ret 300 return 0 301 fi 302 303 return 1 307 304 } 308 305 309 306 detect_resolv_static() 310 307 { 311 TMPFILE=$(mktemp)312 ret=1313 308 for i in $systemlibdirs; do 314 309 if [ -f $i/libresolv.a ]; then 315 echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE-x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null310 echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null 316 311 if [ "$?" = "0" ]; then 317 312 echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings 318 ret =0313 return 0 319 314 fi 320 315 fi 321 316 done 322 317 323 rm -f $TMPFILE 324 return $ret 318 return 1 325 319 } 326 320 -
debian/bitlbee.init
r767a148 ra81d679 41 41 chown bitlbee: /var/run/bitlbee.pid 42 42 43 start-stop-daemon --start --quiet --pidfile $PIDFILE \ 43 # Clean up after the bug between 1.2-5 and 1.2.1-2 where BitlBee ran 44 # as root. (#494656 and #495877) Fixing this in the postinst script 45 # is not enough since the user will restart his BitlBee after up- 46 # grading the package, and the BitlBee running as root will then 47 # save its settings, re-setting ownership of the file to root. 48 # TODO: Remove this after a few revisions. 49 find /var/lib/bitlbee -uid 0 -name '*.xml' -exec chown bitlbee: {} \; 50 51 start-stop-daemon --start --quiet \ 44 52 --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS 45 53 } -
debian/changelog
r767a148 ra81d679 1 bitlbee (1.2.5-1) unstable; urgency=low2 3 * New upstream version.4 * Fixed issues with server-side MSN nickname corruption. (Closes: #538756)5 * Debconf translation fixes/additions. (Closes: #541754, #563504)6 7 -- Wilmer van der Gaast <wilmer@gaast.net> Wed, 17 Mar 2010 14:59:27 +00008 9 bitlbee (1.2.4-2) unstable; urgency=low10 11 * Merging in some changes from bzr-head:12 * Use libresolv.so where possible. (Closes: #551775)13 * Some include file changes that make the bitlbee-dev package useful again.14 15 -- Wilmer van der Gaast <wilmer@gaast.net> Thu, 19 Nov 2009 23:02:43 +000016 17 bitlbee (1.2.4-1) unstable; urgency=low18 19 * New upstream version.20 * Fixed issues with Yahoo! (Closes: #536178)21 22 -- Wilmer van der Gaast <wilmer@gaast.net> Sat, 17 Oct 2009 18:12:45 +010023 24 bitlbee (1.2.3-2) unstable; urgency=low25 26 * Fixed bitblee typo in prerm (introduced by NMU 1.2.1-1.1).27 (Closes: #531287)28 * Fixed bitlbee.deb dep in bitlbee-dev to deal with binary NMUs.29 (Closes: #531219)30 * Fixed free port detection code in debian/config which was a bit limited31 and also buggy.32 * Removing code that edits bitlbee.conf from postinst (and chown code in33 the init script), it's not really necessary anymore; bitlbee may only34 still run as root if the admin doesn't read conffile diffs.35 (Closes: #514572)36 * No longer overwriting port number info in /etc/default/bitlbee with37 what's in debconf. (Closes: #514148)38 * Added notes about the above two changes to bitlbee.conf.39 40 -- Wilmer van der Gaast <wilmer@gaast.net> Sun, 07 Jun 2009 21:17:39 +010041 42 bitlbee (1.2.3-1) unstable; urgency=critical43 44 * New upstream version.45 * Fixes another account hijacking issue. (Closes: #498159)46 * Restored --pidfile argument to start-stop-daemon, otherwise the init47 script fails to restart BitlBee when users are connected.48 49 -- Wilmer van der Gaast <wilmer@gaast.net> Sun, 07 Sep 2008 18:53:04 +010050 51 1 bitlbee (1.2.2-1) unstable; urgency=critical 52 2 -
debian/config
r767a148 ra81d679 2 2 3 3 . /usr/share/debconf/confmodule 4 [ -f /etc/default/bitlbee ] && . /etc/default/bitlbee5 4 6 5 db_title BitlBee 7 6 8 if [ -n "$BITLBEE_PORT" ]; then 9 db_set bitlbee/serveport "$BITLBEE_PORT" 10 else 11 db_get bitlbee/serveport 12 if [ "$RET" = "stillhavetoask" ]; then 13 listens=$(netstat -ltn | awk '{print $4}') 14 for port in 6667 6666 6668 6669; do 15 if [ $(expr "$listens " : ".*:$port\s") = "0" ]; then 16 break 17 fi 18 done 19 db_set bitlbee/serveport $port; 7 db_get bitlbee/serveport 8 if [ "$RET" = "stillhavetoask" ]; then 9 if netstat -ltn | grep ':6667' 2> /dev/null > /dev/null; then 10 port=6668; 11 else 12 port=6667; 20 13 fi 14 db_set bitlbee/serveport $port; 21 15 fi 22 16 -
debian/control
r767a148 ra81d679 19 19 Package: bitlbee-dev 20 20 Architecture: all 21 Depends: bitlbee ( >= ${source:Version}), bitlbee (<< ${source:Version}.1~)21 Depends: bitlbee (= ${binary:Version}) 22 22 Description: An IRC to other chat networks gateway 23 23 This program can be used as an IRC server which forwards everything you -
debian/patches/bitlbee.conf.diff
r767a148 ra81d679 1 --- debian/bitlbee/etc/bitlbee/bitlbee.conf 2009-06-01 00:20:24.000000000 +0100 2 +++ debian/bitlbee/etc/bitlbee/bitlbee.conf 2009-06-07 21:16:19.000000000 +0100 3 @@ -23,13 +23,18 @@ 1 === modified file 'bitlbee.conf' 2 --- debian/bitlbee/etc/bitlbee/bitlbee.conf 2008-08-26 22:33:54 +0000 3 +++ debian/bitlbee/etc/bitlbee/bitlbee.conf 2008-08-27 23:18:13 +0000 4 @@ -23,7 +23,7 @@ 4 5 ## If BitlBee is started by root as a daemon, it can drop root privileges, 5 6 ## and change to the specified user. 6 7 ## 7 8 -# User = bitlbee 8 +## DEBIAN NOTE: Without this, BitlBee will run as root!9 +##10 9 +User = bitlbee 11 10 12 11 ## DaemonPort/DaemonInterface: 13 12 ## 14 ## For daemon mode, you can specify on what interface and port the daemon 15 ## should be listening for connections. 16 ## 17 +## DEBIAN NOTE: The init script passes the -p flag to use the port number 18 +## set using debconf, this overrides the DaemonPort setting here. 19 +## 20 # DaemonInterface = 0.0.0.0 21 # DaemonPort = 6667 22 13 -
debian/po/POTFILES.in
r767a148 ra81d679 1 [type: gettext/rfc822deb] templates1 [type: gettext/rfc822deb] bitlbee.templates.master -
debian/postinst
r767a148 ra81d679 33 33 ## /etc/default/bitlbee: Auto-generated/updated script. 34 34 ## 35 ## If running in (fork)daemon mode, listen on this TCP port.35 ## Don't edit this line, use dpkg-reconfigure bitlbee 36 36 BITLBEE_PORT="$PORT" 37 37 … … 61 61 else 62 62 mv /usr/share/bitlbee/help.upgrading /usr/share/bitlbee/help.txt 63 fi 64 fi 65 66 if ! grep -qi '^User *= *' /etc/bitlbee/bitlbee.conf; then 67 echo 'Updating configuration file, enabling User-setting...' 68 if ! sed -i -e 's/# *User *= *.*/User = bitlbee/i' /etc/bitlbee/bitlbee.conf; then 69 echo 'Failed! BitlBee may run as root now, please check your configs.' 63 70 fi 64 71 fi -
debian/prerm
r767a148 ra81d679 11 11 else 12 12 if which invoke-rc.d >/dev/null 2>&1; then 13 invoke-rc.d bit lbee stop || exit 013 invoke-rc.d bitblee stop || exit 0 14 14 else 15 15 /etc/init.d/bitlbee stop || exit 0 -
doc/user-guide/commands.xml
r767a148 ra81d679 511 511 </bitlbee-setting> 512 512 513 <bitlbee-setting name="control_channel" type="string" scope="global">514 <default>&bitlbee</default>515 516 <description>517 <para>518 Normally the control channel where you can see all your contacts is called "&bitlbee". If you don't like this name, you can rename it to anything else using the <emphasis>rename</emphasis> command, or by changing this setting.519 </para>520 </description>521 </bitlbee-setting>522 523 513 <bitlbee-setting name="debug" type="boolean" scope="global"> 524 514 <default>false</default> … … 583 573 </para> 584 574 </note> 585 </description>586 587 </bitlbee-setting>588 589 <bitlbee-setting name="ignore_auth_requests" type="boolean" scope="account">590 <default>true</default>591 592 <description>593 <para>594 Only supported by OSCAR so far, you can use this setting to ignore ICQ authorization requests, which are hardly used for legitimate (i.e. non-spam) reasons anymore.595 </para>596 575 </description> 597 576 -
irc.c
r767a148 ra81d679 172 172 s = set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc ); 173 173 s = set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc ); 174 s = set_add( &irc->set, "control_channel", irc->channel, set_eval_control_channel, irc );175 174 s = set_add( &irc->set, "debug", "false", set_eval_bool, irc ); 176 175 s = set_add( &irc->set, "default_target", "root", NULL, irc ); -
protocols/jabber/jabber.c
r767a148 ra81d679 57 57 set_t *s; 58 58 char str[16]; 59 60 s = set_add( &acc->set, "activity_timeout", "600", set_eval_int, acc );61 59 62 60 g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] ); … … 323 321 bud = jabber_buddy_by_ext_jid( ic, who, 0 ); 324 322 else 325 bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_BARE_OK);323 bud = jabber_buddy_by_jid( ic, who, 0 ); 326 324 327 325 node = xt_new_node( "body", message, NULL ); … … 368 366 static void jabber_get_info( struct im_connection *ic, char *who ) 369 367 { 368 struct jabber_data *jd = ic->proto_data; 370 369 struct jabber_buddy *bud; 371 370 372 bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_FIRST ); 371 if( strchr( who, '/' ) ) 372 bud = jabber_buddy_by_jid( ic, who, 0 ); 373 else 374 { 375 char *s = jabber_normalize( who ); 376 bud = g_hash_table_lookup( jd->buddies, s ); 377 g_free( s ); 378 } 373 379 374 380 while( bud ) -
protocols/jabber/jabber.h
r767a148 ra81d679 120 120 }; 121 121 122 /* Somewhat messy data structure: We have a hash table with the bare JID as123 the key and the head of a struct jabber_buddy list as the value. The head124 is always a bare JID. If the JID has other resources (often the case,125 except for some transports that don't support multiple resources), those126 follow. In that case, the bare JID at the beginning doesn't actually127 refer to a real session and should only be used for operations that128 support incomplete JIDs. */129 122 struct jabber_buddy 130 123 { … … 141 134 GSList *features; 142 135 143 time_t last_ msg;136 time_t last_act; 144 137 jabber_buddy_flags_t flags; 145 138 … … 278 271 GET_BUDDY_EXACT = 2, /* Get an exact match (only makes sense with bare JIDs). */ 279 272 GET_BUDDY_FIRST = 4, /* No selection, simply get the first resource for this JID. */ 280 GET_BUDDY_BARE = 8, /* Get the bare version of the JID (possibly inexistent). */281 GET_BUDDY_BARE_OK = 16, /* Allow returning a bare JID if that seems better. */282 273 } get_buddy_flags_t; 283 274 -
protocols/jabber/jabber_util.c
r767a148 ra81d679 4 4 * Jabber module - Misc. stuff * 5 5 * * 6 * Copyright 2006 -2010 Wilmer van der Gaast <wilmer@gaast.net>6 * Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net> * 7 7 * * 8 8 * This program is free software; you can redistribute it and/or modify * … … 349 349 if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) ) 350 350 { 351 /* The first entry is always a bare JID. If there are more, we352 should ignore the first one here. */353 if( bud->next )354 bud = bud->next;355 356 351 /* If this is a transport buddy or whatever, it can't have more 357 352 than one instance, so this is always wrong: */ … … 388 383 else 389 384 { 390 new->full_jid = new->bare_jid = g_strdup( full_jid ); 385 /* Keep in mind that full_jid currently isn't really 386 a full JID... */ 387 new->bare_jid = g_strdup( full_jid ); 391 388 g_hash_table_insert( jd->buddies, new->bare_jid, new ); 392 393 if( s )394 {395 new->next = g_new0( struct jabber_buddy, 1 );396 new->next->bare_jid = new->bare_jid;397 new = new->next;398 }399 389 } 400 390 … … 422 412 { 423 413 struct jabber_data *jd = ic->proto_data; 424 struct jabber_buddy *bud , *head;414 struct jabber_buddy *bud; 425 415 char *s, *jid; 426 416 … … 434 424 if( ( bud = g_hash_table_lookup( jd->buddies, jid ) ) ) 435 425 { 436 bare_exists = 1;437 438 if( bud->next )439 bud = bud->next;440 441 426 /* Just return the first one for this bare JID. */ 442 427 if( flags & GET_BUDDY_FIRST ) … … 460 445 break; 461 446 } 447 else 448 { 449 /* This variable tells the if down here that the bare 450 JID already exists and we should feel free to add 451 more resources, if the caller asked for that. */ 452 bare_exists = 1; 453 } 462 454 463 455 if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && 464 ( bare_exists || imcb_find_buddy( ic, jid ) ) )456 ( !bare_exists || imcb_find_buddy( ic, jid ) ) ) 465 457 { 466 458 *s = '/'; … … 476 468 char *set; 477 469 478 head = g_hash_table_lookup( jd->buddies, jid ); 479 bud = ( head && head->next ) ? head->next : head; 470 bud = g_hash_table_lookup( jd->buddies, jid ); 480 471 481 472 g_free( jid ); … … 494 485 /* Looks like the caller doesn't care about details. */ 495 486 return bud; 496 else if( flags & GET_BUDDY_BARE )497 return head;498 487 499 488 best_prio = best_time = bud; … … 502 491 if( bud->priority > best_prio->priority ) 503 492 best_prio = bud; 504 if( bud->last_ msg > best_time->last_msg)493 if( bud->last_act > best_time->last_act ) 505 494 best_time = bud; 506 495 } … … 508 497 if( ( set = set_getstr( &ic->acc->set, "resource_select" ) ) == NULL ) 509 498 return NULL; 510 else if( strcmp( set, "priority" ) == 0 ) 499 else if( strcmp( set, "activity" ) == 0 ) 500 return best_time; 501 else /* if( strcmp( set, "priority" ) == 0 ) */ 511 502 return best_prio; 512 else if( flags & GET_BUDDY_BARE_OK ) /* && strcmp( set, "activity" ) == 0 */513 {514 if( best_time->last_msg + set_getint( &ic->acc->set, "activity_timeout" ) >= time( NULL ) )515 return best_time;516 else517 return head;518 }519 else520 return best_time;521 503 } 522 504 } … … 560 542 { 561 543 struct jabber_data *jd = ic->proto_data; 562 struct jabber_buddy *bud, *prev = NULL, *bi;544 struct jabber_buddy *bud, *prev, *bi; 563 545 char *s, *full_jid; 564 546 … … 570 552 if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) ) 571 553 { 572 if( bud->next )573 bud = (prev=bud)->next;574 575 554 /* If there's only one item in the list (and if the resource 576 555 matches), removing it is simple. (And the hash reference … … 580 559 ( bud->resource && s && strcmp( bud->resource, s + 1 ) == 0 ) ) ) 581 560 { 582 return jabber_buddy_remove_bare( ic, full_jid ); 561 g_hash_table_remove( jd->buddies, bud->bare_jid ); 562 g_free( bud->bare_jid ); 563 g_free( bud->ext_jid ); 564 g_free( bud->full_jid ); 565 g_free( bud->away_message ); 566 g_free( bud ); 567 568 g_free( full_jid ); 569 570 return 1; 583 571 } 584 572 else if( s == NULL || bud->resource == NULL ) … … 591 579 else 592 580 { 593 for( bi = bud ; bi; bi = (prev=bi)->next )581 for( bi = bud, prev = NULL; bi; bi = (prev=bi)->next ) 594 582 if( strcmp( bi->resource, s + 1 ) == 0 ) 595 583 break; … … 602 590 prev->next = bi->next; 603 591 else 604 /* Don't think this should ever happen anymore. */ 592 /* The hash table should point at the second 593 item, because we're removing the first. */ 605 594 g_hash_table_replace( jd->buddies, bi->bare_jid, bi->next ); 606 595 -
protocols/jabber/message.c
r767a148 ra81d679 71 71 if( bud ) 72 72 { 73 bud->last_ msg= time( NULL );73 bud->last_act = time( NULL ); 74 74 from = bud->ext_jid ? : bud->bare_jid; 75 75 } -
protocols/jabber/presence.c
r767a148 ra81d679 68 68 { 69 69 bud->away_state = NULL; 70 /* Let's only set last_act if there's *no* away state, 71 since it could be some auto-away thingy. */ 72 bud->last_act = time( NULL ); 70 73 } 71 74 -
protocols/oscar/oscar.c
r767a148 ra81d679 373 373 set_t *s; 374 374 375 s = set_add( &acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc ); 376 s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY; 377 375 378 if (isdigit(acc->user[0])) { 376 set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc); 377 } 378 379 s = set_add(&acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc); 380 s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY; 381 382 if(isdigit(acc->user[0])) { 383 s = set_add(&acc->set, "web_aware", "false", set_eval_bool, acc); 379 s = set_add( &acc->set, "web_aware", "false", set_eval_bool, acc ); 384 380 s->flags |= ACC_SET_OFFLINE_ONLY; 385 381 } … … 1216 1212 */ 1217 1213 static void gaim_icq_authask(struct im_connection *ic, guint32 uin, char *msg) { 1218 struct icq_auth *data ;1214 struct icq_auth *data = g_new(struct icq_auth, 1); 1219 1215 char *reason = NULL; 1220 1216 char *dialog_msg; 1221 1222 if (set_getbool(&ic->acc->set, "ignore_auth_requests")) 1223 return; 1224 1225 data = g_new(struct icq_auth, 1); 1226 1217 1227 1218 if (strlen(msg) > 6) 1228 1219 reason = msg + 6; -
root_commands.c
r767a148 ra81d679 2 2 * BitlBee -- An IRC to other IM-networks gateway * 3 3 * * 4 * Copyright 2002-20 10Wilmer van der Gaast and others *4 * Copyright 2002-2004 Wilmer van der Gaast and others * 5 5 \********************************************************************/ 6 6 … … 654 654 irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] ); 655 655 } 656 else if( g_strcasecmp( cmd[1], irc->channel ) == 0 )657 {658 if( strchr( CTYPES, cmd[2][0] ) && nick_ok( cmd[2] + 1 ) )659 {660 u = user_find( irc, irc->nick );661 662 irc_part( irc, u, irc->channel );663 g_free( irc->channel );664 irc->channel = g_strdup( cmd[2] );665 irc_join( irc, u, irc->channel );666 667 if( strcmp( cmd[0], "set_rename" ) != 0 )668 set_setstr( &irc->set, "control_channel", cmd[2] );669 }670 }671 656 else if( user_find( irc, cmd[2] ) && ( nick_cmp( cmd[1], cmd[2] ) != 0 ) ) 672 657 { … … 716 701 717 702 return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : SET_INVALID; 718 }719 720 char *set_eval_control_channel( set_t *set, char *new_name )721 {722 irc_t *irc = set->data;723 724 if( strcmp( irc->channel, new_name ) != 0 )725 {726 char *cmd[] = { "set_rename", irc->channel, new_name, NULL };727 728 cmd_rename( irc, cmd );729 }730 731 return strcmp( irc->channel, new_name ) == 0 ? new_name : SET_INVALID;732 703 } 733 704 -
tests/check_jabber_util.c
r767a148 ra81d679 14 14 15 15 budw1 = jabber_buddy_add( ic, "wilmer@gaast.net/BitlBee" ); 16 budw1->last_ msg= time( NULL ) - 100;16 budw1->last_act = time( NULL ) - 100; 17 17 budw2 = jabber_buddy_add( ic, "WILMER@gaast.net/Telepathy" ); 18 18 budw2->priority = 2; 19 budw2->last_ msg= time( NULL );19 budw2->last_act = time( NULL ); 20 20 budw3 = jabber_buddy_add( ic, "wilmer@GAAST.NET/bitlbee" ); 21 budw3->last_ msg= time( NULL ) - 200;21 budw3->last_act = time( NULL ) - 200; 22 22 budw3->priority = 4; 23 23 /* TODO(wilmer): Shouldn't this just return budw3? */ … … 60 60 fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/Telepathy" ) ); 61 61 fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/telepathy" ) ); 62 63 /* Test activity_timeout and GET_BUDDY_BARE_OK. */ 64 fail_unless( jabber_buddy_by_jid( ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK ) == budw1 ); 65 budw1->last_msg -= 50; 66 fail_unless( ( bud = jabber_buddy_by_jid( ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK ) ) != NULL ); 67 fail_unless( strcmp( bud->full_jid, "wilmer@gaast.net" ) == 0 ); 62 fail_unless( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) == budw1 ); 68 63 69 64 fail_if( jabber_buddy_remove( ic, "wilmer@gaast.net" ) ); 70 65 fail_unless( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) == budw1 ); 71 66 72 fail_if( jabber_buddy_remove( ic, "wilmer@gaast.net" ) );73 fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/bitlbee" ) );74 fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/BitlBee" ) );75 fail_if( jabber_buddy_by_jid( ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK ) );76 77 67 /* Check if remove_bare() indeed gets rid of all. */ 78 /* disable this one for now.79 68 fail_unless( jabber_buddy_remove_bare( ic, "wilmer@gaast.net" ) ); 80 69 fail_if( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) ); 81 */82 70 83 71 fail_if( jabber_buddy_remove( ic, "nekkid@lamejab.net/Illegal" ) ); 84 72 fail_unless( jabber_buddy_remove( ic, "nekkid@lamejab.net" ) ); 85 73 fail_if( jabber_buddy_by_jid( ic, "nekkid@lamejab.net", 0 ) ); 86 87 /* Fixing a bug in this branch that caused information to get lost when88 removing the first full JID from a list. */89 jabber_buddy_add( ic, "bugtest@google.com/A" );90 jabber_buddy_add( ic, "bugtest@google.com/B" );91 jabber_buddy_add( ic, "bugtest@google.com/C" );92 fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/A" ) );93 fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/B" ) );94 fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/C" ) );95 74 } 96 75 … … 106 85 jd->buddies = g_hash_table_new( g_str_hash, g_str_equal ); 107 86 set_add( &ic->acc->set, "resource_select", "priority", NULL, ic->acc ); 108 set_add( &ic->acc->set, "activity_timeout", "120", NULL, ic->acc );109 87 110 88 suite_add_tcase (s, tc_core);
Note: See TracChangeset
for help on using the changeset viewer.
