Changeset 9df916f for irc.c

Timestamp:

2005-12-09T20:48:45Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

34759e6

Parents:

c2295f7 (diff), 87c24ba (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 my storage abstraction changes

File:

• irc.c (modified) (3 diffs)

irc.c

@@ -32 +32 @@
 GSList *irc_connection_list = NULL;
 
-char *passchange (irc_t *irc, void *set, char *value) 
-{
-        setpassnc (irc, value);
+static char *passchange (irc_t *irc, void *set, char *value) 
+{
+        irc_setpass (irc, value);
         return (NULL);
 }
@@ -161 +161 @@
         
         if( irc->status >= USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
-                if( !bitlbee_save( irc ) )
+                if( !global.storage->save( irc, TRUE ) )
                         irc_usermsg( irc, "Error while saving settings!" );
         
@@ -266 +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;
+        }
 }