2004-11-12 [paul] 0.9.12cvs146.4

[claws.git] / src / exporthtml.c

diff --git a/src/exporthtml.c b/src/exporthtml.c
index 08915d441fab7b4f6d0f7963f30015a7a55ed0da..69b1955947c96555cd19f4fabf17967154b777ca 100644 (file)
--- a/src/exporthtml.c
+++ b/src/exporthtml.c
@@ -32,9 +32,6 @@
 #include "mgutils.h"
 #include "utils.h"
 #include "exporthtml.h"
-#include "addritem.h"
-#include "addrcache.h"
-#include "addrbook.h"
 #include "xmlprops.h"
 
 #define DFL_DIR_SYLPHEED_OUT  "sylpheed-out"
@@ -441,7 +438,7 @@ static gint exporthtml_compare_name(
        if( item2 ) name2 = ADDRITEM_NAME( item2 );
        if( ! name1 ) return ( name2 != NULL );
        if( ! name2 ) return -1;
-       return strcasecmp( name1, name2 );
+       return g_utf8_collate( name1, name2 );
 }
 
 /*
@@ -457,7 +454,7 @@ static gint exporthtml_compare_email(
        if( email2 ) name2 = email2->address;
        if( ! name1 ) return ( name2 != NULL );
        if( ! name2 ) return -1;
-       return strcasecmp( name1, name2 );
+       return g_utf8_collate( name1, name2 );
 }
 
 /*
@@ -473,7 +470,7 @@ static gint exporthtml_compare_attrib(
        if( attr2 ) name2 = attr2->name;
        if( ! name1 ) return ( name2 != NULL );
        if( ! name2 ) return -1;
-       return strcasecmp( name1, name2 );
+       return g_utf8_collate( name1, name2 );
 }
 
 /*
@@ -1057,7 +1054,7 @@ void exporthtml_parse_filespec( ExportHtmlCtl *ctl, gchar *fileSpec ) {
 
        ctl->fileHtml =
                mgu_replace_string( ctl->fileHtml, g_basename( fileSpec ) );
-       t = g_dirname( fileSpec );
+       t = g_path_get_dirname( fileSpec );
        ctl->dirOutput = mgu_replace_string( ctl->dirOutput, t );
        g_free( t );
        ctl->path = mgu_replace_string( ctl->path, fileSpec );