Changeset a21a8ac for protocols/jabber/jabber_util.c

Timestamp:

2006-10-10T12:05:42Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8eb10c9

Parents:

6a1128d

Message:

Added resource selection (based on priority or time of last message) to
budd_by_jid(), added a full_jid property to easily address that resource
without having to rebuild the full JID every time and implemented typing
notification shite.

File:

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

protocols/jabber/jabber_util.c

@@ -247 +247 @@
         
         *s = '/';
-        new->resource = g_strdup( s + 1 );
+        new->full_jid = g_strdup( full_jid );
+        new->resource = strchr( new->full_jid, '/' ) + 1;
         
         return new;
@@ -268 +269 @@
         else
         {
-                /* TODO: Add selection. */
-                return g_hash_table_lookup( jd->buddies, jid );
+                struct jabber_buddy *best_prio, *best_time;
+                char *set;
+                
+                best_prio = best_time = bud = g_hash_table_lookup( jd->buddies, jid );
+                for( ; bud; bud = bud->next )
+                {
+                        if( bud->priority > best_prio->priority )
+                                best_prio = bud;
+                        if( bud->last_act > best_time->last_act )
+                                best_time = bud;
+                }
+                
+                if( ( set = set_getstr( &gc->acc->set, "resource_select" ) ) == NULL )
+                        return NULL;
+                else if( strcmp( set, "activity" ) == 0 )
+                        return best_time;
+                else /* if( strcmp( set, "priority" ) == 0 ) */
+                        return best_prio;
         }
         
@@ -295 +312 @@
                         g_hash_table_remove( jd->buddies, bud->handle );
                         g_free( bud->handle );
-                        g_free( bud->resource );
+                        g_free( bud->full_jid );
                         g_free( bud->away_message );
                         g_free( bud );
@@ -314 +331 @@
                                         g_hash_table_replace( jd->buddies, bi->handle, bi->next );
                                 
-                                g_free( bi->resource );
+                                g_free( bi->full_jid );
                                 g_free( bi->away_message );
                                 g_free( bi );