2005-07-15 [paul] 1.9.12cvs53

	* src/prefs_message.c
		make 'show cursor' a hidden option

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 75c1ac66def17468a2799b0307f6212af08dbee2..a749176d487d7bdfab3195133a95b71230a11661 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-07-15 [paul]      1.9.12cvs53
+
+       * src/prefs_message.c
+               make 'show cursor' a hidden option
+
 2005-07-14 [colin]     1.9.12cvs52
 
        * src/plugins/spamassassin/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 6875a972af56a5557d4d5665109697f7b7a7d924..79a0b59d44cd0056cbbabf071de8c004ca9c97c2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -647,3 +647,4 @@
 ( cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/etpan/imap-thread.c;  ) > 1.9.12cvs50.patchset
 ( cvs diff -u -r 1.4 -r 1.5 src/plugins/clamav/Makefile.am;  diff -u /dev/null src/plugins/clamav/clamav_plugin_gtk.deps;  cvs diff -u -r 1.5 -r 1.6 src/plugins/spamassassin/Makefile.am;  diff -u /dev/null src/plugins/spamassassin/spamassassin_gtk.deps;  ) > 1.9.12cvs51.patchset
 ( cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/plugins/spamassassin/Makefile.am;  cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/clamav/Makefile.am;  ) > 1.9.12cvs52.patchset
+( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_message.c;  ) > 1.9.12cvs53.patchset

diff --git a/configure.ac b/configure.ac
index 734ebda35d28d1794585c1ce4ba2870881a8c421..4d232ecc53c984e8f919b31a9688e1211d787225 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=52
+EXTRA_VERSION=53
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_message.c b/src/prefs_message.c
index f4b96e6f8b6c5abf8b8a540b4c91f1f3cb37fe19..457d480d28efd9887c7d0884d162541b17b962c7 100644 (file)
--- a/src/prefs_message.c
+++ b/src/prefs_message.c
@@ -50,7 +50,6 @@ typedef struct _MessagePage
        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;
        GtkWidget *chkbtn_html;
-       GtkWidget *chkbtn_cursor;
        GtkWidget *spinbtn_linespc;
 
        GtkWidget *chkbtn_smoothscroll;
@@ -74,7 +73,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *chkbtn_disphdr;
        GtkWidget *button_edit_disphdr;
        GtkWidget *chkbtn_html;
-       GtkWidget *chkbtn_cursor;
        GtkWidget *hbox_linespc;
        GtkWidget *label_linespc;
        GtkObject *spinbtn_linespc_adj;
@@ -129,9 +127,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON(vbox2, chkbtn_html,
                          _("Render HTML messages as text"));
 
-       PACK_CHECK_BUTTON(vbox2, chkbtn_cursor,
-                         _("Display cursor in message view"));
-
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
 
        hbox1 = gtk_hbox_new (FALSE, 32);
@@ -215,8 +210,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
                prefs_common.display_header);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_html),
                prefs_common.render_html);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_cursor),
-               prefs_common.textview_cursor_visible);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_smoothscroll),
                prefs_common.enable_smooth_scroll);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_halfpage),
@@ -233,7 +226,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_message->chkbtn_disphdrpane = chkbtn_disphdrpane;
        prefs_message->chkbtn_disphdr = chkbtn_disphdr;
        prefs_message->chkbtn_html = chkbtn_html;
-       prefs_message->chkbtn_cursor = chkbtn_cursor;
        prefs_message->spinbtn_linespc = spinbtn_linespc;
        prefs_message->chkbtn_smoothscroll = chkbtn_smoothscroll;
        prefs_message->spinbtn_scrollstep = spinbtn_scrollstep;
@@ -255,8 +247,6 @@ void prefs_message_save(PrefsPage *_page)
                GTK_TOGGLE_BUTTON(page->chkbtn_disphdr));
        prefs_common.render_html = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->chkbtn_html));
-       prefs_common.textview_cursor_visible = gtk_toggle_button_get_active(
-               GTK_TOGGLE_BUTTON(page->chkbtn_cursor));
        prefs_common.enable_smooth_scroll = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->chkbtn_smoothscroll));
        prefs_common.scroll_halfpage = gtk_toggle_button_get_active(