talons

commit 59d5d848ffa629c3267d6428db8aa798096710cc
parent c5bc2d8836beaed9ac31b3aa71d93273349577f6
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 25 Oct 2011 06:11:12 +0000

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

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/colorlabel.c
 | 
2
+-
M
src/gtk/gtkcmclist.c
 | 
2
+-

5 files changed, 11 insertions(+), 3 deletions(-)
diff --git 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
diff --git a/PATCHSETS b/PATCHSETS
@@ -4252,3 +4252,4 @@
 ( 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
diff --git a/configure.ac b/configure.ac
@@ -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=
 
diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
@@ -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);
diff --git a/src/gtk/gtkcmclist.c b/src/gtk/gtkcmclist.c
@@ -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);