2011-10-25 [colin] 3.7.10cvs49
authorColin Leroy <colin@colino.net>
Tue, 25 Oct 2011 06:11:12 +0000 (06:11 +0000)
committerColin Leroy <colin@colino.net>
Tue, 25 Oct 2011 06:11:12 +0000 (06:11 +0000)
* src/gtk/colorlabel.c
GDK_ => GDK_KEY
* src/gtk/gtkcmclist.c
Make row height closer to what it was

ChangeLog
PATCHSETS
configure.ac
src/gtk/colorlabel.c
src/gtk/gtkcmclist.c

index 74c885e..6d116fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-25 [colin]     3.7.10cvs49
+
+       * src/gtk/colorlabel.c
+               GDK_ => GDK_KEY
+       * src/gtk/gtkcmclist.c
+               Make row height closer to what it was
+
 2011-10-25 [colin]     3.7.10cvs48
 
        * src/stock_pixmap.c
index d67a881..e8bfc3e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/gtk/gtkcmctree.c;  ) > 3.7.10cvs46.patchset
 ( cvs diff -u -r 1.83.2.174 -r 1.83.2.175 src/mimeview.c;  ) > 3.7.10cvs47.patchset
 ( cvs diff -u -r 1.25.2.70 -r 1.25.2.71 src/stock_pixmap.c;  ) > 3.7.10cvs48.patchset
+( cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/gtk/colorlabel.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/gtkcmclist.c;  ) > 3.7.10cvs49.patchset
index 17a8844..3217d40 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index c5014bf..2500a99 100644 (file)
@@ -352,7 +352,7 @@ GtkWidget *colorlabel_create_check_color_menu_item(gint color_index, gboolean fo
        gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4);
        if (color_index < 9) {
-               accel = gtk_accelerator_get_label(GDK_1+color_index, GDK_CONTROL_MASK);
+               accel = gtk_accelerator_get_label(GDK_KEY_1+color_index, GDK_CONTROL_MASK);
                label = gtk_label_new(accel);
                gtk_widget_show(label);
                gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
index d613430..060e66b 100644 (file)
@@ -3123,7 +3123,7 @@ gtk_cmclist_set_row_height (GtkCMCList *clist,
        {
          clist->row_height = (pango_font_metrics_get_ascent (metrics) +
                               pango_font_metrics_get_descent (metrics));
-         clist->row_height = PANGO_PIXELS (clist->row_height) + 2;
+         clist->row_height = PANGO_PIXELS (clist->row_height) + 1;
        }
 
       pango_font_metrics_unref (metrics);