2005-02-16 [colin] 1.0.1cvs11.3

	* src/summaryview.c
		Fix collapsed thread not highlighting when new
		messages in it (Bug 568) Patch by Stephan Sachse.
		Fix messed up selection when reaching bounds (Bug 632)
	* src/prefs_themes.c
		Fix theme installing (Bug 684)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 93418ee359002ebedbb0a56710a43cb3923a8c94..f4c084a3232aa91d87e265cf98c200064b8a1c43 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2005-02-16 [colin]     1.0.1cvs11.3
+
+       * src/summaryview.c
+               Fix collapsed thread not highlighting when new
+               messages in it (Bug 568) Patch by Stephan Sachse.
+               Fix messed up selection when reaching bounds (Bug 632)
+       * src/prefs_themes.c
+               Fix theme installing (Bug 684)
+
 2005-02-16 [colin]     1.0.1cvs11.2
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index f4a81ba4e13c94a926bf7b653cd9bbab4ece1431..7c105ba417614e660dce0ac4e7d81bf1820b9558 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -384,3 +384,4 @@
 ( cvs diff -u -r 1.83.2.30 -r 1.83.2.31 src/mimeview.c; cvs diff -u -r 1.36.2.23 -r 1.36.2.25 src/common/utils.c; ) > 1.0.1cvs8.1.patchset
 ( cvs diff -u -r 1.79.2.8 -r 1.79.2.9 src/mh.c; ) > 1.0.1cvs11.1.patchset
 ( cvs diff -u -r 1.94.2.45 -r 1.94.2.46 src/messageview.c; ) > 1.0.1cvs11.2.patchset
+( cvs diff -u -r 1.395.2.52 -r 1.395.2.53 src/summaryview.c; cvs diff -u -r 1.3.2.17 -r 1.3.2.18 src/prefs_themes.c; ) > 1.0.1cvs11.3.patchset

diff --git a/configure.ac b/configure.ac
index fc68c0274a2102e612e5253091e8998097ac517d..d8d57538bb65edf475463d89384c64e36cc5c5a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=11
 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/prefs_themes.c b/src/prefs_themes.c
index 946e01cf8243a56c62ca1260f7ee531bacf6bfbc..295e2b3025ef543fccb2697aba50e4d691906d96 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -471,6 +471,11 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
        if (filename == NULL) 
                return;
        
+       if (filename[strlen(filename) - 1] != G_DIR_SEPARATOR)
+               filename = g_strconcat(filename, G_DIR_SEPARATOR_S, NULL);
+       else
+               filename = g_strdup(filename);
+
        cinfo = g_new0(CopyInfo, 1);
        source = g_path_get_dirname(filename);
        themename = g_path_get_basename(source);
@@ -538,6 +543,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
                alertpanel_error(_("File %s failed\nwhile installing theme."), cinfo->status);
 end_inst:
        if (cinfo->dest != NULL) g_free(cinfo->dest);
+       g_free(filename);
        g_free(source);
        g_free(themeinfo);
        g_free(cinfo);

diff --git a/src/summaryview.c b/src/summaryview.c
index 348b10a66314a4c4d1e8c0ac505f1e20ef5adf23..0a9b8a5e4a4cacb70cbcae6c5cc5f878ed36ee8b 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -956,8 +956,10 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        g_slist_free(mlist);
 
-       if (summaryview->sort_key != SORT_BY_NONE)
+       if (summaryview->sort_key != SORT_BY_NONE) {
                summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
+               summary_thread_init(summaryview);
+       }
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
@@ -4423,10 +4425,9 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
                                        gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
                                summaryview->selected = next;
-                               return TRUE;
                        }
                }
-               break;
+               return TRUE;
        case GDK_Home:
        case GDK_End:
                if ((node = summaryview->selected) != NULL) {
@@ -4443,10 +4444,9 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
                                        gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
                                summaryview->selected = next;
-                               return TRUE;
                        }
                }
-               break;
+               return TRUE;
        default:
                break;
        }