Bring ephy_window_get_toolbar signature in line with

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

	* src/ephy-window.c: (ephy_window_get_toolbar),
	(ephy_window_set_zoom):
	* src/ephy-window.h:
	* src/window-commands.c: (window_cmd_edit_toolbar),
	(window_cmd_load_location):

	Bring ephy_window_get_toolbar signature in line with
	ephy_window_get_[statusbar|notebook].

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

	* embed/mozilla/EventContext.cpp:

	GDK_Meta_L is a keycode, not a modifier code.
	Map meta to GDK_MOD2_MASK.

6 files changed, 34 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c97b5ffe..98f7a33e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2003-12-25  Christian Persch  <chpe@cvs.gnome.org>
+
+	* src/ephy-window.c: (ephy_window_get_toolbar),
+	(ephy_window_set_zoom):
+	* src/ephy-window.h:
+	* src/window-commands.c: (window_cmd_edit_toolbar),
+	(window_cmd_load_location):
+
+	Bring ephy_window_get_toolbar signature in line with
+	ephy_window_get_[statusbar|notebook].
+
+2003-12-24  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/mozilla/EventContext.cpp:
+
+	GDK_Meta_L is a keycode, not a modifier code.
+	Map meta to GDK_MOD2_MASK.
+
 2003-12-23  David Bordoley  <bordoley@msu.edu>
 
 	* help/C/epiphany.xml:
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index b67cd7231..985b7ff23 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -698,7 +698,7 @@ nsresult EventContext::GetMouseEventInfo (nsIDOMMouseEvent *aMouseEvent, EphyEmb
 	if (mod_key) info->modifier |= GDK_SHIFT_MASK;
 
 	aMouseEvent->GetMetaKey(&mod_key);
-	if (mod_key) info->modifier |= GDK_Meta_L;
+	if (mod_key) info->modifier |= GDK_MOD2_MASK;
 	
 	aMouseEvent->GetCtrlKey(&mod_key);
 	if (mod_key) info->modifier |= GDK_CONTROL_MASK;
@@ -758,7 +758,7 @@ nsresult EventContext::GetKeyEventInfo (nsIDOMKeyEvent *aKeyEvent, EphyEmbedEven
 	if (mod_key) info->modifier |= GDK_SHIFT_MASK;
 
 	aKeyEvent->GetMetaKey(&mod_key);
-	if (mod_key) info->modifier |= GDK_Meta_L;
+	if (mod_key) info->modifier |= GDK_MOD2_MASK;
 	
 	aKeyEvent->GetCtrlKey(&mod_key);
 	if (mod_key) info->modifier |= GDK_CONTROL_MASK;
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 12a23dbc8..fd450634f 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -590,7 +590,7 @@ ephy_shell_new_tab (EphyShell *shell,
 		window = ephy_window_new ();
 	}
 
-	toolbar = ephy_window_get_toolbar (window);
+	toolbar = EPHY_TOOLBAR (ephy_window_get_toolbar (window));
 
 	if (previous_tab)
 	{
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 333205d62..579e3e301 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1727,6 +1727,15 @@ ephy_window_set_print_preview (EphyWindow *window, gboolean enabled)
 	ephy_notebook_set_show_tabs (EPHY_NOTEBOOK (window->priv->notebook), !enabled);
 }
 
+
+GtkWidget *
+ephy_window_get_toolbar (EphyWindow *window)
+{
+	g_return_val_if_fail (EPHY_IS_WINDOW (window), NULL);
+
+	return GTK_WIDGET (window->priv->toolbar);
+}
+
 GtkWidget *
 ephy_window_get_notebook (EphyWindow *window)
 {
@@ -2043,9 +2052,3 @@ ephy_window_set_zoom (EphyWindow *window,
 		ephy_embed_zoom_set (embed, zoom, TRUE);
 	}
 }
-
-Toolbar *
-ephy_window_get_toolbar (EphyWindow *window)
-{
-	return window->priv->toolbar;
-}
diff --git a/src/ephy-window.h b/src/ephy-window.h
index 6c0245aab..e67568d5a 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -78,6 +78,8 @@ void		  ephy_window_request_chrome	  (EphyWindow *window,
 void		  ephy_window_set_print_preview	  (EphyWindow *window,
 						   gboolean enabled);
 
+GtkWidget	 *ephy_window_get_toolbar	  (EphyWindow *window);
+
 GtkWidget	 *ephy_window_get_notebook	  (EphyWindow *window);
 
 GtkWidget	 *ephy_window_get_statusbar	  (EphyWindow *window);
@@ -107,8 +109,6 @@ EphyEmbed	 *ephy_window_get_active_embed	  (EphyWindow *window);
 
 GList		 *ephy_window_get_tabs		  (EphyWindow *window);
 
-Toolbar		 *ephy_window_get_toolbar	  (EphyWindow *window);
-
 void		  ephy_window_find		  (EphyWindow *window);
 
 void		  ephy_window_print		  (EphyWindow *window);
diff --git a/src/window-commands.c b/src/window-commands.c
index a07643de5..d5977e4af 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -852,7 +852,7 @@ window_cmd_edit_toolbar (GtkAction *action,
 {
 	GtkWidget *editor;
 	EphyToolbarsModel *model;
-	Toolbar *t;
+	GtkWidget *t;
 	GtkWidget *dialog;
 
 	model = EPHY_TOOLBARS_MODEL
@@ -1095,7 +1095,7 @@ window_cmd_load_location (GtkAction *action,
 	Toolbar *toolbar;
 	const char *location;
 
-	toolbar = ephy_window_get_toolbar (window);
+	toolbar = EPHY_TOOLBAR (ephy_window_get_toolbar (window));
 	location = toolbar_get_location (toolbar);
 
 	if (location)