Renamed to get_command_state to can_do_command.

2003-11-05  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-command-manager.c:
	(ephy_command_manager_can_do_command):
	* embed/ephy-command-manager.h:
	* embed/mozilla/mozilla-embed.cpp:
	* src/ephy-window.c: (edit_menu_show_cb):

	Renamed to get_command_state to can_do_command.

5 files changed, 27 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index df84cf659..2cb68c960 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-05  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/ephy-command-manager.c:
+	(ephy_command_manager_can_do_command):
+	* embed/ephy-command-manager.h:
+	* embed/mozilla/mozilla-embed.cpp:
+	* src/ephy-window.c: (edit_menu_show_cb):
+
+	Renamed to get_command_state to can_do_command.
+
 2003-11-05  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* embed/ephy-embed-prefs.h:
diff --git a/embed/ephy-command-manager.c b/embed/ephy-command-manager.c
index d71017446..68ca46510 100644
--- a/embed/ephy-command-manager.c
+++ b/embed/ephy-command-manager.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti
+ *  Copyright (C) 2000-2003 Marco Pesenti Gritti
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "ephy-command-manager.h"
@@ -88,9 +88,9 @@ ephy_command_manager_do_command (EphyCommandManager *manager,
 }
 
 gboolean
-ephy_command_manager_get_command_state (EphyCommandManager *manager,
+ephy_command_manager_can_do_command (EphyCommandManager *manager,
 				        const char *command)
 {
 	EphyCommandManagerClass *klass = EPHY_COMMAND_MANAGER_GET_CLASS (manager);
-        return klass->get_command_state (manager, command);
+        return klass->can_do_command (manager, command);
 }
diff --git a/embed/ephy-command-manager.h b/embed/ephy-command-manager.h
index c8eaf0514..c0dabc3c0 100644
--- a/embed/ephy-command-manager.h
+++ b/embed/ephy-command-manager.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti
+ *  Copyright (C) 2000-2003 Marco Pesenti Gritti
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifndef EPHY_COMMAND_MANAGER_H
@@ -40,7 +42,7 @@ struct EphyCommandManagerClass
 
 	void		(* do_command)		(EphyCommandManager *manager,
 						 const char *command);
-	gboolean	(* get_command_state)	(EphyCommandManager *manager,
+	gboolean	(* can_do_command)	(EphyCommandManager *manager,
 						 const char *command);
 
 	/* Signals */
@@ -54,7 +56,7 @@ GType		ephy_command_manager_get_type		(void);
 void		ephy_command_manager_do_command		(EphyCommandManager *manager,
 							 const char *command);
 
-gboolean	ephy_command_manager_get_command_state	(EphyCommandManager *manager,
+gboolean	ephy_command_manager_can_do_command	(EphyCommandManager *manager,
 							 const char *command);
 
 G_END_DECLS
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 5f73cb0ea..25018af17 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -209,8 +209,8 @@ impl_manager_do_command (EphyCommandManager *manager,
 }
 
 static gboolean
-impl_manager_get_command_state (EphyCommandManager *manager,
-			        const char *command) 
+impl_manager_can_do_command (EphyCommandManager *manager,
+			     const char *command) 
 {
 	MozillaEmbedPrivate *mpriv = MOZILLA_EMBED(manager)->priv;
 	nsresult result;
@@ -225,7 +225,7 @@ static void
 ephy_command_manager_init (EphyCommandManagerClass *manager_class)
 {
 	manager_class->do_command = impl_manager_do_command;
-	manager_class->get_command_state = impl_manager_get_command_state;
+	manager_class->can_do_command = impl_manager_can_do_command;
 }
 	
 GType 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 5bf9297d4..b921ee502 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -603,15 +603,15 @@ edit_menu_show_cb (GtkWidget *menu,
 		embed = ephy_window_get_active_embed (window);
 		g_return_if_fail (embed != NULL);
 
-		can_copy = ephy_command_manager_get_command_state
+		can_copy = ephy_command_manager_can_do_command
 				(EPHY_COMMAND_MANAGER (embed), "cmd_copy");
-		can_cut = ephy_command_manager_get_command_state
+		can_cut = ephy_command_manager_can_do_command
 				(EPHY_COMMAND_MANAGER (embed), "cmd_cut");
-		can_paste = ephy_command_manager_get_command_state
+		can_paste = ephy_command_manager_can_do_command
 				(EPHY_COMMAND_MANAGER (embed), "cmd_paste");
-		can_undo = ephy_command_manager_get_command_state
+		can_undo = ephy_command_manager_can_do_command
 				(EPHY_COMMAND_MANAGER (embed), "cmd_undo");
-		can_redo = ephy_command_manager_get_command_state
+		can_redo = ephy_command_manager_can_do_command
 				(EPHY_COMMAND_MANAGER (embed), "cmd_redo");
 	}