[epiphany/wip/gtkaction-to-gaction] Remove unused action group. Attach menu to tab instead of window



commit d27568f0974651ca95acd406b338ec8c02bf1e5f
Author: Iulian Radu <iulian radu67 gmail com>
Date:   Wed Jun 29 13:41:34 2016 +0300

    Remove unused action group. Attach menu to tab instead of window

 src/ephy-window.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 29a4315..8df411e 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -257,7 +257,6 @@ struct _EphyWindow {
   GtkActionGroup *action_group;
   GtkActionGroup *popups_action_group;
   GtkActionGroup *toolbar_action_group;
-  GtkActionGroup *tab_accels_action_group;
   GtkNotebook *notebook;
   EphyEmbed *active_embed;
   EphyWindowChrome chrome;
@@ -1050,13 +1049,6 @@ setup_ui_manager (EphyWindow *window)
   window->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->tab_accels_action_group = action_group;
-  g_object_unref (action_group);
-
   action_group = gtk_action_group_new ("SpecialToolbarActions");
 
   action =
@@ -2408,8 +2400,6 @@ tab_accels_item_activate (GSimpleAction *action,
   tab_number = atoi (action_name + strlen ("accel-"));
 
   gtk_notebook_set_current_page (EPHY_WINDOW (user_data)->notebook, tab_number);
-
-  g_free (action_name);
 }
 
 static void
@@ -2491,7 +2481,7 @@ show_notebook_popup_menu (GtkNotebook    *notebook,
 
   menu_model = G_MENU (gtk_builder_get_object (builder, "notebook-menu"));
   menu = gtk_menu_new_from_model (G_MENU_MODEL (menu_model));
-  gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (window), NULL);
+  gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (window->active_embed), NULL);
 
   action_group = gtk_widget_get_action_group (GTK_WIDGET (window), "tab");
 
@@ -2798,7 +2788,6 @@ ephy_window_dispose (GObject *object)
 
     window->action_group = NULL;
     window->popups_action_group = NULL;
-    window->tab_accels_action_group = NULL;
 
     g_object_unref (window->manager);
     window->manager = NULL;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]