Changes in protocols/nogaim.c [7b23afd:06045f6]

File:

• protocols/nogaim.c (modified) (21 diffs)

protocols/nogaim.c

@@ -39 +39 @@
 #include <iconv.h>
 
+struct prpl *proto_prpl[PROTO_MAX];
+char proto_name[PROTO_MAX][8] = { "TOC", "OSCAR", "YAHOO", "ICQ", "MSN", "", "", "", "JABBER", "", "", "", "", "", "", "" };
+
 static char *proto_away_alias[7][5] =
 {
@@ -55 +58 @@
 GSList *connections;
 
-gboolean load_plugin(char *path)
-{
-        void (*init_function) (void);
-        
-        GModule *mod = g_module_open(path, G_MODULE_BIND_LAZY);
-
-        if(!mod) {
-                log_message(LOGLVL_ERROR, "Can't find `%s', not loading", path);
-                return FALSE;
-        }
-
-        if(!g_module_symbol(mod,"init_plugin",(gpointer *) &init_function)) {
-                log_message(LOGLVL_WARNING, "Can't find function `init_plugin' in `%s'\n", path);
-                return FALSE;
-        }
-
-        init_function();
-
-        return TRUE;
-}
 
 /* nogaim.c */
 
-GList *protocols = NULL;
-  
-void register_protocol (struct prpl *p)
-{
-        protocols = g_list_append(protocols, p);
-}
-
- 
-struct prpl *find_protocol(const char *name)
-{
-        GList *gl;
-        for (gl = protocols; gl; gl = gl->next) 
-        {
-                struct prpl *proto = gl->data;
-                if(!g_strcasecmp(proto->name, name)) 
-                        return proto;
-        }
-        return NULL;
-}
-
-/* nogaim.c */
 void nogaim_init()
 {
-        GDir *dir;
-        GError *error = NULL;
-
+        proto_prpl[PROTO_MSN] = g_new0 ( struct prpl, 1 );
 #ifdef WITH_MSN
-        extern void msn_init();
-        msn_init();
+        msn_init( proto_prpl[PROTO_MSN] );
 #endif
 
+        proto_prpl[PROTO_OSCAR] = g_new0( struct prpl, 1 );
 #ifdef WITH_OSCAR
-        extern void oscar_init();
-        oscar_init();
+        oscar_init( proto_prpl[PROTO_OSCAR] );
 #endif
         
+        proto_prpl[PROTO_YAHOO] = g_new0( struct prpl, 1 );
 #ifdef WITH_YAHOO
-        extern void byahoo_init();
-        byahoo_init();
+        byahoo_init( proto_prpl[PROTO_YAHOO] );
 #endif
         
+        proto_prpl[PROTO_JABBER] = g_new0( struct prpl, 1 );
 #ifdef WITH_JABBER
-        extern void jabber_init();
-        jabber_init();
+        jabber_init( proto_prpl[PROTO_JABBER] );
 #endif
-
-        dir = g_dir_open(PLUGINDIR, 0, &error);
-
-        if (dir) {
-                const gchar *entry;
-                char *path;
-
-                while ((entry = g_dir_read_name(dir))) {
-                        path = g_build_filename(PLUGINDIR, entry, NULL);
-                        if(!path) {
-                                log_message(LOGLVL_WARNING, "Can't build path for %s\n", entry);
-                                continue;
-                        }
-
-                        load_plugin(path);
-
-                        g_free(path);
-                }
-
-                g_dir_close(dir);
-        }
 }
 
@@ -184 +122 @@
                         gc->prpl->set_away( gc, s, away );
                         if( set_getint( gc->irc, "debug" ) )
-                                irc_usermsg( gc->irc, "Setting away state for %s to %s", gc->prpl->name, s );
+                                irc_usermsg( gc->irc, "Setting away state for %s to %s", proto_name[gc->protocol], s );
                 }
                 else
@@ -230 +168 @@
    way for now because I don't want to touch the Gaim code too much since
    it's not going to be here for too long anymore. */
-int handle_cmp( char *a, char *b, struct prpl *protocol )
-{
-        if( !strcmp(protocol->name, "oscar") )
+int handle_cmp( char *a, char *b, int protocol )
+{
+        if( protocol == PROTO_TOC || protocol == PROTO_ICQ )
         {
                 /* AIM, being teh evil, thinks it's cool that users can put
@@ -272 +210 @@
         gc = g_new0( struct gaim_connection, 1 );
         
-        gc->prpl = user->prpl;
+        gc->protocol = user->protocol;
+        gc->prpl = proto_prpl[gc->protocol];
         g_snprintf( gc->username, sizeof( gc->username ), "%s", user->username );
         g_snprintf( gc->password, sizeof( gc->password ), "%s", user->password );
@@ -315 +254 @@
 void set_login_progress( struct gaim_connection *gc, int step, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Logging in: %s", gc->prpl->name, gc->username, msg );
+        irc_usermsg( gc->irc, "%s(%s) - Logging in: %s", proto_name[gc->protocol], gc->username, msg );
 }
 
@@ -321 +260 @@
 void hide_login_progress( struct gaim_connection *gc, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Login error: %s", gc->prpl->name, gc->username, msg );
+        irc_usermsg( gc->irc, "%s(%s) - Login error: %s", proto_name[gc->protocol], gc->username, msg );
 }
 
@@ -327 +266 @@
 void hide_login_progress_error( struct gaim_connection *gc, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Logged out: %s", gc->prpl->name, gc->username, msg );
+        irc_usermsg( gc->irc, "%s(%s) - Logged out: %s", proto_name[gc->protocol], gc->username, msg );
 }
 
@@ -350 +289 @@
                 strip_html( msg );
         
-        irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, msg );
+        irc_usermsg( gc->irc, "%s(%s) - %s", proto_name[gc->protocol], gc->username, msg );
 }
 
@@ -375 +314 @@
         u = user_find( gc->irc, gc->irc->nick );
         
-        irc_usermsg( gc->irc, "%s(%s) - Logged in", gc->prpl->name, gc->username );
+        irc_usermsg( gc->irc, "%s(%s) - Logged in", proto_name[gc->protocol], gc->username );
         
         gc->keepalive = g_timeout_add( 60000, send_keepalive, gc );
@@ -382 +321 @@
         if( u && u->away ) proto_away( gc, u->away );
         
-        if( !strcmp(gc->prpl->name, "icq") )
+        if( gc->protocol == PROTO_ICQ )
         {
                 for( u = gc->irc->users; u; u = u->next )
@@ -422 +361 @@
         account_t *a;
         
-        irc_usermsg( gc->irc, "%s(%s) - Signing off..", gc->prpl->name, gc->username );
+        irc_usermsg( gc->irc, "%s(%s) - Signing off..", proto_name[gc->protocol], gc->username );
 
         gaim_input_remove( gc->keepalive );
@@ -454 +393 @@
         {
                 int delay = set_getint( irc, "auto_reconnect_delay" );
-                irc_usermsg( gc->irc, "%s(%s) - Reconnecting in %d seconds..", gc->prpl->name, gc->username, delay);
+                irc_usermsg( gc->irc, "%s(%s) - Reconnecting in %d seconds..", proto_name[gc->protocol], gc->username, delay);
                 
                 a->reconnect = 1;
@@ -468 +407 @@
 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Error: %s", gc->username, title, msg );
+        irc_usermsg( gc->irc, "%s(%s) - Error: %s", proto_name[gc->protocol], gc->username, msg );
 }
 
@@ -510 +449 @@
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( gc->irc, handle, gc->prpl, realname ) );
+        strcpy( nick, nick_get( gc->irc, handle, gc->protocol, realname ) );
         
         u = user_add( gc->irc, nick );
@@ -534 +473 @@
         else
         {
-                u->host = g_strdup( gc->user->prpl->name );
+                u->host = g_strdup( proto_name[gc->user->protocol] );
                 u->user = g_strdup( handle );
         }
@@ -628 +567 @@
                         if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 )
                         {
-                                irc_usermsg( gc->irc, "serv_got_update() for handle %s on connection %s(%s):", handle, gc->prpl->name, gc->username );
+                                irc_usermsg( gc->irc, "serv_got_update() for handle %s on connection %s(%s):", handle, proto_name[gc->protocol], gc->username );
                                 irc_usermsg( gc->irc, "loggedin = %d, type = %d", loggedin, type );
                         }
@@ -663 +602 @@
         }
         
-        if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "oscar") || !strcmp(gc->prpl->name, "icq")) )
+        if( ( type & UC_UNAVAILABLE ) && ( gc->protocol == PROTO_OSCAR || gc->protocol == PROTO_TOC ) )
         {
                 u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "jabber") ) )
+        else if( ( type & UC_UNAVAILABLE ) && ( gc->protocol == PROTO_JABBER ) )
         {
                 if( type & UC_DND )
@@ -709 +648 @@
                 {
                         if( set_getint( irc, "debug" ) )
-                                irc_usermsg( irc, "Ignoring message from unknown handle %s on connection %s(%s)", handle, gc->prpl->name, gc->username );
+                                irc_usermsg( irc, "Ignoring message from unknown handle %s on connection %s(%s)", handle, proto_name[gc->protocol], gc->username );
                         
                         return;
@@ -731 +670 @@
                 else
                 {
-                        irc_usermsg( irc, "Message from unknown handle %s on connection %s(%s):", handle, gc->prpl->name, gc->username );
+                        irc_usermsg( irc, "Message from unknown handle %s on connection %s(%s):", handle, proto_name[gc->protocol], gc->username );
                         u = user_find( irc, irc->mynick );
                 }
@@ -897 +836 @@
         
         /* It might be yourself! */
-        if( handle_cmp ( handle, b->gc->user->username, b->gc->prpl ) == 0 )
+        if( handle_cmp ( handle, b->gc->user->username, b->gc->protocol ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );