Changes in protocols/jabber/jabber.c [75a4b85:75cde5d]

File:

• protocols/jabber/jabber.c (modified) (14 diffs)

protocols/jabber/jabber.c

@@ -471 +471 @@
 }
 
-static gboolean jabber_callback(gpointer data, gint source, b_input_condition condition)
+static void jabber_callback(gpointer data, gint source, GaimInputCondition condition)
 {
         struct gaim_connection *gc = (struct gaim_connection *)data;
@@ -477 +477 @@
 
         gjab_recv(jd->gjc);
-        
-        return TRUE;
 }
 
@@ -489 +487 @@
 }
 
-static gboolean gjab_connected(gpointer data, gint source, b_input_condition cond)
+static void gjab_connected(gpointer data, gint source, GaimInputCondition cond)
 {
         xmlnode x;
@@ -499 +497 @@
         if (!g_slist_find(get_connections(), gc)) {
                 closesocket(source);
-                return FALSE;
+                return;
         }
 
@@ -510 +508 @@
         if (source == -1) {
                 STATE_EVT(JCONN_STATE_OFF)
-                return FALSE;
+                return;
         }
 
@@ -532 +530 @@
 
         gc = GJ_GC(gjc);
-        gc->inpa = b_input_add(gjc->fd, GAIM_INPUT_READ, jabber_callback, gc);
-        
-        return FALSE;
-}
-
-static gboolean gjab_connected_ssl(gpointer data, void *source, b_input_condition cond)
+        gc->inpa = gaim_input_add(gjc->fd, GAIM_INPUT_READ, jabber_callback, gc);
+}
+
+static void gjab_connected_ssl(gpointer data, void *source, GaimInputCondition cond)
 {
         struct gaim_connection *gc = data;
@@ -548 +544 @@
         if (source == NULL) {
                 STATE_EVT(JCONN_STATE_OFF)
-                return FALSE;
+                return;
         }
         
         if (!g_slist_find(get_connections(), gc)) {
                 ssl_disconnect(source);
-                return FALSE;
+                return;
         }
         
-        return gjab_connected(data, gjc->fd, cond);
+        gjab_connected(data, gjc->fd, cond);
 }
 
 static void gjab_start(gjconn gjc)
 {
-        account_t *acc;
+        struct aim_user *user;
         int port = -1, ssl = 0;
-        char *server = NULL;
+        char *server = NULL, *s;
 
         if (!gjc || gjc->state != JCONN_STATE_OFF)
                 return;
 
-        acc = GJ_GC(gjc)->acc;
-        server = acc->server;
-        port = set_getint(&acc->set, "port");
-        ssl = set_getbool(&acc->set, "ssl");
+        user = GJ_GC(gjc)->user;
+        if (*user->proto_opt[0]) {
+                /* If there's a dot, assume there's a hostname in the beginning */
+                if (strchr(user->proto_opt[0], '.')) {
+                        server = g_strdup(user->proto_opt[0]);
+                        if ((s = strchr(server, ':')))
+                                *s = 0;
+                }
+                
+                /* After the hostname, there can be a port number */
+                s = strchr(user->proto_opt[0], ':');
+                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(user->proto_opt[0], ":ssl") || g_strcasecmp(user->proto_opt[0], "ssl") == 0)
+                        ssl = 1;
+        }
         
-        if (port < JABBER_PORT_MIN || port > JABBER_PORT_MAX) {
+        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) {
                 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)
@@ -596 +610 @@
         }
         
-        if (!acc->gc || (gjc->fd < 0)) {
+        g_free(server);
+        
+        if (!user->gc || (gjc->fd < 0)) {
                 STATE_EVT(JCONN_STATE_OFF)
                 return;
@@ -1496 +1512 @@
 }
 
-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;
-        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);
-        
-        if( strchr( acc->user, '@' ) == NULL )
-        {
-                hide_login_progress( gc, "Invalid account name" );
-                signoff( gc );
-                return;
-        }
-        
-        resource = set_getstr(&acc->set, "resource");
-        loginname = create_valid_jid(acc->user, DEFAULT_SERVER, resource);
-        
+static void jabber_login(struct aim_user *user)
+{
+        struct gaim_connection *gc = new_gaim_conn(user);
+        struct jabber_data *jd = gc->proto_data = g_new0(struct jabber_data, 1);
+        char *loginname = create_valid_jid(user->username, DEFAULT_SERVER, "BitlBee");
+
         jd->hash = g_hash_table_new(g_str_hash, g_str_equal);
         jd->chats = NULL;       /* we have no chats yet */
@@ -1564 +1523 @@
         set_login_progress(gc, 1, _("Connecting"));
 
-        if (!(jd->gjc = gjab_new(loginname, acc->pass, gc))) {
+        if (!(jd->gjc = gjab_new(loginname, user->password, gc))) {
                 g_free(loginname);
                 hide_login_progress(gc, _("Unable to connect"));
@@ -1584 +1543 @@
 }
 
-static gboolean jabber_free(gpointer data, gint fd, b_input_condition cond)
+static gboolean jabber_free(gpointer data)
 {
         struct jabber_data *jd = data;
@@ -1629 +1588 @@
         }
         if (gc->inpa)
-                b_event_remove(gc->inpa);
+                gaim_input_remove(gc->inpa);
 
         if(jd) {
-                b_timeout_add(50, jabber_free, jd);
+                g_timeout_add(50, jabber_free, jd);
                 if(jd->gjc != NULL)
                         xmlnode_free(jd->gjc->current);
@@ -2374 +2333 @@
         ret->name = "jabber";
         ret->away_states = jabber_away_states;
-        ret->acc_init = jabber_acc_init;
         ret->login = jabber_login;
         ret->close = jabber_close;
@@ -2387 +2345 @@
         ret->alias_buddy = jabber_roster_update;
         ret->group_buddy = jabber_group_change;
-        ret->handle_cmp = g_strcasecmp;
+        ret->cmp_buddynames = g_strcasecmp;
 
         register_protocol (ret);