[Commits] colorlabel.c 1.2.2.35 1.2.2.36 gtkcmclist.c 1.1.2.20 1.1.2.21

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv23522/src/gtk

Modified Files:
      Tag: gtk2
	colorlabel.c gtkcmclist.c 
Log Message:
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

Index: gtkcmclist.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmclist.c,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -d -r1.1.2.20 -r1.1.2.21
--- gtkcmclist.c	23 Oct 2011 22:22:19 -0000	1.1.2.20
+++ gtkcmclist.c	25 Oct 2011 06:11:12 -0000	1.1.2.21
@@ -3123,7 +3123,7 @@
 	{
 	  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);

Index: colorlabel.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/colorlabel.c,v
retrieving revision 1.2.2.35
retrieving revision 1.2.2.36
diff -u -d -r1.2.2.35 -r1.2.2.36
--- colorlabel.c	7 Oct 2011 09:40:15 -0000	1.2.2.35
+++ colorlabel.c	25 Oct 2011 06:11:12 -0000	1.2.2.36
@@ -352,7 +352,7 @@
 	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);