Changes in protocols/jabber/jabber_util.c [2e3a857:17a6ee9]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/jabber_util.c
r2e3a857 r17a6ee9 99 99 } 100 100 101 struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type )101 struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type, char *err_code ) 102 102 { 103 103 struct xt_node *node, *c; … … 111 111 c = xt_new_node( "error", NULL, c ); 112 112 xt_add_attr( c, "type", err_type ); 113 114 /* Add the error code, if present */ 115 if (err_code) 116 xt_add_attr( c, "code", err_code ); 113 117 114 118 /* To make the actual error packet, we copy the original packet and … … 275 279 presence_send_request( bla->ic, bla->handle, "subscribed" ); 276 280 277 if( imcb_find_buddy( bla->ic, bla->handle ) == NULL ) 278 imcb_ask_add( bla->ic, bla->handle, NULL ); 281 imcb_ask_add( bla->ic, bla->handle, NULL ); 279 282 280 283 g_free( bla->handle ); … … 458 461 459 462 if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && 460 ( bare_exists || imcb_find_buddy(ic, jid ) ) )463 ( bare_exists || bee_user_by_handle( ic->bee, ic, jid ) ) ) 461 464 { 462 465 *s = '/'; … … 479 482 if( bud == NULL ) 480 483 /* No match. Create it now? */ 481 return ( ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid_ ) ) ? 484 return ( ( flags & GET_BUDDY_CREAT ) && 485 bee_user_by_handle( ic->bee, ic, jid_ ) ) ? 482 486 jabber_buddy_add( ic, jid_ ) : NULL; 483 487 else if( bud->resource && ( flags & GET_BUDDY_EXACT ) ) … … 667 671 time_t jabber_get_timestamp( struct xt_node *xt ) 668 672 { 673 struct tm tp, utc; 669 674 struct xt_node *c; 675 time_t res, tres; 670 676 char *s = NULL; 671 struct tm tp;672 677 673 678 for( c = xt->children; ( c = xt_find_node( c, "x" ) ); c = c->next ) … … 687 692 tp.tm_year -= 1900; 688 693 tp.tm_mon --; 689 690 return mktime_utc( &tp ); 694 tp.tm_isdst = -1; /* GRRRRRRRRRRR */ 695 696 res = mktime( &tp ); 697 /* Problem is, mktime() just gave us the GMT timestamp for the 698 given local time... While the given time WAS NOT local. So 699 we should fix this now. 700 701 Now I could choose between messing with environment variables 702 (kludgy) or using timegm() (not portable)... Or doing the 703 following, which I actually prefer... */ 704 gmtime_r( &res, &utc ); 705 utc.tm_isdst = -1; /* Once more: GRRRRRRRRRRRRRRRRRR!!! */ 706 if( utc.tm_hour == tp.tm_hour && utc.tm_min == tp.tm_min ) 707 /* Sweet! We're in UTC right now... */ 708 return res; 709 710 tres = mktime( &utc ); 711 res += res - tres; 712 713 /* Yes, this is a hack. And it will go wrong around DST changes. 714 BUT this is more likely to be threadsafe than messing with 715 environment variables, and possibly more portable... */ 716 717 return res; 691 718 } 692 719
Note: See TracChangeset
for help on using the changeset viewer.