Unify interface struct and type macro naming to be EphyFooIFace,

2004-01-01  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-command-manager.c: (ephy_command_manager_get_type),
	(ephy_command_manager_base_init),
	(ephy_command_manager_do_command),
	(ephy_command_manager_can_do_command):
	* embed/ephy-command-manager.h:
	* embed/ephy-cookie-manager.c: (ephy_cookie_manager_list_cookies),
	(ephy_cookie_manager_remove_cookie), (ephy_cookie_manager_clear):
	* embed/ephy-cookie-manager.h:
	* embed/ephy-embed-dialog.h:
	* embed/ephy-embed-shell.c:
	* embed/ephy-embed-single.c: (ephy_embed_single_get_type),
	(ephy_embed_single_iface_init), (ephy_embed_single_clear_cache),
	(ephy_embed_single_clear_auth_cache),
	(ephy_embed_single_set_offline_mode),
	(ephy_embed_single_load_proxy_autoconf),
	(ephy_embed_single_get_font_list):
	* embed/ephy-embed-single.h:
	* embed/ephy-embed.c: (ephy_embed_get_type),
	(ephy_embed_base_init), (ephy_embed_load_url),
	(ephy_embed_stop_load), (ephy_embed_can_go_back),
	(ephy_embed_can_go_forward), (ephy_embed_can_go_up),
	(ephy_embed_get_go_up_list), (ephy_embed_go_back),
	(ephy_embed_go_forward), (ephy_embed_go_up),
	(ephy_embed_get_title), (ephy_embed_get_location),
	(ephy_embed_get_link_message), (ephy_embed_get_js_status),
	(ephy_embed_reload), (ephy_embed_zoom_set), (ephy_embed_zoom_get),
	(ephy_embed_shistory_n_items), (ephy_embed_shistory_get_nth),
	(ephy_embed_shistory_get_pos), (ephy_embed_shistory_go_nth),
	(ephy_embed_get_security_level), (ephy_embed_find_set_properties),
	(ephy_embed_find_next), (ephy_embed_activate),
	(ephy_embed_set_encoding), (ephy_embed_get_encoding_info),
	(ephy_embed_print), (ephy_embed_print_preview_close),
	(ephy_embed_print_preview_n_pages),
	(ephy_embed_print_preview_navigate):
	* embed/ephy-embed.h:
	* embed/ephy-password-manager.h:
	* embed/ephy-permission-manager.h:
	* embed/mozilla/PrintingPromptService.cpp:
	* embed/mozilla/mozilla-embed-single.cpp:
	* embed/mozilla/mozilla-embed-single.h:
	* embed/mozilla/mozilla-embed.cpp:

	Unify interface struct and type macro naming to be EphyFooIFace,
	EPHY_FOO_IFACE, EPHY_IS_FOO_IFACE, EPHY_FOO_GET_IFACE.

1 files changed, 30 insertions, 29 deletions

diff --git a/embed/ephy-command-manager.c b/embed/ephy-command-manager.c
index b92726a77..9a248e87e 100644
--- a/embed/ephy-command-manager.c
+++ b/embed/ephy-command-manager.c
@@ -25,29 +25,29 @@
 #include "ephy-command-manager.h"
 
 static void
-ephy_command_manager_base_init (gpointer base_class);
+ephy_command_manager_base_init (gpointer g_class);
 
 GType
 ephy_command_manager_get_type (void)
 {
-        static GType ephy_command_manager_type = 0;
+	static GType type = 0;
 
-        if (ephy_command_manager_type == 0)
-        {
-                static const GTypeInfo our_info =
-                {
-                        sizeof (EphyCommandManagerClass),
-                        ephy_command_manager_base_init,
-                        NULL,
-                };
+	if (type == 0)
+	{
+		static const GTypeInfo our_info =
+		{
+			sizeof (EphyCommandManagerIFace),
+			ephy_command_manager_base_init,
+			NULL,
+		};
 
-                ephy_command_manager_type = g_type_register_static (G_TYPE_INTERFACE,
-							  "EphyCommandManager",
-							  &our_info,
-							  (GTypeFlags)0);
-        }
+		type = g_type_register_static (G_TYPE_INTERFACE,
+					       "EphyCommandManager",
+					       &our_info,
+					       (GTypeFlags)0);
+	}
 
-        return ephy_command_manager_type;
+	return type;
 }
 
 static void
@@ -57,15 +57,16 @@ ephy_command_manager_base_init (gpointer g_class)
 
 	if (!initialized)
 	{
-                g_signal_new ("command_changed",
-                              EPHY_TYPE_COMMAND_MANAGER,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyCommandManagerClass, command_changed),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__STRING,
+		g_signal_new ("command_changed",
+			      EPHY_TYPE_COMMAND_MANAGER,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyCommandManagerIFace, command_changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__STRING,
 			      G_TYPE_NONE,
-                              1,
-                              G_TYPE_STRING);
+			      1,
+			      G_TYPE_STRING);
+
 		initialized = TRUE;
 	}
 }
@@ -74,14 +75,14 @@ void
 ephy_command_manager_do_command (EphyCommandManager *manager,
 				 const char *command)
 {
-	EphyCommandManagerClass *klass = EPHY_COMMAND_MANAGER_GET_CLASS (manager);
-        klass->do_command (manager, command);
+	EphyCommandManagerIFace *iface = EPHY_COMMAND_MANAGER_GET_IFACE (manager);
+	iface->do_command (manager, command);
 }
 
 gboolean
 ephy_command_manager_can_do_command (EphyCommandManager *manager,
-				        const char *command)
+					const char *command)
 {
-	EphyCommandManagerClass *klass = EPHY_COMMAND_MANAGER_GET_CLASS (manager);
-        return klass->can_do_command (manager, command);
+	EphyCommandManagerIFace *iface = EPHY_COMMAND_MANAGER_GET_IFACE (manager);
+	return iface->can_do_command (manager, command);
 }