Changeset 7aadd71

Timestamp:

2010-05-09T18:05:55Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3130e70

Parents:

9ac3ed1

Message:

Keep track of contact groups in a slightly more efficient way.

Location:

protocols

Files:

• bee.c (modified) (1 diff)
• bee.h (modified) (4 diffs)
• bee_user.c (modified) (1 diff)
• nogaim.c (modified) (1 diff)

protocols/bee.c

@@ -72 +72 @@
                 set_del( &b->set, b->set->key );
         
+        bee_group_free( b );
+        
         g_free( b->user );
         g_free( b );

protocols/bee.h

@@ -35 +35 @@
         
         GSList *users;
+        GSList *groups;
         struct account *accounts; /* TODO(wilmer): Use GSList here too? */
         
@@ -60 +61 @@
         char *handle;
         char *fullname;
-        char *group;
+        struct bee_group *group;
 
         bee_user_flags_t flags;
@@ -69 +70 @@
         void *ui_data;
 } bee_user_t;
+
+typedef struct bee_group
+{
+        char *key;
+        char *name;
+} bee_group_t;
 
 typedef struct bee_ui_funcs
@@ -104 +111 @@
 bee_user_t *bee_user_by_handle( bee_t *bee, struct im_connection *ic, const char *handle );
 int bee_user_msg( bee_t *bee, bee_user_t *bu, const char *msg, int flags );
+bee_group_t *bee_group_by_name( bee_t *bee, const char *name, gboolean creat );
+void bee_group_free( bee_t *bee );
 
 /* Callbacks from IM modules to core: */

protocols/bee_user.c

@@ -100 +100 @@
         
         return st;
+}
+
+
+/* Groups */
+static bee_group_t *bee_group_new( bee_t *bee, const char *name )
+{
+        bee_group_t *bg = g_new0( bee_group_t, 1 );
+        
+        bg->name = g_strdup( name );
+        bg->key = g_utf8_casefold( name, -1 );
+        bee->groups = g_slist_prepend( bee->groups, bg );
+        
+        return bg;
+}
+
+bee_group_t *bee_group_by_name( bee_t *bee, const char *name, gboolean creat )
+{
+        GSList *l;
+        char *key;
+        
+        if( name == NULL )
+                return NULL;
+        
+        key = g_utf8_casefold( name, -1 );
+        for( l = bee->groups; l; l = l->next )
+        {
+                bee_group_t *bg = l->data;
+                if( strcmp( bg->key, key ) == 0 )
+                        break;
+        }
+        g_free( key );
+        
+        if( !l )
+                return creat ? bee_group_new( bee, name ) : NULL;
+        else
+                return l->data;
+}
+
+void bee_group_free( bee_t *bee )
+{
+        while( bee->groups )
+        {
+                bee_group_t *bg = bee->groups->data;
+                g_free( bg->name );
+                g_free( bg->key );
+                g_free( bg );
+                bee->groups = g_slist_remove( bee->groups, bee->groups->data );
+        }
 }
 

protocols/nogaim.c

@@ -389 +389 @@
         
         bu = bee_user_new( bee, ic, handle );
-        bu->group = g_strdup( group );
+        bu->group = bee_group_by_name( bee, group, TRUE );
 }