Changeset bd69a21 for irc.c

Timestamp:

2005-12-15T12:24:25Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

4146a07

Parents:

2983f5e (diff), bf02a67 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Wilmer

File:

• irc.c (modified) (5 diffs)

irc.c

@@ -31 +31 @@
 
 GSList *irc_connection_list = NULL;
+
+static char *passchange (irc_t *irc, void *set, char *value) 
+{
+        irc_setpass (irc, value);
+        return (NULL);
+}
 
 irc_t *irc_new( int fd )
@@ -129 +135 @@
         set_add( irc, "to_char", ": ", set_eval_to_char );
         set_add( irc, "typing_notice", "false", set_eval_bool );
+        set_add( irc, "password", NULL, passchange);
         
         conf_loaddefaults( irc );
@@ -154 +161 @@
         
         if( irc->status >= USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
-                if( !bitlbee_save( irc ) )
+                if( storage_save( irc, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
         
@@ -259 +266 @@
         if( global.conf->runmode == RUNMODE_INETD )
                 g_main_quit( global.loop );
+}
+
+/* USE WITH CAUTION!
+   Sets pass without checking */
+void irc_setpass (irc_t *irc, const char *pass) 
+{
+        if (irc->password) g_free (irc->password);
+        
+        if (pass) {
+                irc->password = g_strdup (pass);
+                irc_usermsg (irc, "Password successfully changed");
+        } else {
+                irc->password = NULL;
+        }
 }
 
@@ -1510 +1531 @@
                         {
                                 irc_write( irc, ":%s!%s@%s %s %s :%s%s", u->nick, u->user, u->host,
-                                           type, to, prefix, line );
+                                           type, to, prefix ? prefix : "", line );
                         }
                         line = s + 1;