Changeset 6e9ae72 for storage_xml.c

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

File:

• storage_xml.c (modified) (5 diffs)

storage_xml.c

@@ -269 +269 @@
         {
                 xd->unknown_tag ++;
-                irc_usermsg( irc, "Warning: Unknown XML tag found in configuration file (%s). "
+                irc_rootmsg( irc, "Warning: Unknown XML tag found in configuration file (%s). "
                                   "This may happen when downgrading BitlBee versions. "
                                   "This tag will be skipped and the information will be lost "
@@ -397 +397 @@
                         {
                                 if( gerr && irc )
-                                        irc_usermsg( irc, "Error from XML-parser: %s", gerr->message );
+                                        irc_rootmsg( irc, "Error from XML-parser: %s", gerr->message );
                                 
                                 g_clear_error( &gerr );
@@ -473 +473 @@
         if( ( fd = mkstemp( path ) ) < 0 )
         {
-                irc_usermsg( irc, "Error while opening configuration file." );
+                irc_rootmsg( irc, "Error while opening configuration file." );
                 return STORAGE_OTHER_ERROR;
         }
@@ -570 +570 @@
         if( rename( path, path2 ) != 0 )
         {
-                irc_usermsg( irc, "Error while renaming temporary configuration file." );
+                irc_rootmsg( irc, "Error while renaming temporary configuration file." );
                 
                 g_free( path2 );
@@ -585 +585 @@
         g_free( pass_buf );
         
-        irc_usermsg( irc, "Write error. Disk full?" );
+        irc_rootmsg( irc, "Write error. Disk full?" );
         close( fd );