2008-08-30 [colin] 3.5.0cvs85
authorColin Leroy <colin@colino.net>
Sat, 30 Aug 2008 14:50:03 +0000 (14:50 +0000)
committerColin Leroy <colin@colino.net>
Sat, 30 Aug 2008 14:50:03 +0000 (14:50 +0000)
* src/mainwindow.c
* src/summaryview.c
Fix "Apply tags..." key shortcut

ChangeLog
PATCHSETS
configure.ac
src/mainwindow.c
src/summaryview.c

index 732e789eec57dd9feeee11cab24fb15f6101908e..9558c2782926c8dae517ba21e5e5958bb3ea9ba5 100644 (file)
--- 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
 2008-08-29 [iwkse]     3.5.0cvs84
 
        * src/summaryview.c
index 7ac0546c676fee3619167a823ab627268709f50e..20a4cece7cdff7c11c7a6584f7687dce276086c4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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.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
index 80fd4b8f084873f0a568d00ee8d94be2b433c33d..3c10d78a4c9b0025ef21b3209ddb654f1120de1f 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index e1105ebbebf71cd807acb78b2e57e89548514620..2f7a7ef69744c4491ee5be5f2ecbc2e61b6fec41 100644 (file)
@@ -1176,10 +1176,6 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
        }
 
        item = gtk_menu_item_new_with_label(_("Apply tags..."));
        }
 
        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),
        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);
        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);
 
        g_slist_free(orig);
        gtk_widget_show(menu);
index d06f9e7d4f0209ec835dfd8626fb919ceae4e9b0..553c1fffe4378448243952af1084ca58cc432d75 100644 (file)
@@ -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);
        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);
 
        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
        g_free(accel_path);