2005-07-07 [darko] 1.9.12cvs27

	* src/common/template.c
		Sort templates alphabetically

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 3454b0aaf5e6b47f14a06cae6fdf3eb1fbeb85a1..7fe2a38b5d55fc8cb8c39c1642957d56dfb31d19 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-07-07 [darko]     1.9.12cvs27
+
+       * src/common/template.c
+               Sort templates alphabetically
+
 2005-07-06 [colin]     1.9.12cvs26
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 09745492308266b74f39d20f22c8c0a3434993ff..785f55586c9a47434bfd9c3160eb314d5007a265 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -621,3 +621,4 @@
 ( cvs diff -u -r 1.654.2.658 -r 1.654.2.659 configure.ac;  cvs diff -u -r 1.61.2.27 -r 1.61.2.28 src/account.c;  cvs diff -u -r 1.213.2.39 -r 1.213.2.40 src/folder.c;  cvs diff -u -r 1.179.2.47 -r 1.179.2.48 src/imap.c;  cvs diff -u -r 1.96.2.59 -r 1.96.2.60 src/textview.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/etpan-log.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/etpan-thread-manager.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/imap-thread.c;  cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/gtk/about.c;  ) > 1.9.12cvs24.patchset
 ( cvs diff -u -r 1.179.2.48 -r 1.179.2.49 src/imap.c;  ) > 1.9.12cvs25.patchset
 ( cvs diff -u -r 1.179.2.49 -r 1.179.2.50 src/imap.c;  ) > 1.9.12cvs26.patchset
+( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 commitHelper;  cvs diff -u -r 1.2.4.10 -r 1.2.4.11 src/common/template.c;  ) > 1.9.12cvs27.patchset

diff --git a/commitHelper b/commitHelper
index 383e3177573239471abb035f6558abc68d0ecc95..e5f527538f471d29059e4549625ef569a9d862c2 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -51,6 +51,9 @@ fi;
 if [ "$name" == "dinh" ]; then
        name="hoa";
 fi;
+if [ "$name" == "f" ]; then
+       name="darko";
+fi;
 
 log="`date --utc +%Y-%m-%d` [$name]\t$nextsversion\n\n"
 for line in $files; do

diff --git a/configure.ac b/configure.ac
index 5bd16e97c878176e4adaf919bd3461f034610c40..08fe6079469adc4c0add94a05fa2e4bb930b3585 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=26
+EXTRA_VERSION=27
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/template.c b/src/common/template.c
index 031ddb3df959f9e4decbcd608126c61e7d017b7c..70edd0322ae827978fe2260da5c5efb6d5596aef 100644 (file)
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -110,6 +110,17 @@ void template_clear_config(GSList *tmpl_list)
        g_slist_free(tmpl_list);
 }
 
+int tmpl_compare(Template *tmpl1, Template *tmpl2)
+{
+       if (tmpl1 == NULL || tmpl2 == NULL)
+               return 0;
+
+       if (tmpl1->name == NULL || tmpl2->name == NULL)
+               return 0;
+
+       return strcmp(tmpl1->name, tmpl2->name);
+}
+
 GSList *template_read_config(void)
 {
        const gchar *path;
@@ -148,7 +159,7 @@ GSList *template_read_config(void)
 
                tmpl = template_load(filename);
                if (tmpl)
-                       tmpl_list = g_slist_append(tmpl_list, tmpl);
+                       tmpl_list = g_slist_insert_sorted(tmpl_list, tmpl, tmpl_compare);
 
                g_free(filename);
        }