2011-10-23 [colin] 3.7.10cvs45

	* src/gtk/gtkcmclist.h
		Fix build (this was not meant to be commited)

diff --git a/ChangeLog b/ChangeLog
index 17b3cc623c36459810ff2a7ccf4e87d5ef97dd91..2d494aa68c75ba1832e2006426d56afca28de178 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-23 [colin]     3.7.10cvs45
+
+       * src/gtk/gtkcmclist.h
+               Fix build (this was not meant to be commited)
+
 2011-10-23 [colin]     3.7.10cvs44
 
        * src/addressadd.c

diff --git a/PATCHSETS b/PATCHSETS
index 40c7c83757649113103937345f82463d9061f308..100e903902cd24ff31d22487661a446a67139eaf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4248,3 +4248,4 @@
 ( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/printing.c;  cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/gtk/gtkshruler.c;  cvs diff -u -r 1.4.2.63 -r 1.4.2.64 src/gtk/gtkutils.h;  ) > 3.7.10cvs42.patchset
 ( cvs diff -u -r 1.60.2.57 -r 1.60.2.58 src/filtering.c;  ) > 3.7.10cvs43.patchset
 ( cvs diff -u -r 1.9.2.33 -r 1.9.2.34 src/addressadd.c;  cvs diff -u -r 1.60.2.145 -r 1.60.2.146 src/addressbook.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/addressbook_foldersel.c;  cvs diff -u -r 1.11.2.27 -r 1.11.2.28 src/editgroup.c;  cvs diff -u -r 1.26.2.47 -r 1.26.2.48 src/foldersel.c;  cvs diff -u -r 1.207.2.223 -r 1.207.2.224 src/folderview.c;  cvs diff -u -r 1.14.2.31 -r 1.14.2.32 src/grouplistdialog.c;  cvs diff -u -r 1.204.2.202 -r 1.204.2.203 src/prefs_common.c;  cvs diff -u -r 1.103.2.133 -r 1.103.2.134 src/prefs_common.h;  cvs diff -u -r 1.395.2.433 -r 1.395.2.434 src/summaryview.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtkcmctree.h;  cvs diff -u -r 1.1.4.62 -r 1.1.4.63 src/gtk/gtksctree.c;  ) > 3.7.10cvs44.patchset
+( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtkcmclist.h;  ) > 3.7.10cvs45.patchset

diff --git a/configure.ac b/configure.ac
index 21ed44365980cb7369b34fb17156e6cda2e93590..81071649a7a76e69a7e81f242954bf686319d6d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=45
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkcmclist.h b/src/gtk/gtkcmclist.h
index b31e220597f19bd29b4ce5f665d9763f4c31073c..b4530188813b4dcf59ac74718ceaf8e94962971a 100644 (file)
--- a/src/gtk/gtkcmclist.h
+++ b/src/gtk/gtkcmclist.h
@@ -206,6 +206,13 @@ struct _GtkCMCList
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
   
+  /* xor GC for the vertical drag line */
+  GdkGC *xor_gc;
+  
+  /* gc for drawing unselected cells */
+  GdkGC *fg_gc;
+  GdkGC *bg_gc;
+  
   /* cursor used to indicate dragging */
   GdkCursor *cursor_drag;