2005-01-03 [colin] 0.9.13cvs25.3

	* src/compose.c
	* src/prefs_gtk.c
	* src/prefs_template.c
	* src/textview.c
		Empty text widgets with empty strings, not NULL char
		Patch by SungHyun Nam <namsh@kldp_org>

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ad48578c4058149307e9e945107de407f6b3254c..7f7bddffff44426db61d9434d75afe0c7364d4a9 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2005-01-03 [colin]     0.9.13cvs25.3
+
+       * src/compose.c
+       * src/prefs_gtk.c
+       * src/prefs_template.c
+       * src/textview.c
+               Empty text widgets with empty strings, not NULL char
+               Patch by SungHyun Nam <namsh@kldp_org>
+
 2005-01-03 [colin]     0.9.13cvs25.2
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index a6267fa2632e723789d29e6c0b9a9d3aa700d82c..7fe175a45a22989bfac345ec229738d0d2882a78 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -302,3 +302,4 @@
 ( cvs diff -u -r 1.61.2.18 -r 1.61.2.19 src/account.c; ) > 0.9.13cvs24.3.patchset
 ( cvs diff -u -r 1.56.2.30 -r 1.56.2.31 src/pop.c; cvs diff -u -r 1.17.2.12 -r 1.17.2.13 src/pop.h; ) > 0.9.13cvs25.1.patchset
 ( cvs diff -u -r 1.115.2.25 -r 1.115.2.26 src/main.c; cvs diff -u -r 1.100.2.9 -r 1.100.2.10 AUTHORS; ) > 0.9.13cvs25.2.patchset
+( cvs diff -u -r 1.382.2.81 -r 1.382.2.82 src/compose.c; cvs diff -u -r 1.10.2.8 -r 1.10.2.9 src/prefs_gtk.c; cvs diff -u -r 1.12.2.4 -r 1.12.2.5 src/prefs_template.c; cvs diff -u -r 1.96.2.37 -r 1.96.2.38 src/textview.c; ) > 0.9.13cvs25.3.patchset

diff --git a/configure.ac b/configure.ac
index a48f9af675fa4b17e4e1c4e410bdfedcac6d6ccb..b5c2e1ece6d7a25ad737bc7ce2b8e26dcf8bdc4b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=25
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.3
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/compose.c b/src/compose.c
index 99282bd4f37bc01f6cd224687eb327cb0c226955..3a5d9930d5d01b13bcabc300f29492b1d413c798 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5399,7 +5399,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
                compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
 
        if (replace)
-               gtk_text_buffer_set_text(buffer, "\0", 1);
+               gtk_text_buffer_set_text(buffer, "", 1);
 
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
@@ -6002,7 +6002,7 @@ static void compose_input_cb(gpointer data, gint source,
                GtkTextView *text = GTK_TEXT_VIEW(compose->text);
                GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
 
-               gtk_text_buffer_set_text(buffer, "\0", 1);
+               gtk_text_buffer_set_text(buffer, "", 1);
                compose_insert_file(compose, compose->exteditor_file);
                compose_changed_cb(NULL, compose);
 

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index eff1200c0dfdfc04fbe61903ccfbf32c03c6ff6a..40c82b8d7581cba18e13997fc969d40882dfdd3b 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -755,7 +755,7 @@ void prefs_set_text(PrefParam *pparam)
 
                text = GTK_TEXT_VIEW(*pparam->widget);
                buffer = gtk_text_view_get_buffer(text);
-               gtk_text_buffer_set_text(buffer, "\0", -1);
+               gtk_text_buffer_set_text(buffer, "", -1);
                gtk_text_buffer_get_start_iter(buffer, &iter);
                gtk_text_buffer_insert(buffer, &iter, buf, -1);
                break;

diff --git a/src/prefs_template.c b/src/prefs_template.c
index 44013ced5850abd9740f288ee09499c138b3afe7..bc1ab4daef0cb336d73314bde697c062a285cf3c 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -401,7 +401,7 @@ static void prefs_template_select_cb(GtkCList *clist, gint row, gint column,
                           tmpl->subject ? tmpl->subject : "");
        
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
-       gtk_text_buffer_set_text(buffer, "\0", -1);
+       gtk_text_buffer_set_text(buffer, "", -1);
        gtk_text_buffer_get_start_iter(buffer, &iter);
        gtk_text_buffer_insert(buffer, &iter, tmpl->value, -1);
 }

diff --git a/src/textview.c b/src/textview.c
index 453d607fe6a336ce5fe37e1f5d15f6499a2faa29..d7e589d3d93f65bfec07483eadb0e039ab100e16 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1265,7 +1265,7 @@ void textview_clear(TextView *textview)
        GtkTextBuffer *buffer;
 
        buffer = gtk_text_view_get_buffer(text);
-       gtk_text_buffer_set_text(buffer, "\0", -1);
+       gtk_text_buffer_set_text(buffer, "", -1);
 
        TEXTVIEW_STATUSBAR_POP(textview);
        textview_uri_list_remove_all(textview->uri_list);