Merge eog-menu-api branch

2003-01-20  Marco Pesenti Gritti  <marco@it.gnome.org>

	* Merge eog-menu-api branch

1 files changed, 94 insertions, 139 deletions

diff --git a/src/window-commands.h b/src/window-commands.h
index df05a4d50..bf733897c 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -16,181 +16,136 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "egg-action.h"
 #include "ephy-window.h"
 #include "ephy-embed-utils.h"
 
-#include <bonobo/bonobo-ui-component.h>
+void window_cmd_edit_find	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_edit_find	(BonoboUIComponent *uic, 
-			    	 EphyWindow *window, 
-			    	 const char* verbname);
+void window_cmd_file_print	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_file_print 	(BonoboUIComponent *uic, 
-			   	 EphyWindow *window, 
-			   	 const char* verbname);
+void window_cmd_view_stop	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_go_stop 	(BonoboUIComponent *uic, 
-			 	 EphyWindow *window, 
-				 const char* verbname);
+void window_cmd_go_back		(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_go_back 	(BonoboUIComponent *uic, 
-			 	 EphyWindow *window, 
-				 const char* verbname);
+void window_cmd_go_forward	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_go_forward 	(BonoboUIComponent *uic, 
-			 	 EphyWindow *window, 
-				 const char* verbname);
+void window_cmd_go_location	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_go_go	 	(BonoboUIComponent *uic, 
-			 	 EphyWindow *window, 
-				 const char* verbname);
+void window_cmd_go_up		(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_go_up 	(BonoboUIComponent *uic, 
-			 	 EphyWindow *window, 
-				 const char* verbname);
+void window_cmd_go_home		(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_go_home 	(BonoboUIComponent *uic, 
-			 	 EphyWindow *window, 
-				 const char* verbname);
+void window_cmd_go_myportal	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_go_myportal 	(BonoboUIComponent *uic, 
-			 	 EphyWindow *window, 
-				 const char* verbname);
+void window_cmd_go_location	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_go_location 	(BonoboUIComponent *uic, 
-			 	 EphyWindow *window, 
-				 const char* verbname);
+void window_cmd_view_reload	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_go_reload 	(BonoboUIComponent *uic, 
-			 	 EphyWindow *window, 
-				 const char* verbname);
+void window_cmd_new		(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_new	 	(BonoboUIComponent *uic, 
-			    	 EphyWindow *window, 
-			    	 const char* verbname);
+void window_cmd_file_new_window	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_new_window 	(BonoboUIComponent *uic, 
-			    	 EphyWindow *window, 
-			    	 const char* verbname);
+void window_cmd_file_new_tab	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_new_tab 	(BonoboUIComponent *uic, 
-			    	 EphyWindow *window, 
-			    	 const char* verbname);
+void window_cmd_file_add_bookmark(EggAction *action,
+				  EphyWindow *window);
 
-void window_cmd_bookmarks_add_default 	(BonoboUIComponent *uic, 
-					 EphyWindow *window, 
-					 const char* verbname);
+void window_cmd_go_bookmarks	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_bookmarks_edit 	(BonoboUIComponent *uic, 
-			    	 EphyWindow *window, 
-			    	 const char* verbname);
+void window_cmd_file_open	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_file_open 	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_file_save_as    (EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_file_save_as 	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_file_send_to	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_file_send_to 	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_file_close_tab	  (EggAction *action,
+				   EphyWindow *window);
 
-void window_cmd_file_close_tab 	  (BonoboUIComponent *uic, 
-		      		   EphyWindow *window, 
-		      		   const char* verbname);
+void window_cmd_file_close_window (EggAction *action,
+				   EphyWindow *window);
 
-void window_cmd_file_close_window (BonoboUIComponent *uic, 
-		      		   EphyWindow *window, 
-		      		   const char* verbname);
+void window_cmd_edit_cut	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_edit_cut 	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_edit_copy	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_edit_copy 	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_edit_paste	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_edit_paste 	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_edit_select_all (EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_edit_select_all (BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_edit_find_next	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_edit_find_next	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_edit_find_prev	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_edit_find_prev	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_view_statusbar	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_view_zoom_in	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_view_fullscreen	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_view_zoom_out	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_view_zoom_in	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_view_zoom_normal(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_view_zoom_out	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_view_page_source(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_view_zoom_normal(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_tools_history   (BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_view_page_source(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_tools_pdm	(BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_go_history	(EggAction *action,
+				 EphyWindow *window);
 
-void window_cmd_edit_prefs      (BonoboUIComponent *uic, 
-		      		 EphyWindow *window, 
-		      		 const char* verbname);
+void window_cmd_edit_personal_data (EggAction *action,
+				    EphyWindow *window);
 
-void 
-window_cmd_settings_toolbar_editor (BonoboUIComponent *uic, 
-				    EphyWindow *window, 
-		      		 const char* verbname);
-
-void window_cmd_help_about      (BonoboUIComponent *uic, 
-				 EphyWindow *window, 
-				 const char* verbname);
-
-void window_cmd_set_charset     (BonoboUIComponent *uic, 
-				 EncodingMenuData *data, 
-				 const char* verbname);
-
-void window_cmd_tabs_next       (BonoboUIComponent *uic, 
-				 EphyWindow *window, 
-				 const char* verbname);
-
-void window_cmd_tabs_previous   (BonoboUIComponent *uic, 
-				 EphyWindow *window, 
-				 const char* verbname);
-
-void window_cmd_tabs_move_left  (BonoboUIComponent *uic, 
-				 EphyWindow *window, 
-				 const char* verbname);
-
-void window_cmd_tabs_move_right (BonoboUIComponent *uic, 
-				 EphyWindow *window, 
-				 const char* verbname);
-
-void window_cmd_tabs_detach     (BonoboUIComponent *uic, 
-				 EphyWindow *window, 
-				 const char* verbname);
-
-void window_cmd_help_manual     (BonoboUIComponent *uic, 
-			         char *filename, 
-			         const char* verbname);
+void window_cmd_edit_prefs      (EggAction *action,
+				 EphyWindow *window);
+
+void window_cmd_edit_toolbar	(EggAction *action,
+				 EphyWindow *window);
+
+void window_cmd_help_about      (EggAction *action,
+				 EphyWindow *window);
+
+void window_cmd_tabs_next       (EggAction *action,
+				 EphyWindow *window);
+
+void window_cmd_tabs_previous   (EggAction *action,
+				 EphyWindow *window);
+
+void window_cmd_tabs_move_left  (EggAction *action,
+				 EphyWindow *window);
+
+void window_cmd_tabs_move_right (EggAction *action,
+				 EphyWindow *window);
+
+void window_cmd_tabs_detach     (EggAction *action,
+				 EphyWindow *window);