Changeset 81ee561 for protocols/jabber/jabber.c

Timestamp:

2010-03-20T18:03:18Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

85693e6

Parents:

3330468 (diff), 0baed0d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging head. Most changes are not so relevant because they're to IM
modules.

File:

• protocols/jabber/jabber.c (modified) (4 diffs)

protocols/jabber/jabber.c

@@ -58 +58 @@
         char str[16];
         
+        s = set_add( &acc->set, "activity_timeout", "600", set_eval_int, acc );
+        
         g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
         s = set_add( &acc->set, "port", str, set_eval_int, acc );
@@ -67 +69 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
-        s = set_add( &acc->set, "resource_select", "priority", NULL, acc );
+        s = set_add( &acc->set, "resource_select", "activity", NULL, acc );
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
@@ -307 +309 @@
                 bud = jabber_buddy_by_ext_jid( ic, who, 0 );
         else
-                bud = jabber_buddy_by_jid( ic, who, 0 );
+                bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_BARE_OK );
         
         node = xt_new_node( "body", message, NULL );
@@ -352 +354 @@
 static void jabber_get_info( struct im_connection *ic, char *who )
 {
-        struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud;
         
-        if( strchr( who, '/' ) )
-                bud = jabber_buddy_by_jid( ic, who, 0 );
-        else
-        {
-                char *s = jabber_normalize( who );
-                bud = g_hash_table_lookup( jd->buddies, s );
-                g_free( s );
-        }
+        bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_FIRST );
         
         while( bud )