2005-08-17 [paul] 1.9.13cvs35
authorPaul Mangan <paul@claws-mail.org>
Wed, 17 Aug 2005 14:08:29 +0000 (14:08 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 17 Aug 2005 14:08:29 +0000 (14:08 +0000)
* src/account.c
* src/addressbook.c
use new GTK_STOCK_ icons if available
* src/summaryview.c
* src/gtk/gtksctree.c
* src/gtk/gtksctree.h
faster range select. patch by Colin

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/account.c
src/addressbook.c
src/gtk/gtksctree.c
src/gtk/gtksctree.h
src/summaryview.c

index 8863e491dbdef6289583ce7148dda3919fee19a4..4b9b7f4a08a2577aa1cef17d39f89cfdb06a64b6 100644 (file)
@@ -1,3 +1,13 @@
+2005-08-17 [paul]      1.9.13cvs35
+
+       * src/account.c
+       * src/addressbook.c
+               use new GTK_STOCK_ icons if available
+       * src/summaryview.c
+       * src/gtk/gtksctree.c
+       * src/gtk/gtksctree.h
+               faster range select. patch by Colin
+
 2005-08-17 [paul]      1.9.13cvs34
 
        patches by colin:
index fe0c6f4bc1956fc11525709d08224d603cebed34..a3d02cc09b235f5f6ac8da1810e68f51c4940ca8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.150.2.36 -r 1.150.2.37 src/procmsg.c;  ) > 1.9.13cvs32.patchset
 ( cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/etpan/imap-thread.c;  ) > 1.9.13cvs33.patchset
 ( cvs diff -u -r 1.60.2.24 -r 1.60.2.25 src/addressbook.c;  cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/addressitem.h;  cvs diff -u -r 1.14.2.7 -r 1.14.2.8 src/editaddress.c;  cvs diff -u -r 1.207.2.56 -r 1.207.2.57 src/folderview.c;  cvs diff -u -r 1.395.2.110 -r 1.395.2.111 src/summaryview.c;  cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/gtk/progressdialog.c;  ) > 1.9.13cvs34.patchset
+( cvs diff -u -r 1.61.2.35 -r 1.61.2.36 src/account.c;  cvs diff -u -r 1.60.2.25 -r 1.60.2.26 src/addressbook.c;  cvs diff -u -r 1.395.2.111 -r 1.395.2.112 src/summaryview.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/gtk/gtksctree.h;  ) > 1.9.13cvs35.patchset
index fbc2f24b28e2c259ac8a294eb12998d13200d265..0ac11cbf8f18c2f3243b5f372e819eef2012d6b8 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index e694305c2f2970f39553eda55bfb6fac9174c950..7e43593ca5a81629261f7bc042d88f205ee4ed91 100644 (file)
@@ -676,7 +676,7 @@ static void account_edit_create(void)
        g_signal_connect (G_OBJECT(add_btn), "clicked",
                          G_CALLBACK (account_add), NULL);
 
-#ifdef GTK_STOCK_EDIT
+#if GTK_CHECK_VERSION(2, 6, 0)
        edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
 #else
        edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
index c710b6e833cb25a7d0dec5116f038407cc09cb15..da8dbf2cdfbbcbd3d5669a0efaa19e422110b4ad 100644 (file)
@@ -862,7 +862,11 @@ static void addressbook_create(void)
        gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
 
+#if GTK_CHECK_VERSION(2, 6, 0)
        edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+#else
+       edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
+#endif
        GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
        del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
index d6b28e7062ce8b86eb5c0ad2606a6d2008ecfc48..83ef9d7736ee046aa4a61980c900ef246c653393 100644 (file)
@@ -214,8 +214,12 @@ select_range (GtkSCTree *sctree, gint row)
                min = prev_row;
                max = row;
        }
-       for (i = min; i <= max; i++)
+       sctree->selecting_range = TRUE;
+       for (i = min; i < max; i++)
                gtk_clist_select_row (GTK_CLIST (sctree), i, -1);
+
+       sctree->selecting_range = FALSE;
+       gtk_clist_select_row (GTK_CLIST (sctree), max, -1);
 }
 
 /* Handles row selection according to the specified modifier state */
index 426f8a6976f7f747784e5da36178e2f0e77a9e71..7da82a71287f62404736522424ea5bbe6f5286ad 100644 (file)
@@ -33,6 +33,7 @@ struct _GtkSCTree {
        gint dnd_select_pending;
        guint dnd_select_pending_state;
        gint dnd_select_pending_row;
+       gboolean selecting_range;
 };
 
 struct _GtkSCTreeClass {
index d80b85a135404e962a5cc024853e029efc3306f3..40b8854e8e1b9afb564a02e067296423b3efc8af 100644 (file)
@@ -4637,7 +4637,8 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        MsgInfo *msginfo;
        gboolean marked_unread = FALSE;
 
-       if (summary_is_locked(summaryview)) {
+       if (summary_is_locked(summaryview)
+       ||  GTK_SCTREE(ctree)->selecting_range) {
                return;
        }