Changeset ced1e17 for storage_xml.c


Ignore:
Timestamp:
2008-09-07T14:34:50Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
2bebe15
Parents:
d4810df (diff), ba3a8a5 (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:

Merging BitlBee 1.2.3 release.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • storage_xml.c

    rd4810df rced1e17  
    288288}
    289289
    290 static storage_status_t xml_load_real( const char *my_nick, const char *password, irc_t *irc, xml_pass_st action )
     290static storage_status_t xml_load_real( irc_t *irc, const char *my_nick, const char *password, xml_pass_st action )
    291291{
    292292        GMarkupParseContext *ctx;
     
    295295        GError *gerr = NULL;
    296296        int fd, st;
    297        
    298         if( irc && irc->status & USTATUS_IDENTIFIED )
    299                 return( 1 );
    300297       
    301298        xd = g_new0( struct xml_parsedata, 1 );
     
    350347                return STORAGE_OK;
    351348       
    352         irc->status |= USTATUS_IDENTIFIED;
    353        
    354349        return STORAGE_OK;
    355350}
    356351
    357 static storage_status_t xml_load( const char *my_nick, const char *password, irc_t *irc )
    358 {
    359         return xml_load_real( my_nick, password, irc, XML_PASS_UNKNOWN );
     352static storage_status_t xml_load( irc_t *irc, const char *password )
     353{
     354        return xml_load_real( irc, irc->nick, password, XML_PASS_UNKNOWN );
    360355}
    361356
     
    364359        /* This is a little bit risky because we have to pass NULL for the
    365360           irc_t argument. This *should* be fine, if I didn't miss anything... */
    366         return xml_load_real( my_nick, password, NULL, XML_PASS_CHECK_ONLY );
     361        return xml_load_real( NULL, my_nick, password, XML_PASS_CHECK_ONLY );
    367362}
    368363
     
    399394        md5_byte_t pass_md5[21];
    400395        md5_state_t md5_state;
    401        
    402         if( irc->password == NULL )
    403         {
    404                 irc_usermsg( irc, "Please register yourself if you want to save your settings." );
    405                 return STORAGE_OTHER_ERROR;
    406         }
    407396       
    408397        path2 = g_strdup( irc->nick );
Note: See TracChangeset for help on using the changeset viewer.