2006-10-14 [colin] 2.5.5cvs7

	* src/prefs_template.c
		Reset fields when reopening
		the window

diff --git a/ChangeLog b/ChangeLog
index f4b17bd22479708a1c7b2923eaa2bb24a1f54104..5f13bbf94f48670b8cc7b238d7eb79efe1592c0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-14 [colin]     2.5.5cvs7
+
+       * src/prefs_template.c
+               Reset fields when reopening
+               the window
+
 2006-10-13 [paul]      2.5.5cvs6
 
        * manual/advanced.xml

diff --git a/PATCHSETS b/PATCHSETS
index d5c9361de56b56bc177f55ca81779793d7101619..9b2fb06cf12aac5bb370225060df9d78884cbd75 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1992,3 +1992,4 @@
 ( cvs diff -u -r 1.204.2.104 -r 1.204.2.105 src/prefs_common.c;  cvs diff -u -r 1.103.2.62 -r 1.103.2.63 src/prefs_common.h;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_message.c;  cvs diff -u -r 1.49.2.81 -r 1.49.2.82 src/procmime.c;  ) > 2.5.5cvs4.patchset
 ( cvs diff -u -r 1.65.2.50 -r 1.65.2.51 src/codeconv.c;  ) > 2.5.5cvs5.patchset
 ( cvs diff -u -r 1.1.2.30 -r 1.1.2.31 manual/advanced.xml;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_message.c;  ) > 2.5.5cvs6.patchset
+( cvs diff -u -r 1.12.2.32 -r 1.12.2.33 src/prefs_template.c;  ) > 2.5.5cvs7.patchset

diff --git a/configure.ac b/configure.ac
index 01561b415190a59f9a4c25235d0a2e909c001299..31e4fdf796840fed4d446c0e889d5dab19da6f9f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_template.c b/src/prefs_template.c
index 7953f55b118bc189f84b0c89d3dba471224baf09..1b16351cbf3c11e148dfd4ef7e563e76b28ac52a 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -343,7 +343,8 @@ static void prefs_template_window_setup(void)
        GSList *cur;
        Template *tmpl;
        GtkListStore *store;
-
+       GtkTextBuffer *buffer;
+       
        store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
                                (templates.list_view)));
 
@@ -365,6 +366,15 @@ static void prefs_template_window_setup(void)
                                                         tmpl, FALSE);
        }
 
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_name), "");
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_to), "");
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_cc), "");
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_bcc), "");                 
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_subject), "");
+       
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
+       gtk_text_buffer_set_text(buffer, "", -1);
+
        g_slist_free(tmpl_list);
 }