2008-12-01 [colin] 3.6.1cvs57

	* src/gtk/gtkcmclist.c
		Fix column headers

diff --git a/ChangeLog b/ChangeLog
index 5c5e337a29946f4a53ce264bdba12e4aac008cda..9177fb29a9533c5c0e8f8aff6212f00f959a21f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-01 [colin]     3.6.1cvs57
+
+       * src/gtk/gtkcmclist.c
+               Fix column headers
+
 2008-12-01 [colin]     3.6.1cvs56
 
        * src/plugins/pgpinline/pgpinline.c

diff --git a/PATCHSETS b/PATCHSETS
index c019f4a5c0e6c7a4b81322ddf840e1ed3f402023..cea82e7f77f8c060e089ca0170675f61562e668a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3638,3 +3638,4 @@
 ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/prefs_other.c;  cvs diff -u -r 1.12.2.48 -r 1.12.2.49 src/gtk/prefswindow.c;  ) > 3.6.1cvs54.patchset
 ( cvs diff -u -r 1.1.2.52 -r 1.1.2.53 manual/advanced.xml;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 manual/plugins.xml;  cvs diff -u -r 1.30.2.53 -r 1.30.2.54 src/prefs_toolbar.c;  ) > 3.6.1cvs55.patchset
 ( cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/pgpinline/pgpinline.c;  ) > 3.6.1cvs56.patchset
+( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmclist.c;  ) > 3.6.1cvs57.patchset

diff --git a/configure.ac b/configure.ac
index c6d413b24860d1b86021c0d12fb22b1a09f4d0fe..821f766749dbd52cf57a447d4d1a4823b649e3f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=56
+EXTRA_VERSION=57
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkcmclist.c b/src/gtk/gtkcmclist.c
index 379c97a3fa595ab071b242fae0754d17f599139d..96d1c7f3e09aac7111fb084c55a0a8422d0b4c20 100644 (file)
--- a/src/gtk/gtkcmclist.c
+++ b/src/gtk/gtkcmclist.c
@@ -2210,6 +2210,10 @@ column_button_create (GtkCMCList *clist,
 
   gtk_widget_push_composite_child ();
   button = clist->column[column].button = gtk_button_new ();
+  GtkRcStyle *style = gtk_rc_style_new();
+  style->ythickness = 0;
+  gtk_widget_modify_style(clist->column[column].button, style);
+  g_object_unref(style);
   gtk_container_set_border_width(GTK_CONTAINER(button), 0);
   gtk_widget_pop_composite_child ();
 
@@ -4889,10 +4893,11 @@ gtk_cmclist_expose (GtkWidget      *widget,
          
          for (i = 0; i < clist->columns; i++)
            {
-             if (clist->column[i].button)
+             if (clist->column[i].button) {
                gtk_container_propagate_expose (GTK_CONTAINER (clist),
                                                clist->column[i].button,
                                                event);
+             }
            }
        }
     }
@@ -5468,9 +5473,9 @@ gtk_cmclist_size_request (GtkWidget      *widget,
                                   &child_requisition);
          clist->column_title_area.height =
            MAX (clist->column_title_area.height,
-                child_requisition.height - 2);
+                child_requisition.height);
        }
-    clist->column_title_area.height = font_height;
+    //clist->column_title_area.height = font_height;
   }
   requisition->width += (widget->style->xthickness +
                         GTK_CONTAINER (widget)->border_width) * 2;