Changeset 6d544a1

Timestamp:

2010-11-20T11:48:04Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ef043d3

Parents:

4eb75b2

Message:

Restore support for joining password-protected Jabber rooms. Now using a
simple Jabber-specific room setting since AFAIK room passwords are pretty
uncommon otherwise. Should deprecate the "password" argument to chat_join
but that's a PITA because of API compatibility. :-/

File:

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

protocols/jabber/jabber.c

@@ -460 +460 @@
                 imcb_error( ic, "Already present in chat `%s'", room );
         else
-                return jabber_chat_join( ic, room, nick, password );
+                return jabber_chat_join( ic, room, nick, set_getstr( sets, "password" ) );
         
         return NULL;
@@ -552 +552 @@
 }
 
+void jabber_chat_add_settings( account_t *acc, set_t **head )
+{
+        /* Meh. Stupid room passwords. Not trying to obfuscate/hide
+           them from the user for now. */
+        set_add( head, "password", NULL, NULL, NULL );
+}
+
+void jabber_chat_free_settings( account_t *acc, set_t **head )
+{
+        set_del( head, "password" );
+}
+
 void jabber_initmodule()
 {
@@ -557 +569 @@
         
         ret->name = "jabber";
-    ret->mms = 0;                        /* no limit */
+        ret->mms = 0;                        /* no limit */
         ret->login = jabber_login;
         ret->init = jabber_init;
@@ -573 +585 @@
         ret->chat_leave = jabber_chat_leave_;
         ret->chat_join = jabber_chat_join_;
+        ret->chat_add_settings = jabber_chat_add_settings;
+        ret->chat_free_settings = jabber_chat_free_settings;
         ret->keepalive = jabber_keepalive;
         ret->send_typing = jabber_send_typing;