Changeset cd741d8 for protocols

Timestamp:

2009-11-23T23:23:37Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

45a19e5

Parents:

4e04194

Message:

Fixed compatibility with non-libpurple version: oscar is now recognized
as a protocol name, and removed prpl- hack from nogaim.c.

Location:

protocols

Files:

• nogaim.c (modified) (1 diff)
• nogaim.h (modified) (1 diff)
• purple/purple.c (modified) (3 diffs)

protocols/nogaim.c

@@ -111 +111 @@
                 if( g_strcasecmp( proto->name, name ) == 0 )
                         return proto;
-
-#ifdef WITH_PURPLE
-                /* I know, hardcoding is evil, but that doesn't make it
-                   impossible. :-) */
-                if( g_strncasecmp( proto->name, "prpl-", 5 ) == 0 &&
-                    g_strcasecmp( proto->name + 5, name ) == 0 )
-                        return proto;
-#endif
         }
         

protocols/nogaim.h

@@ -133 +133 @@
          * - The user sees this name ie. when imcb_log() is used. */
         const char *name;
+        void *data;
 
         /* Added this one to be able to add per-account settings, don't think

protocols/purple/purple.c

@@ -149 +149 @@
         purple_connections = g_slist_prepend( purple_connections, ic );
         
-        ic->proto_data = pa = purple_account_new( acc->user, acc->prpl->name );
+        ic->proto_data = pa = purple_account_new( acc->user, (char*) acc->prpl->data );
         purple_account_set_password( pa, acc->pass );
         purple_sync_settings( acc, pa );
@@ -451 +451 @@
 void purple_initmodule()
 {
+        struct prpl funcs;
         GList *prots;
         
@@ -478 +479 @@
         purple_prefs_load();
         
+        memset( &funcs, 0, sizeof( funcs ) );
+        funcs.login = purple_login;
+        funcs.init = purple_init;
+        funcs.logout = purple_logout;
+        funcs.buddy_msg = purple_buddy_msg;
+        funcs.away_states = purple_away_states;
+        funcs.set_away = purple_set_away;
+        funcs.add_buddy = purple_add_buddy;
+        funcs.remove_buddy = purple_remove_buddy;
+        funcs.keepalive = purple_keepalive;
+        funcs.send_typing = purple_send_typing;
+        funcs.handle_cmp = g_strcasecmp;
+        
         for( prots = purple_plugins_get_protocols(); prots; prots = prots->next )
         {
-                struct prpl *ret = g_new0( struct prpl, 1 );
                 PurplePlugin *prot = prots->data;
-                
-                ret->name = prot->info->id;
-                ret->login = purple_login;
-                ret->init = purple_init;
-                ret->logout = purple_logout;
-                ret->buddy_msg = purple_buddy_msg;
-                ret->away_states = purple_away_states;
-                ret->set_away = purple_set_away;
-                ret->add_buddy = purple_add_buddy;
-                ret->remove_buddy = purple_remove_buddy;
-                ret->keepalive = purple_keepalive;
-                ret->send_typing = purple_send_typing;
-                ret->handle_cmp = g_strcasecmp;
-                
+                struct prpl *ret;
+                
+                ret = g_memdup( &funcs, sizeof( funcs ) );
+                ret->name = ret->data = prot->info->id;
+                if( strncmp( ret->name, "prpl-", 5 ) == 0 )
+                        ret->name += 5;
                 register_protocol( ret );
-        }
-}
+                
+                if( g_strcasecmp( prot->info->id, "prpl-aim" ) == 0 )
+                {
+                        ret = g_memdup( &funcs, sizeof( funcs ) );
+                        ret->name = "oscar";
+                        ret->data = prot->info->id;
+                        register_protocol( ret );
+                }
+        }
+}