From 7c7d6f9dba8d66386213172d5e7c1e05577ebc49 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 25 Apr 2006 11:40:41 +0000 Subject: Make sure each tab has its own unique ID, so accel paths don't conflict 2006-04-25 Christian Persch * src/ephy-tab.c: (ephy_tab_finalize), (ephy_tab_init), (ephy_tab_get_zoom), (_ephy_tab_get_id): * src/ephy-tab.h: * src/ephy-tabs-menu.c: (notebook_page_added_cb), (sync_active_tab): Make sure each tab has its own unique ID, so accel paths don't conflict between windows. Fixes bug #339548. --- src/ephy-tabs-menu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ephy-tabs-menu.c') diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c index c79220719..553f8c033 100644 --- a/src/ephy-tabs-menu.c +++ b/src/ephy-tabs-menu.c @@ -54,7 +54,6 @@ struct _EphyTabsMenuPrivate GtkActionGroup *action_group; GtkAction *anchor_action; guint ui_id; - guint num; }; enum @@ -142,7 +141,8 @@ notebook_page_added_cb (EphyNotebook *notebook, LOG ("tab_added_cb tab=%p", tab); - g_snprintf (verb, sizeof (verb), ACTION_VERB_FORMAT, priv->num++); + g_snprintf (verb, sizeof (verb), ACTION_VERB_FORMAT, + _ephy_tab_get_id (tab)); action = g_object_new (GTK_TYPE_RADIO_ACTION, "name", verb, @@ -250,6 +250,7 @@ sync_active_tab (EphyWindow *window, /* happens initially, since the ::active-tab comes before * the ::tab-added signal */ + /* FIXME that's not true with gtk+ 2.9 anymore */ if (action == NULL) return; gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); -- cgit v1.2.3