[epiphany] Fix critical warnings when opening context menu
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Fix critical warnings when opening context menu
- Date: Mon, 25 Aug 2014 14:58:04 +0000 (UTC)
commit fb1be7f587a10e320d47e58d0c7eec932f7055a3
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Wed Aug 20 16:57:54 2014 -0500
Fix critical warnings when opening context menu
Opening the context menu causes this critical to print for each menu
item:
Gtk-CRITICAL **: gtk_accel_label_set_accel_closure: assertion
'gtk_accel_group_from_accel_closure (accel_closure) != NULL' failed
https://bugzilla.gnome.org/show_bug.cgi?id=735128
src/ephy-window.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 840f06e..016bdc4 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1071,6 +1071,7 @@ static void
setup_ui_manager (EphyWindow *window)
{
GtkActionGroup *action_group;
+ GtkAccelGroup *accel_group;
GtkAction *action;
GtkUIManager *manager;
@@ -1080,6 +1081,7 @@ setup_ui_manager (EphyWindow *window)
window->priv->main_vbox);
manager = gtk_ui_manager_new ();
+ accel_group = gtk_ui_manager_get_accel_group (manager);
action_group = gtk_action_group_new ("WindowActions");
gtk_action_group_set_translation_domain (action_group, NULL);
@@ -1089,6 +1091,7 @@ setup_ui_manager (EphyWindow *window)
ephy_menu_toggle_entries,
G_N_ELEMENTS (ephy_menu_toggle_entries),
window);
+ gtk_action_group_set_accel_group (action_group, accel_group);
gtk_ui_manager_insert_action_group (manager, action_group, 0);
window->priv->action_group = action_group;
g_object_unref (action_group);
@@ -1122,12 +1125,14 @@ setup_ui_manager (EphyWindow *window)
gtk_action_group_set_translation_domain (action_group, NULL);
gtk_action_group_add_actions (action_group, ephy_popups_entries,
G_N_ELEMENTS (ephy_popups_entries), window);
+ gtk_action_group_set_accel_group (action_group, accel_group);
gtk_ui_manager_insert_action_group (manager, action_group, 0);
window->priv->popups_action_group = action_group;
g_object_unref (action_group);
/* Tab accels */
action_group = gtk_action_group_new ("TabAccelsActions");
+ gtk_action_group_set_accel_group (action_group, accel_group);
gtk_ui_manager_insert_action_group (manager, action_group, 0);
window->priv->tab_accels_action_group = action_group;
g_object_unref (action_group);
@@ -1200,13 +1205,13 @@ setup_ui_manager (EphyWindow *window)
gtk_action_group_add_action_with_accel (action_group, action, "<alt>E");
g_object_unref (action);
+ gtk_action_group_set_accel_group (action_group, accel_group);
gtk_ui_manager_insert_action_group (manager, action_group, 0);
window->priv->toolbar_action_group = action_group;
g_object_unref (action_group);
window->priv->manager = manager;
- gtk_window_add_accel_group (GTK_WINDOW (window),
- gtk_ui_manager_get_accel_group (manager));
+ gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
}
static char *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]