From: Colin Leroy <colin@colino.net>
Date: Sat, 30 Aug 2008 14:50:03 +0000 (+0000)
Subject: 2008-08-30 [colin]	3.5.0cvs85
X-Git-Tag: rel_3_6_0~69
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=dbcb8365e502850b0c7e06d2b912f800a356bcce

2008-08-30 [colin]	3.5.0cvs85

	* src/mainwindow.c
	* src/summaryview.c
		Fix "Apply tags..." key shortcut
---

diff --git a/ChangeLog b/ChangeLog
index 732e789ee..9558c2782 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-30 [colin]	3.5.0cvs85
+
+	* src/mainwindow.c
+	* src/summaryview.c
+		Fix "Apply tags..." key shortcut
+
 2008-08-29 [iwkse]	3.5.0cvs84
 
 	* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
index 7ac0546c6..20a4cece7 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3496,3 +3496,4 @@
 ( cvs diff -u -r 1.654.2.3555 -r 1.654.2.3556 configure.ac;  ) > 3.5.0cvs82.patchset
 ( cvs diff -u -r 1.395.2.384 -r 1.395.2.385 src/summaryview.c;  ) > 3.5.0cvs83.patchset
 ( cvs diff -u -r 1.395.2.385 -r 1.395.2.386 src/summaryview.c;  ) > 3.5.0cvs84.patchset
+( cvs diff -u -r 1.274.2.270 -r 1.274.2.271 src/mainwindow.c;  cvs diff -u -r 1.395.2.386 -r 1.395.2.387 src/summaryview.c;  ) > 3.5.0cvs85.patchset
diff --git a/configure.ac b/configure.ac
index 80fd4b8f0..3c10d78a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index e1105ebbe..2f7a7ef69 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1176,10 +1176,6 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
 	}
 
 	item = gtk_menu_item_new_with_label(_("Apply tags..."));
-	gtk_widget_add_accelerator(item, "activate", 
-		   gtk_ui_manager_get_accel_group(mainwin->ui_manager), 
-		   GDK_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK,
-		   GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	g_signal_connect(G_OBJECT(item), "activate",
 			 G_CALLBACK(mainwindow_tags_menu_item_apply_tags_activate_cb),
@@ -1187,6 +1183,10 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
 	g_object_set_data(G_OBJECT(item), "mainwin",
 			  mainwin);
 	gtk_widget_show(item);
+	accel_path = g_strdup_printf("<ClawsTags>/ApplyTags");
+	gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
+	g_free(accel_path);
+	gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
 
 	g_slist_free(orig);
 	gtk_widget_show(menu);
diff --git a/src/summaryview.c b/src/summaryview.c
index d06f9e7d4..553c1fffe 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5987,7 +5987,7 @@ static void summary_tags_menu_create(SummaryView *summaryview, gboolean refresh)
 	g_object_set_data(G_OBJECT(item), "summaryview",
 			  summaryview);
 	gtk_widget_show(item);
-	accel_path = g_strconcat("<ClawsTags>/","Apply tags...", NULL);
+	accel_path = g_strdup_printf("<ClawsTags>/ApplyTags");
 	gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
 	g_free(accel_path);