Changeset 71074ac for protocols/jabber

Timestamp:

2015-04-21T03:47:57Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

1493c4b, 356e2dd

Parents:

2fe8297

git-author:

dequis <dx@…> (05-04-15 20:47:16)

git-committer:

dequis <dx@…> (21-04-15 03:47:57)

Message:

jabber: Register "hipchat" protocol (only minimal support for now)

Another take on the subprotocols idea that, IMO, was a failure.

Unlike the other implementation, this one doesn't touch gtalk/facebook
accounts, it just adds another copy of the "jabber" prpl called "hipchat".

And, based on the protocol name:

• sets JFLAG_HIPCHAT to jabber_data
• sets the default value of the "server" setting
• only includes the oauth setting for jabber-type accounts

This is slightly more "hardcoded" but honestly facebook and gtalk are
just as hardcoded as this.

Copying the prpl is needed because the meaning of the usernames is
completely different (there's no srv lookup stuff either)

Location:

protocols/jabber

Files:

• jabber.c (modified) (5 diffs)
• jabber.h (modified) (1 diff)

protocols/jabber/jabber.c

@@ -61 +61 @@
         s = set_add(&acc->set, "activity_timeout", "600", set_eval_int, acc);
 
-        s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
-
         s = set_add(&acc->set, "display_name", NULL, NULL, acc);
 
@@ -83 +81 @@
         s = set_add(&acc->set, "server", NULL, set_eval_account, acc);
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
+
+        if (strcmp(acc->prpl->name, "hipchat") == 0) {
+                set_setstr(&acc->set, "server", "chat.hipchat.com");
+        } else {
+                s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+        }
 
         s = set_add(&acc->set, "ssl", "false", set_eval_bool, acc);
@@ -121 +125 @@
 
         jd->fd = jd->r_inpa = jd->w_inpa = -1;
+
+        if (strcmp(acc->prpl->name, "hipchat") == 0) {
+                jd->flags |= JFLAG_HIPCHAT;
+        }
 
         if (jd->server == NULL) {
@@ -656 +664 @@
 {
         struct prpl *ret = g_new0(struct prpl, 1);
+        struct prpl *hipchat = NULL;
 
         ret->name = "jabber";
@@ -686 +695 @@
 
         register_protocol(ret);
-}
+
+        /* Another one for hipchat, which has completely different logins */
+        hipchat = g_memdup(ret, sizeof(struct prpl));
+        hipchat->name = "hipchat";
+        register_protocol(hipchat);
+}

protocols/jabber/jabber.h

@@ -48 +48 @@
 
         JFLAG_GTALK =  0x100000,        /* Is Google Talk, as confirmed by iq discovery */
+        JFLAG_HIPCHAT = 0x200000,       /* Is hipchat, because prpl->name says so */
 
         JFLAG_SASL_FB = 0x10000,        /* Trying Facebook authentication. */