Changes in protocols/nogaim.c [d636233:4bfca70]

File:

• protocols/nogaim.c (modified) (10 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] =
 {
@@ -58 +55 @@
 GSList *connections;
 
+#ifdef WITH_PLUGINS
+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;
+}
+
+void load_plugins(void)
+{
+        GDir *dir;
+        GError *error = NULL;
+
+        dir = g_dir_open(global.conf->plugindir, 0, &error);
+
+        if (dir) {
+                const gchar *entry;
+                char *path;
+
+                while ((entry = g_dir_read_name(dir))) {
+                        path = g_build_filename(global.conf->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);
+        }
+}
+#endif
 
 /* 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()
 {
-        proto_prpl[PROTO_MSN] = g_new0 ( struct prpl, 1 );
+        extern void msn_init();
+        extern void oscar_init();
+        extern void byahoo_init();
+        extern void jabber_init();
+
 #ifdef WITH_MSN
-        msn_init( proto_prpl[PROTO_MSN] );
+        msn_init();
 #endif
 
-        proto_prpl[PROTO_OSCAR] = g_new0( struct prpl, 1 );
 #ifdef WITH_OSCAR
-        oscar_init( proto_prpl[PROTO_OSCAR] );
+        oscar_init();
 #endif
         
-        proto_prpl[PROTO_YAHOO] = g_new0( struct prpl, 1 );
 #ifdef WITH_YAHOO
-        byahoo_init( proto_prpl[PROTO_YAHOO] );
+        byahoo_init();
 #endif
         
-        proto_prpl[PROTO_JABBER] = g_new0( struct prpl, 1 );
 #ifdef WITH_JABBER
-        jabber_init( proto_prpl[PROTO_JABBER] );
+        jabber_init();
+#endif
+
+#ifdef WITH_PLUGINS
+        load_plugins();
 #endif
 }
@@ -172 +244 @@
         gc = g_new0( struct gaim_connection, 1 );
         
-        gc->protocol = user->protocol;
-        gc->prpl = proto_prpl[gc->protocol];
+        gc->prpl = user->prpl;
         g_snprintf( gc->username, sizeof( gc->username ), "%s", user->username );
         g_snprintf( gc->password, sizeof( gc->password ), "%s", user->password );
@@ -254 +325 @@
         /* Try to find a different connection on the same protocol. */
         for( a = gc->irc->accounts; a; a = a->next )
-                if( proto_prpl[a->protocol] == gc->prpl && a->gc != gc )
+                if( a->prpl == gc->prpl && a->gc != gc )
                         break;
         
         /* If we found one, add the screenname to the acc_id. */
         if( a )
-                g_snprintf( acc_id, 32, "%s(%s)", proto_name[gc->protocol], gc->username );
+                g_snprintf( acc_id, 32, "%s(%s)", gc->prpl->name, gc->username );
         else
-                g_snprintf( acc_id, 32, "%s", proto_name[gc->protocol] );
+                g_snprintf( acc_id, 32, "%s", gc->prpl->name );
         
         irc_usermsg( gc->irc, "%s - %s", acc_id, msg );
@@ -295 +366 @@
         if( u && u->away ) proto_away( gc, u->away );
         
-        if( gc->protocol == PROTO_ICQ )
+        if( !strcmp(gc->prpl->name, "icq") )
         {
                 for( u = gc->irc->users; u; u = u->next )
@@ -430 +501 @@
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( gc->irc, handle, gc->protocol, realname ) );
+        strcpy( nick, nick_get( gc->irc, handle, gc->prpl, realname ) );
         
         u = user_add( gc->irc, nick );
@@ -454 +525 @@
         else
         {
-                u->host = g_strdup( proto_name[gc->user->protocol] );
+                u->host = g_strdup( gc->user->prpl->name );
                 u->user = g_strdup( handle );
         }
@@ -583 +654 @@
         }
         
-        if( ( type & UC_UNAVAILABLE ) && ( gc->protocol == PROTO_OSCAR || gc->protocol == PROTO_TOC ) )
+        if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "oscar") || !strcmp(gc->prpl->name, "icq")) )
         {
                 u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && ( gc->protocol == PROTO_JABBER ) )
+        else if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "jabber") ) )
         {
                 if( type & UC_DND )
@@ -697 +768 @@
 }
 
-void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout )
+void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout, int type )
 {
         user_t *u;
@@ -704 +775 @@
                 return;
         
-        if( ( u = user_findhandle( gc, handle ) ) )
-                irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, "\1TYPING 1\1" );
+        if( ( u = user_findhandle( gc, handle ) ) ) {
+                /* If type is:
+                 * 0: user has stopped typing
+                 * 1: user is actively typing
+                 * 2: user has entered text, but is not actively typing
+                 */
+                if (type == 0 || type == 1 || type == 2) {
+                        char buf[256]; 
+                        g_snprintf(buf, 256, "\1TYPING %d\1", type); 
+                        irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, buf );
+                }
+        }
 }