Changeset c9f0c79

Timestamp:

2006-06-26T12:04:21Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

471573f

Parents:

fd03770

Message:

Implemented cleaner way of passing the "Incorrect password" error.

File:

• storage_xml.c (modified) (4 diffs)

storage_xml.c

@@ -34 +34 @@
         XML_PASS_CHECK_ONLY = -1,
         XML_PASS_UNKNOWN = 0,
+        XML_PASS_WRONG,
         XML_PASS_OK
 } xml_pass_st;
 
-/* This isn't very clean, probably making a separate error class + code for
-   BitlBee would be a better solution. But this will work for now... */
-#define XML_PASS_ERRORMSG "Wrong username or password"
+/* To make it easier later when extending the format: */
 #define XML_FORMAT_VERSION 1
 
@@ -108 +107 @@
                                 if( pass_dec[i] != pass_md5[i] )
                                 {
+                                        xd->pass_st = XML_PASS_WRONG;
                                         g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                                     XML_PASS_ERRORMSG );
+                                                     "Password mismatch" );
                                         break;
                                 }
@@ -302 +302 @@
                 if( !g_markup_parse_context_parse( ctx, buf, st, &gerr ) || gerr )
                 {
+                        xml_pass_st pass_st = xd->pass_st;
+                        
                         g_markup_parse_context_free( ctx );
                         close( fd );
                         
-                        /* Slightly dirty... */
-                        if( gerr && strcmp( gerr->message, XML_PASS_ERRORMSG ) == 0 )
+                        if( pass_st == XML_PASS_WRONG )
                         {
                                 g_clear_error( &gerr );
@@ -332 +333 @@
         irc->status |= USTATUS_IDENTIFIED;
         
+        /* TODO: This really shouldn't be here, I think... */
         if( set_getint( irc, "auto_connect" ) )
         {