2005-12-02 [paul] 1.9.100cvs50

	* src/codeconv.c
	* src/codeconv.h
	* src/prefs_common.c
	* src/prefs_common.h
	* src/prefs_message.c
	* src/textview.c
		remove obsolete 'convert_mb_alnum' option
		and related stuff
	* src/gtk/about.c
		remove unused 'about_textview_visibility_notify'

diff --git a/ChangeLog b/ChangeLog
index 4293ed2cea80841fd12e4959b071466b1224cbdd..b8b515c951786726a4f1f9a70391c2c054b220c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-12-02 [paul]      1.9.100cvs50
+
+       * src/codeconv.c
+       * src/codeconv.h
+       * src/prefs_common.c
+       * src/prefs_common.h
+       * src/prefs_message.c
+       * src/textview.c
+               remove obsolete 'convert_mb_alnum' option
+               and related stuff
+       * src/gtk/about.c
+               remove unused 'about_textview_visibility_notify'
+

 2005-12-02 [paul]      1.9.100cvs49
 
        * src/prefs_account.c
 2005-12-02 [paul]      1.9.100cvs49
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index 2afe64c845e2df584cda6f8ce8a44be24effbcb6..82601377344dc7d8b79ec091f05926eabf230ae0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1033,3 +1033,4 @@
 ( cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/html.c;  ) > 1.9.100cvs47.patchset
 ( cvs diff -u -r 1.115.2.68 -r 1.115.2.69 src/main.c;  cvs diff -u -r 1.17.2.22 -r 1.17.2.23 src/send_message.c;  ) > 1.9.100cvs48.patchset
 ( cvs diff -u -r 1.105.2.42 -r 1.105.2.43 src/prefs_account.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_compose_writing.c;  cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/prefs_fonts.c;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/prefs_gtk.h;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_image_viewer.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_message.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_other.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_receive.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_send.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/prefs_spelling.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_summaries.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_wrapping.c;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/prefs_gpg.c;  ) > 1.9.100cvs49.patchset
 ( cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/html.c;  ) > 1.9.100cvs47.patchset
 ( cvs diff -u -r 1.115.2.68 -r 1.115.2.69 src/main.c;  cvs diff -u -r 1.17.2.22 -r 1.17.2.23 src/send_message.c;  ) > 1.9.100cvs48.patchset
 ( cvs diff -u -r 1.105.2.42 -r 1.105.2.43 src/prefs_account.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_compose_writing.c;  cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/prefs_fonts.c;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/prefs_gtk.h;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_image_viewer.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_message.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_other.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_receive.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_send.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/prefs_spelling.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_summaries.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_wrapping.c;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/prefs_gpg.c;  ) > 1.9.100cvs49.patchset

+( cvs diff -u -r 1.65.2.43 -r 1.65.2.44 src/codeconv.c;  cvs diff -u -r 1.15.2.13 -r 1.15.2.14 src/codeconv.h;  cvs diff -u -r 1.204.2.68 -r 1.204.2.69 src/prefs_common.c;  cvs diff -u -r 1.103.2.36 -r 1.103.2.37 src/prefs_common.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_message.c;  cvs diff -u -r 1.96.2.86 -r 1.96.2.87 src/textview.c;  cvs diff -u -r 1.4.2.25 -r 1.4.2.26 src/gtk/about.c;  ) > 1.9.100cvs50.patchset

diff --git a/configure.ac b/configure.ac
index ce8a95028222d21954d4a0a9a2c680bc64b77957..2ac6b8e88257a299b856385db4537dfe3c31cfdd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=49
+EXTRA_VERSION=50

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/codeconv.c b/src/codeconv.c
index b9920685ebb5ccfc122abd2b401d9e104fb83b91..887a6f13848bd2a12f18ede20a17ddd8abd260d7 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -529,72 +529,6 @@ static void conv_unreadable_8bit(gchar *str)
        }
 }
 
        }
 }
 

-#define NCV    '\0'
-
-void conv_mb_alnum(gchar *str)
-{
-       static guchar char_tbl[] = {
-               /* 0xa0 - 0xaf */
-               NCV, ' ', NCV, NCV, ',', '.', NCV, ':',
-               ';', '?', '!', NCV, NCV, NCV, NCV, NCV,
-               /* 0xb0 - 0xbf */
-               NCV, NCV, NCV, NCV, NCV, NCV, NCV, NCV,
-               NCV, NCV, NCV, NCV, NCV, NCV, NCV, NCV,
-               /* 0xc0 - 0xcf */
-               NCV, NCV, NCV, NCV, NCV, NCV, NCV, NCV,
-               NCV, NCV, '(', ')', NCV, NCV, '[', ']',
-               /* 0xd0 - 0xdf */
-               '{', '}', NCV, NCV, NCV, NCV, NCV, NCV,
-               NCV, NCV, NCV, NCV, '+', '-', NCV, NCV,
-               /* 0xe0 - 0xef */
-               NCV, '=', NCV, '<', '>', NCV, NCV, NCV,
-               NCV, NCV, NCV, NCV, NCV, NCV, NCV, NCV
-       };
-
-       register guchar *p = str;
-       register gint len;
-
-       len = strlen(str);
-
-       while (len > 1) {
-               if (*p == 0xa3) {
-                       register guchar ch = *(p + 1);
-
-                       if (ch >= 0xb0 && ch <= 0xfa) {
-                               /* [a-zA-Z] */
-                               *p = ch & 0x7f;
-                               p++;
-                               len--;
-                               memmove(p, p + 1, len);
-                               len--;
-                       } else  {
-                               p += 2;
-                               len -= 2;
-                       }
-               } else if (*p == 0xa1) {
-                       register guchar ch = *(p + 1);
-
-                       if (ch >= 0xa0 && ch <= 0xef &&
-                           NCV != char_tbl[ch - 0xa0]) {
-                               *p = char_tbl[ch - 0xa0];
-                               p++;
-                               len--;
-                               memmove(p, p + 1, len);
-                               len--;
-                       } else {
-                               p += 2;
-                               len -= 2;
-                       }
-               } else if (iseuckanji(*p)) {
-                       p += 2;
-                       len -= 2;
-               } else {
-                       p++;
-                       len--;
-               }
-       }
-}
-

 CharSet conv_guess_ja_encoding(const gchar *str)
 {
        const guchar *p = str;
 CharSet conv_guess_ja_encoding(const gchar *str)
 {
        const guchar *p = str;

diff --git a/src/codeconv.h b/src/codeconv.h
index 4318ae665891c7a163ed036f78b9008bcdd01fc1..f3dd2b1aab8d4e1cd51460c512bdc238ddb4106d 100644 (file)
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -170,8 +170,6 @@ struct _CodeConverter
 #define C_INTERNAL             C_UTF_8
 #define CS_INTERNAL            CS_UTF_8
 
 #define C_INTERNAL             C_UTF_8
 #define CS_INTERNAL            CS_UTF_8
 

-/* void conv_mb_alnum(gchar *str); */
-

 CharSet conv_guess_ja_encoding(const gchar *str);
 
 void conv_utf8todisp   (gchar *outbuf, gint outlen, const gchar *inbuf);
 CharSet conv_guess_ja_encoding(const gchar *str);
 
 void conv_utf8todisp   (gchar *outbuf, gint outlen, const gchar *inbuf);

diff --git a/src/gtk/about.c b/src/gtk/about.c
index 48d0d74622338eeb44026637df9ce6ca94d67c8e..dcccc17fae6cddd442d7ac8d60c3c427402e0faf 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -72,9 +72,6 @@ static gboolean about_textview_motion_notify(GtkWidget *widget,
 static gboolean about_textview_leave_notify(GtkWidget *widget,
                                        GdkEventCrossing *event,
                                        GtkWidget *textview);
 static gboolean about_textview_leave_notify(GtkWidget *widget,
                                        GdkEventCrossing *event,
                                        GtkWidget *textview);

-static gboolean about_textview_visibility_notify(GtkWidget *widget,
-                                       GdkEventVisibility *event,
-                                       GtkWidget *textview);

 static void about_textview_uri_update(GtkWidget *textview, gint x, gint y);
 
 static GtkItemFactoryEntry textview_link_popup_entries[] = 
 static void about_textview_uri_update(GtkWidget *textview, gint x, gint y);
 
 static GtkItemFactoryEntry textview_link_popup_entries[] = 


@@ -675,27 +672,6 @@ static gboolean about_textview_leave_notify(GtkWidget *widget,
        return FALSE;
 }
 
        return FALSE;
 }
 

-static gboolean about_textview_visibility_notify(GtkWidget *widget,
-                                       GdkEventVisibility *event,
-                                       GtkWidget *textview)
-{
-       gint wx, wy;
-       GdkWindow *window;
-
-       window = gtk_text_view_get_window(GTK_TEXT_VIEW(widget),
-                               GTK_TEXT_WINDOW_TEXT);
-
-       /* check if occurred for the text window part */
-       if (window != event->window) {
-               return FALSE;
-       }
-       
-       gdk_window_get_pointer(widget->window, &wx, &wy, NULL);
-       about_textview_uri_update(textview, wx, wy);
-
-       return FALSE;
-}
-

 static void about_textview_uri_update(GtkWidget *textview, gint x, gint y)
 {
        GtkTextBuffer *buffer;
 static void about_textview_uri_update(GtkWidget *textview, gint x, gint y)
 {
        GtkTextBuffer *buffer;

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 39611b2baa8644d71e85593dffe048cf5e37b694..be139bfcfbe7dfb5069a9f783b5c0328c41ca89f 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -438,8 +438,6 @@ static PrefParam param[] = {
        {"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
         P_BOOL, NULL, NULL, NULL},
 
        {"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
         P_BOOL, NULL, NULL, NULL},
 

-       {"convert_mb_alnum", "FALSE", &prefs_common.conv_mb_alnum, P_BOOL,
-        NULL, NULL, NULL},

        {"display_header_pane", "FALSE", &prefs_common.display_header_pane,
         P_BOOL, NULL, NULL, NULL},
        {"display_header", "TRUE", &prefs_common.display_header, P_BOOL,
        {"display_header_pane", "FALSE", &prefs_common.display_header_pane,
         P_BOOL, NULL, NULL, NULL},
        {"display_header", "TRUE", &prefs_common.display_header, P_BOOL,

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 873d3bcb615804bb23e52c43d5486d4120263233..346b314b960ee2e41310528c6f211094539e6e45 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -237,7 +237,6 @@ struct _PrefsCommon
        gulong tgt_folder_col;
        gulong signature_col;
        gboolean recycle_quote_colors;
        gulong tgt_folder_col;
        gulong signature_col;
        gboolean recycle_quote_colors;

-       gboolean conv_mb_alnum;

        gboolean display_header_pane;
        gboolean display_header;
        gboolean display_xface;
        gboolean display_header_pane;
        gboolean display_header;
        gboolean display_xface;

diff --git a/src/prefs_message.c b/src/prefs_message.c
index 5234c1768ad0de65814c53872fab36ac7cf3c9e0..07b134ba620bff09406aff4de43cc0328a3fe989 100644 (file)
--- a/src/prefs_message.c
+++ b/src/prefs_message.c
@@ -46,7 +46,6 @@ typedef struct _MessagePage
 
        GtkWidget *window;
 
 
        GtkWidget *window;
 

-       GtkWidget *chkbtn_mbalnum;

        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;
 #if HAVE_LIBCOMPFACE
        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;
 #if HAVE_LIBCOMPFACE


@@ -81,7 +80,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *vbox1;
        GtkWidget *vbox2;
        GtkWidget *hbox1;
        GtkWidget *vbox1;
        GtkWidget *vbox2;
        GtkWidget *hbox1;

-       GtkWidget *chkbtn_mbalnum;

        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;
 #if HAVE_LIBCOMPFACE
        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;
 #if HAVE_LIBCOMPFACE


@@ -113,13 +111,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 

-       PACK_CHECK_BUTTON
-               (vbox2, chkbtn_mbalnum,
-                _("Display multi-byte alphanumeric as\n"
-                  "ASCII character (Japanese only)"));
-       gtk_label_set_justify (GTK_LABEL (GTK_BIN(chkbtn_mbalnum)->child),
-                              GTK_JUSTIFY_LEFT);
-

        PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
                          _("Display header pane above message view"));
 
        PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
                          _("Display header pane above message view"));
 


@@ -223,8 +214,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
 
        SET_TOGGLE_SENSITIVITY (chkbtn_smoothscroll, hbox_scr)
 
 
        SET_TOGGLE_SENSITIVITY (chkbtn_smoothscroll, hbox_scr)
 

-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_mbalnum),
-               prefs_common.conv_mb_alnum);

        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_disphdrpane),
                prefs_common.display_header_pane);
 #if HAVE_LIBCOMPFACE
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_disphdrpane),
                prefs_common.display_header_pane);
 #if HAVE_LIBCOMPFACE


@@ -247,7 +236,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
                prefs_common.scroll_step);
                
        prefs_message->window = GTK_WIDGET(window);
                prefs_common.scroll_step);
                
        prefs_message->window = GTK_WIDGET(window);

-       prefs_message->chkbtn_mbalnum = chkbtn_mbalnum;

        prefs_message->chkbtn_disphdrpane = chkbtn_disphdrpane;
 #if HAVE_LIBCOMPFACE
        prefs_message->chkbtn_dispxface = chkbtn_dispxface;
        prefs_message->chkbtn_disphdrpane = chkbtn_disphdrpane;
 #if HAVE_LIBCOMPFACE
        prefs_message->chkbtn_dispxface = chkbtn_dispxface;


@@ -267,8 +255,6 @@ void prefs_message_save(PrefsPage *_page)
 {
        MessagePage *page = (MessagePage *) _page;
 
 {
        MessagePage *page = (MessagePage *) _page;
 

-       prefs_common.conv_mb_alnum = gtk_toggle_button_get_active(
-               GTK_TOGGLE_BUTTON(page->chkbtn_mbalnum));

        prefs_common.display_header_pane = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->chkbtn_disphdrpane));
 #if HAVE_LIBCOMPFACE
        prefs_common.display_header_pane = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->chkbtn_disphdrpane));
 #if HAVE_LIBCOMPFACE

diff --git a/src/textview.c b/src/textview.c
index 4b4539ed431c5e6cf3aca800262aabbd40663d1d..f6647c55ddf73abf4efea493e233c1c7e95a8a84 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1030,7 +1030,6 @@ static void textview_write_line(TextView *textview, const gchar *str,
                conv_localetodisp(buf, sizeof(buf), str);
                
        strcrchomp(buf);
                conv_localetodisp(buf, sizeof(buf), str);
                
        strcrchomp(buf);

-       //if (prefs_common.conv_mb_alnum) conv_mb_alnum(buf);

        fg_color = NULL;
 
        /* change color of quotation
        fg_color = NULL;
 
        /* change color of quotation