sync with 0.8.6cvs23
authorPaul Mangan <paul@claws-mail.org>
Wed, 18 Dec 2002 10:44:47 +0000 (10:44 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 18 Dec 2002 10:44:47 +0000 (10:44 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/mainwindow.c

index 4468aa6..efb6c69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-18
+
+       * src/mainwindow.c:
+         set_charset_cb()
+         sort_summary_cb()
+         sort_summary_type_cb(): prevent unwanted processing on unchecking
+         menu items.
+
 2002-12-18
 
        * src/main.c: process command line option before gtk_init() to
index 4bf7c57..7d1edb2 100644 (file)
@@ -1,3 +1,8 @@
+2002-12-18 [paul]      0.8.6claws116
+
+       * sync with 0.8.6cvs23
+               see ChangeLog 2002-12-18
+
 2002-12-18 [paul]      0.8.6claws115
 
        * src/Makefile.am
index 5d7fb22..7d6095c 100644 (file)
@@ -1,3 +1,11 @@
+2002-12-18
+
+       * src/mainwindow.c:
+         set_charset_cb()
+         sort_summary_cb()
+         sort_summary_type_cb(): ¥á¥Ë¥å¡¼¹àÌܤò¥Á¥§¥Ã¥¯²ò½ü¤·¤¿¤È¤­¤Î
+         ÉÔÍפʽèÍý¤òËɤ°¤è¤¦¤Ë¤·¤¿¡£
+
 2002-12-18
 
        * src/main.c: X ¤Ê¤·¤Ç¥ê¥â¡¼¥ÈÁàºî¤ò²Äǽ¤Ë¤¹¤ë¤¿¤á¤Ë gtk_init()
index d0f2c40..efc2ac7 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws115
+EXTRA_VERSION=claws116
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index c07e01c..c818ca6 100644 (file)
@@ -3201,13 +3201,15 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
 {
        const gchar *str;
 
-       str = conv_get_charset_str((CharSet)action);
-       g_free(prefs_common.force_charset);
-       prefs_common.force_charset = str ? g_strdup(str) : NULL;
-
-       summary_redisplay_msg(mainwin->summaryview);
+       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+               str = conv_get_charset_str((CharSet)action);
+               g_free(prefs_common.force_charset);
+               prefs_common.force_charset = str ? g_strdup(str) : NULL;
 
-       debug_print("forced charset: %s\n", str ? str : "Auto-Detect");
+               summary_redisplay_msg(mainwin->summaryview);
+               
+               debug_print("forced charset: %s\n", str ? str : "Auto-Detect");
+       }
 }
 
 static void hide_read_messages (MainWindow *mainwin, guint action,
@@ -3258,7 +3260,8 @@ static void sort_summary_cb(MainWindow *mainwin, guint action,
        GtkWidget *menuitem;
 
        if (mainwin->menu_lock_count) return;
-       if (item) {
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active && item) {
                menuitem = gtk_item_factory_get_item
                        (mainwin->menu_factory, "/View/Sort/Ascending");
                summary_sort(mainwin->summaryview, (FolderSortKey)action,
@@ -3273,7 +3276,8 @@ static void sort_summary_type_cb(MainWindow *mainwin, guint action,
        FolderItem *item = mainwin->summaryview->folder_item;
 
        if (mainwin->menu_lock_count) return;
-       if (item)
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active && item)
                summary_sort(mainwin->summaryview,
                             item->sort_key, (FolderSortType)action);
 }