2005-02-21 [colin] 1.0.1cvs15.4

	* src/compose.c
		Fix Sign/Encrypt when unselecting privacy
		system
	* src/prefs_common.c
		Change default message font to Monospace
	* src/summaryview.c
		More freezing during potentially large operations

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d23ec44dde34f1c1dc1077a1682b28d8362f6643..20a96d2f348ddcd55a141c97956e222695da6db4 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,13 @@
+2005-02-21 [colin]     1.0.1cvs15.4
+
+       * src/compose.c
+               Fix Sign/Encrypt when unselecting privacy
+               system
+       * src/prefs_common.c
+               Change default message font to Monospace
+       * src/summaryview.c
+               More freezing during potentially large operations
+
 2005-02-21 [paul]      1.0.1cvs15.3
 
        * src/main.c
@@ -13,7 +23,7 @@
        * src/common/utils.h
                sync with main (revision 117)
 
-2005-02-20 [colin]     1.0.1cvs151
+2005-02-20 [colin]     1.0.1cvs15.1
 
        * src/common/defs.h
                Change cache file to .sylpheed_claws_cache, as

diff --git a/PATCHSETS b/PATCHSETS
index 0f40c8e1bfa88fd8d096aab20ddca36156650610..09bd35add14573470d26fe16cfa5b7f5efa86456 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -392,3 +392,4 @@
 ( cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/common/defs.h; ) > 1.0.1cvs151.patchset
 ( cvs diff -u -r 1.6.2.4 -r 1.6.2.5 po/Makefile.in.in; cvs diff -u -r 1.382.2.103 -r 1.382.2.104 src/compose.c; cvs diff -u -r 1.395.2.53 -r 1.395.2.54 src/summaryview.c; cvs diff -u -r 1.96.2.47 -r 1.96.2.48 src/textview.c; cvs diff -u -r 1.36.2.25 -r 1.36.2.26 src/common/utils.c; cvs diff -u -r 1.20.2.13 -r 1.20.2.14 src/common/utils.h; ) > 1.0.1cvs15.2.patchset
 ( cvs diff -u -r 1.115.2.28 -r 1.115.2.29 src/main.c; ) > 1.0.1cvs15.3.patchset
+( cvs diff -u -r 1.382.2.104 -r 1.382.2.105 src/compose.c; cvs diff -u -r 1.204.2.31 -r 1.204.2.32 src/prefs_common.c; cvs diff -u -r 1.395.2.54 -r 1.395.2.55 src/summaryview.c; ) > 1.0.1cvs15.4.patchset

diff --git a/configure.ac b/configure.ac
index 3122296eb97018206070ae5a27df5156601b6ef5..d50f1f538440d92e07fe6b68151426a78a4a693d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=15
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.4
 
 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 de932dfd6d815da1d50c3dcb386f5aa140662098..6702e3d0855b07c5c1d0f6e1d0a55c8ad2dba190 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4977,7 +4977,11 @@ static void compose_set_privacy_system_cb(GtkWidget *widget, gpointer data)
 
        ifactory = gtk_item_factory_from_widget(compose->menubar);
        menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
+       if (!can_sign)
+               menu_set_active(ifactory, "/Options/Sign", FALSE);
        menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
+       if (!can_encrypt)
+               menu_set_active(ifactory, "/Options/Encrypt", FALSE);
 }
 
 static void compose_update_privacy_system_menu_item(Compose * compose)

diff --git a/src/prefs_common.c b/src/prefs_common.c
index d40d6beb168e9bf54cdcf3a41e8242e0a795a245..0faf4cbddd6457339c9ae2d6f2aec2766cf324a7 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -379,7 +379,7 @@ static PrefParam param[] = {
        /* new fonts */
        {"widget_font_gtk2",    NULL,
          &prefs_common.widgetfont,             P_STRING, NULL, NULL, NULL},
-       {"message_font_gtk2",   "fixed 9",
+       {"message_font_gtk2",   "Monospace 9",
         &prefs_common.textfont,                P_STRING, NULL, NULL, NULL},
        {"small_font_gtk2",     "Sans 9",
          &prefs_common.smallfont,              P_STRING, NULL, NULL, NULL},

diff --git a/src/summaryview.c b/src/summaryview.c
index 244535e1a98c29b4048b6936cabd3cc8e054a944..6726e17cd12f160b6555e7f5e987c14c1b662d9f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2759,8 +2759,12 @@ void summary_mark(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
        /* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
        summary_status_show(summaryview);
@@ -3089,9 +3093,15 @@ void summary_unmark(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_status_show(summaryview);
 }
 
@@ -3138,11 +3148,17 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
             cur != NULL; cur = cur->next)
                summary_move_row_to
                        (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
 
        if (prefs_common.immediate_exec)
@@ -3215,11 +3231,17 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
             cur != NULL; cur = cur->next)
                summary_copy_row_to
                        (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
 
        if (prefs_common.immediate_exec)