From d0a541a6cb797ecc289e3a8c72fe527b11bcbb35 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Wed, 10 Dec 2003 18:44:10 +0000
Subject: Make print dialogue spacing HIG-compliant.

2003-12-10  Christian Persch  <chpe@cvs.gnome.org>

	* data/glade/print.glade:

	Make print dialogue spacing HIG-compliant.

	* src/ephy-tabs-menu.c: (tab_set_action_accelerator),
	(ephy_tabs_menu_update):

	Restore tabs menu shortcut keys ALT-1 .. ALT-0 for the first
	ten tabs; they somehow got lost in the Egg->Gtk port.
---
 ChangeLog              | 12 ++++++++++++
 data/glade/print.glade |  2 +-
 src/ephy-tabs-menu.c   |  8 +++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3ab4364b6..a1f430d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-12-10  Christian Persch  <chpe@cvs.gnome.org>
+
+	* data/glade/print.glade:
+
+	Make print dialogue spacing HIG-compliant.
+
+	* src/ephy-tabs-menu.c: (tab_set_action_accelerator),
+	(ephy_tabs_menu_update):
+
+	Restore tabs menu shortcut keys ALT-1 .. ALT-0 for the first
+	ten tabs; they somehow got lost in the Egg->Gtk port.
+
 2003-12-09  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* data/epiphany.schemas.in:
diff --git a/data/glade/print.glade b/data/glade/print.glade
index 573b4af1e..47cdfa2a4 100644
--- a/data/glade/print.glade
+++ b/data/glade/print.glade
@@ -1114,7 +1114,7 @@
     <widget class="GtkVBox" id="dialog-vbox9">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
+      <property name="spacing">12</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="hbuttonbox1">
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
index 9b7c6c6fc..fc1518d61 100644
--- a/src/ephy-tabs-menu.c
+++ b/src/ephy-tabs-menu.c
@@ -247,6 +247,7 @@ tab_set_action_accelerator (GtkActionGroup *action_group,
 	/* set the accel path for the menu item */
 	accel_path = g_strconcat ("<Actions>/", action_group_name, "/",
 				  action_name, NULL);
+	gtk_action_set_accel_path (action, accel_path);
 
 	/* Only the first ten tabs get accelerators starting from 1 through 0 */
 	if (tab_number < 10)
@@ -260,12 +261,13 @@ tab_set_action_accelerator (GtkActionGroup *action_group,
 
 		if (accel_key != 0)
 		{
-			gtk_action_set_accel_path (action, accel_path);
+			gtk_accel_map_change_entry (accel_path, accel_key,
+						    accel_mods, TRUE);
 		}
 	}
 	else
 	{
-		gtk_action_set_accel_path (action, accel_path);
+		gtk_accel_map_change_entry (accel_path, 0, 0, TRUE);
 	}
 }
 
@@ -308,7 +310,7 @@ ephy_tabs_menu_update (EphyTabsMenu *menu)
 		action_name = gtk_action_get_name (action);
 		name = g_strdup_printf ("%sMenu", action_name);
 
-		tab_set_action_accelerator (p->action_group, action, i);
+		tab_set_action_accelerator (p->action_group, action, i++);
 
 		gtk_ui_manager_add_ui (merge, p->ui_id,
 				       "/menubar/TabsMenu/TabsOpen",
-- 
cgit v1.2.3