From: Colin Leroy <colin@colino.net>
Date: Sun, 11 Mar 2012 09:19:24 +0000 (+0000)
Subject: 2012-03-11 [colin]	3.8.0cvs31
X-Git-Tag: rel_3_8_1~29
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e5da787174449fee98f15fd1197c0d95a3f9eaa3;ds=sidebyside

2012-03-11 [colin]	3.8.0cvs31

	* src/gtk/gtkcmctree.c
	* src/gtk/authors.h
	* AUTHORS
		Fix focus rectangle on unfocused rows
		Patch by Michael Shell
---

diff --git a/AUTHORS b/AUTHORS
index ffe6ae1c6..ded75fada 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -287,3 +287,4 @@ contributors (in addition to the above; based on Changelog)
 	Steve Rader
 	Hanno Meyer-Thurow
 	Bodo Graumann
+	Michael Shell
diff --git a/ChangeLog b/ChangeLog
index 8c6b4a615..368b4e902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-11 [colin]	3.8.0cvs31
+
+	* src/gtk/gtkcmctree.c
+	* src/gtk/authors.h
+	* AUTHORS
+		Fix focus rectangle on unfocused rows
+		Patch by Michael Shell
+
 2012-02-29 [colin]	3.8.0cvs30
 
 	* src/gtk/gtkcmctree.c
diff --git a/PATCHSETS b/PATCHSETS
index 4ba2fc7c4..f072abf20 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4347,3 +4347,4 @@
 ( cvs diff -u -r 1.60.2.60 -r 1.60.2.61 src/filtering.c;  ) > 3.8.0cvs28.patchset
 ( cvs diff -u -r 1.94.2.227 -r 1.94.2.228 src/messageview.c;  ) > 3.8.0cvs29.patchset
 ( cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/gtk/gtkcmctree.c;  ) > 3.8.0cvs30.patchset
+( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/gtk/authors.h;  cvs diff -u -r 1.100.2.81 -r 1.100.2.82 AUTHORS;  ) > 3.8.0cvs31.patchset
diff --git a/configure.ac b/configure.ac
index 19b247cd6..b12417528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 9d7fcd5a9..08ce58c96 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -232,6 +232,7 @@ static char *CONTRIBS_LIST[] = {
 "Markus Schwarzenberg",
 "Rodrigo Dias Arruda Senra",
 "Setoh",
+"Michael Shell",
 "shigeri",
 "Gustavo Noronha Silva",
 "Jesse Skinner",
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
index 276a8102a..8ad5e24d6 100644
--- a/src/gtk/gtkcmctree.c
+++ b/src/gtk/gtkcmctree.c
@@ -934,7 +934,8 @@ draw_row (GtkCMCList     *clist,
     }
    /* draw focus rectangle */
   if (clist->focus_row == row &&
-      gtk_widget_get_can_focus (widget) && gtk_widget_has_focus (widget))
+      gtk_widget_get_can_focus (widget) && gtk_widget_has_focus (widget)
+       && state == GTK_STATE_SELECTED)
     {
       if (!area || gdk_rectangle_intersect (area, &row_rectangle,
 					&intersect_rectangle))