2007-05-03 [wwp] 2.9.1cvs41

[claws.git] / src / common / template.c

diff --git a/src/common/template.c b/src/common/template.c
index f7a54946fd75fa71b7b300f034e2e5216713e74f..225c1d83a923ab247ff786045f74386d41773df5 100644 (file)
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -45,6 +45,7 @@ static Template *template_load(gchar *filename)
        }
 
        tmpl = g_new(Template, 1);
+       tmpl->load_filename = g_strdup(filename);;
        tmpl->name = NULL;
        tmpl->subject = NULL;
        tmpl->to = NULL;
@@ -88,6 +89,7 @@ static Template *template_load(gchar *filename)
 
 void template_free(Template *tmpl)
 {
+       g_free(tmpl->load_filename);
        g_free(tmpl->name);
        g_free(tmpl->subject);
        g_free(tmpl->to);
@@ -109,16 +111,35 @@ void template_clear_config(GSList *tmpl_list)
        g_slist_free(tmpl_list);
 }
 
-gint tmpl_compare(gconstpointer tmpl1, gconstpointer tmpl2)
+static gint tmpl_compare(gconstpointer tmpl1, gconstpointer tmpl2)
 {
+       gchar *basename1, *basename2;
+       long filenum1, filenum2;
+       gint ret = 0;
+
        if ((Template *)tmpl1 == NULL || (Template *)tmpl2 == NULL)
                return 0;
 
-       if (((Template *)tmpl1)->name == NULL || ((Template *)tmpl2)->name == NULL)
+       if (((Template *)tmpl1)->load_filename == NULL || ((Template *)tmpl2)->load_filename == NULL)
+               return 0;
+
+       basename1 = g_path_get_basename(((Template *)tmpl1)->load_filename);
+       basename2 = g_path_get_basename(((Template *)tmpl2)->load_filename);
+       filenum1 = atol(basename1);
+       filenum2 = atol(basename2);
+       g_free(basename1);
+       g_free(basename2);
+
+       if (filenum1 == 0 || filenum2 == 0)
                return 0;
 
-       return (gint) strcmp((char *)((Template *)tmpl1)->name, 
-                            (char *)((Template *)tmpl2)->name);
+       if (filenum1 < filenum2)
+               ret = -1;
+       else
+               if (filenum1 > filenum2)
+                       ret = 1;
+                       
+       return ret;
 }
 
 GSList *template_read_config(void)