Changeset 96863f6

Timestamp:

2006-07-02T09:49:31Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

911f2eb

Parents:

fef6116

Message:

Added protocol-specific settings, made the server setting specific to only
OSCAR and Jabber.

Files:

• account.c (modified) (2 diffs)
• account.h (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (5 diffs)
• protocols/nogaim.h (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (3 diffs)

account.c

@@ -28 +28 @@
 #include "account.h"
 
-char *set_eval_account( set_t *set, char *value );
-
 account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
 {
@@ -51 +49 @@
         a->irc = irc;
         
-        s = set_add( &a->set, "auto_connect", NULL, set_eval_account, a );
+        s = set_add( &a->set, "auto_connect", "true", set_eval_account, a );
         s->flags |= ACC_SET_NOSAVE;
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
         s->flags |= ACC_SET_NOSAVE;
-        
-        s = set_add( &a->set, "server", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         
         s = set_add( &a->set, "username", NULL, set_eval_account, a );
         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         set_setstr( &a->set, "username", user );
+        
+        /* This function adds some more settings (and might want to do more
+           things that have to be done now, although I can't think of anything. */
+        if( prpl->acc_init )
+                prpl->acc_init( a );
         
         return( a );

account.h

@@ -50 +50 @@
 void account_off( irc_t *irc, account_t *a );
 
+char *set_eval_account( set_t *set, char *value );
+
 #define ACC_SET_NOSAVE          1
 #define ACC_SET_OFFLINE_ONLY    2

protocols/jabber/jabber.c

@@ -563 +563 @@
         account_t *acc;
         int port = -1, ssl = 0;
-        char *server = NULL, *s;
+        char *server = NULL;
 
         if (!gjc || gjc->state != JCONN_STATE_OFF)
@@ -569 +569 @@
 
         acc = GJ_GC(gjc)->acc;
-        if (acc->server) {
-                /* If there's a dot, assume there's a hostname in the beginning */
-                if (strchr(acc->server, '.')) {
-                        server = g_strdup(acc->server);
-                        if ((s = strchr(server, ':')))
-                                *s = 0;
-                }
-                
-                /* After the hostname, there can be a port number */
-                s = strchr(acc->server, ':');
-                if (s && isdigit(s[1]))
-                        sscanf(s + 1, "%d", &port);
-                
-                /* And if there's the string ssl, the user wants an SSL-connection */
-                if (strstr(acc->server, ":ssl") || g_strcasecmp(acc->server, "ssl") == 0)
-                        ssl = 1;
-        }
-        
-        if (port == -1 && !ssl)
-                port = DEFAULT_PORT;
-        else if (port == -1 && ssl)
-                port = DEFAULT_PORT_SSL;
-        else if (port < JABBER_PORT_MIN || port > JABBER_PORT_MAX) {
+        server = acc->server;
+        port = set_getint(&acc->set, "port");
+        ssl = set_getbool(&acc->set, "ssl");
+        
+        if (port < JABBER_PORT_MIN || port > JABBER_PORT_MAX) {
                 serv_got_crap(GJ_GC(gjc), "For security reasons, the Jabber port number must be in the %d-%d range.", JABBER_PORT_MIN, JABBER_PORT_MAX);
                 STATE_EVT(JCONN_STATE_OFF)
@@ -613 +595 @@
                 gjc->fd = proxy_connect(server, port, gjab_connected, GJ_GC(gjc));
         }
-        
-        g_free(server);
         
         if (!acc->gc || (gjc->fd < 0)) {
@@ -1516 +1496 @@
 }
 
+static void jabber_acc_init(account_t *acc)
+{
+        set_t *s;
+        
+        s = set_add( &acc->set, "port", "5222", set_eval_int, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "resource", "BitlBee", NULL, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "ssl", "false", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+}
+
 static void jabber_login(account_t *acc)
 {
-        struct gaim_connection *gc = new_gaim_conn(acc);
-        struct jabber_data *jd = gc->proto_data = g_new0(struct jabber_data, 1);
-        char *loginname = create_valid_jid(acc->user, DEFAULT_SERVER, "BitlBee");
-
+        struct gaim_connection *gc;
+        struct jabber_data *jd;
+        char *resource, *loginname;
+        
+        /* Time to move some data/things from the old syntax to the new one: */
+        if (acc->server) {
+                char *s, *tmp_server;
+                int port;
+                
+                if (g_strcasecmp(acc->server, "ssl") == 0) {
+                        set_setstr(&acc->set, "server", "");
+                        set_setint(&acc->set, "port", DEFAULT_PORT_SSL);
+                        set_setstr(&acc->set, "ssl", "true");
+                        
+                        g_free(acc->server);
+                        acc->server = NULL;
+                } else if ((s = strchr(acc->server, ':'))) {
+                        if (strstr(acc->server, ":ssl")) {
+                                set_setint(&acc->set, "port", DEFAULT_PORT_SSL);
+                                set_setstr(&acc->set, "ssl", "true");
+                        }
+                        if (isdigit(s[1])) {
+                                if (sscanf(s + 1, "%d", &port) == 1)
+                                        set_setint(&acc->set, "port", port);
+                        }
+                        tmp_server = g_strndup(acc->server, s - acc->server);
+                        set_setstr(&acc->set, "server", tmp_server);
+                        g_free(tmp_server);
+                }
+        }
+        
+        gc = new_gaim_conn(acc);
+        jd = gc->proto_data = g_new0(struct jabber_data, 1);
+        
+        resource = set_getstr(&acc->set, "resource");
+        loginname = create_valid_jid(acc->user, DEFAULT_SERVER, resource);
+        
         jd->hash = g_hash_table_new(g_str_hash, g_str_equal);
         jd->chats = NULL;       /* we have no chats yet */
@@ -2337 +2367 @@
         ret->name = "jabber";
         ret->away_states = jabber_away_states;
+        ret->acc_init = jabber_acc_init;
         ret->login = jabber_login;
         ret->close = jabber_close;

protocols/nogaim.h

@@ -129 +129 @@
         const char *name;
 
+        void (* acc_init)       (account_t *);
         void (* login)          (account_t *);
         void (* keepalive)      (struct gaim_connection *);

protocols/oscar/oscar.c

@@ -356 +356 @@
 }
 
+static void oscar_acc_init(account_t *acc)
+{
+        set_t *s;
+        
+        s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+}
+
 static void oscar_login(account_t *acc) {
         aim_session_t *sess;
@@ -386 +394 @@
         if (conn == NULL) {
                 hide_login_progress(gc, _("Unable to login to AIM"));
+                signoff(gc);
+                return;
+        }
+        
+        if (acc->server == NULL) {
+                hide_login_progress(gc, "No servername specified");
                 signoff(gc);
                 return;
@@ -2649 +2663 @@
         ret->away_states = oscar_away_states;
         ret->login = oscar_login;
+        ret->acc_init = oscar_acc_init;
         ret->close = oscar_close;
         ret->send_im = oscar_send_im;