[Commits] mainwindow.c 1.274.2.366 1.274.2.367 summaryview.c 1.395.2.462 1.395.2.463

[mones at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv7744/src

Modified Files:
      Tag: gtk2
	mainwindow.c summaryview.c 
Log Message:
2013-03-09 [mones]	3.9.0cvs111

	* INSTALL
		Update required GTK+ version and configure plugin flags
	* src/mainwindow.c
	* src/summaryview.c
		Remove unnecessary checks, newer keysyms are already
		included by gtkutils.h if needed 

Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.462
retrieving revision 1.395.2.463
diff -u -d -r1.395.2.462 -r1.395.2.463
--- summaryview.c	22 Feb 2013 11:23:43 -0000	1.395.2.462
+++ summaryview.c	9 Mar 2013 01:20:47 -0000	1.395.2.463
@@ -6014,11 +6014,7 @@
 	accel_path = g_strdup_printf("<ClawsColorLabels>/None");
 	gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
 	g_free(accel_path);
-#if !GTK_CHECK_VERSION(2, 24, 0)
-	gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
-#else
 	gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
-#endif
 
 	item = gtk_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -6038,11 +6034,7 @@
 		accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
 		gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
 		if (i < 9)
-#if !GTK_CHECK_VERSION(2, 24, 0)
-			gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
-#else
 			gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
-#endif
 		g_free(accel_path);
 		g_signal_connect (gtk_ui_manager_get_accel_group(mainwindow_get_mainwindow()->ui_manager), 
 			"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);

Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.366
retrieving revision 1.274.2.367
diff -u -d -r1.274.2.366 -r1.274.2.367
--- mainwindow.c	16 Feb 2013 11:59:54 -0000	1.274.2.366
+++ mainwindow.c	9 Mar 2013 01:20:47 -0000	1.274.2.367
@@ -1182,11 +1182,7 @@
 	accel_path = g_strdup_printf("<ClawsColorLabels>/None");
 	gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
 	g_free(accel_path);
-#if !GTK_CHECK_VERSION(2, 24, 0)
-	gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
-#else
 	gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
-#endif
 	item = gtk_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	gtk_widget_show(item);
@@ -1205,11 +1201,7 @@
 		accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
 		gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
 		if (i < 9)
-#if !GTK_CHECK_VERSION(2, 24, 0)
-			gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
-#else
 			gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
-#endif
 		g_free(accel_path);
 		g_signal_connect (gtk_ui_manager_get_accel_group(mainwin->ui_manager), 
 			"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
@@ -1314,11 +1306,7 @@
 	accel_path = g_strdup_printf("<ClawsTags>/ApplyTags");
 	gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
 	g_free(accel_path);
-#if !GTK_CHECK_VERSION(2, 24, 0)
-	gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-#else
 	gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_KEY_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-#endif
 	g_slist_free(orig);
 	gtk_widget_show(menu);
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);