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.

17 files changed, 254 insertions, 193 deletions

diff --git a/ChangeLog b/ChangeLog
index 81724a290..99d6bb3f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,52 @@
 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.
+
+2004-01-01  Christian Persch  <chpe@cvs.gnome.org>
+
 	* embed/ephy-embed-prefs.h:
 	* embed/mozilla/mozilla-notifiers.cpp:
 
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);
 }
diff --git a/embed/ephy-command-manager.h b/embed/ephy-command-manager.h
index c0dabc3c0..78cd5835f 100644
--- a/embed/ephy-command-manager.h
+++ b/embed/ephy-command-manager.h
@@ -28,15 +28,15 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_COMMAND_MANAGER		(ephy_command_manager_get_type ())
 #define EPHY_COMMAND_MANAGER(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManager))
-#define EPHY_COMMAND_MANAGER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerClass))
+#define EPHY_COMMAND_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerIFace))
 #define EPHY_IS_COMMAND_MANAGER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_COMMAND_MANAGER))
-#define EPHY_IS_COMMAND_MANAGER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COMMAND_MANAGER))
-#define EPHY_COMMAND_MANAGER_GET_CLASS(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerClass))
+#define EPHY_IS_COMMAND_MANAGER_IFACE(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COMMAND_MANAGER))
+#define EPHY_COMMAND_MANAGER_GET_IFACE(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerIFace))
 
-typedef struct EphyCommandManagerClass EphyCommandManagerClass;
-typedef struct _EphyCommandManager EphyCommandManager;
+typedef struct EphyCommandManager	EphyCommandManager;
+typedef struct EphyCommandManagerIFace	EphyCommandManagerIFace;
 
-struct EphyCommandManagerClass
+struct EphyCommandManagerIFace
 {
 	GTypeInterface base_iface;
 
@@ -47,8 +47,8 @@ struct EphyCommandManagerClass
 
 	/* Signals */
 
-	void	(* command_changed) (EphyCommandManager *manager,
-				     char *command);
+	void		(* command_changed)	(EphyCommandManager *manager,
+						 char *command);
 };
 
 GType		ephy_command_manager_get_type		(void);
diff --git a/embed/ephy-cookie-manager.c b/embed/ephy-cookie-manager.c
index 321384579..c3d45dfad 100644
--- a/embed/ephy-cookie-manager.c
+++ b/embed/ephy-cookie-manager.c
@@ -229,7 +229,7 @@ ephy_cookie_manager_base_init (gpointer base_iface)
 GList *
 ephy_cookie_manager_list_cookies (EphyCookieManager *manager)
 {
-	EphyCookieManagerIFace *iface = EPHY_COOKIE_MANAGER_GET_CLASS (manager);
+	EphyCookieManagerIFace *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager);
 	return iface->list (manager);
 }
 
@@ -244,7 +244,7 @@ void
 ephy_cookie_manager_remove_cookie (EphyCookieManager *manager,
 				   const EphyCookie *cookie)
 {
-	EphyCookieManagerIFace *iface = EPHY_COOKIE_MANAGER_GET_CLASS (manager);
+	EphyCookieManagerIFace *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager);
 	iface->remove (manager, cookie);
 }
 
@@ -257,6 +257,6 @@ ephy_cookie_manager_remove_cookie (EphyCookieManager *manager,
 void
 ephy_cookie_manager_clear (EphyCookieManager *manager)
 {
-	EphyCookieManagerIFace *iface = EPHY_COOKIE_MANAGER_GET_CLASS (manager);
+	EphyCookieManagerIFace *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager);
 	iface->clear (manager);
 }
diff --git a/embed/ephy-cookie-manager.h b/embed/ephy-cookie-manager.h
index c7ae0adc6..d07e85638 100644
--- a/embed/ephy-cookie-manager.h
+++ b/embed/ephy-cookie-manager.h
@@ -29,10 +29,10 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_COOKIE_MANAGER		(ephy_cookie_manager_get_type ())
 #define EPHY_COOKIE_MANAGER(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManager))
-#define EPHY_COOKIE_MANAGER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerClass))
+#define EPHY_COOKIE_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIFace))
 #define EPHY_IS_COOKIE_MANAGER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_COOKIE_MANAGER))
-#define EPHY_IS_COOKIE_MANAGER_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COOKIE_MANAGER))
-#define EPHY_COOKIE_MANAGER_GET_CLASS(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIFace))
+#define EPHY_IS_COOKIE_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COOKIE_MANAGER))
+#define EPHY_COOKIE_MANAGER_GET_IFACE(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIFace))
 
 #define EPHY_TYPE_COOKIE			(ephy_cookie_get_type ())
 
diff --git a/embed/ephy-embed-dialog.h b/embed/ephy-embed-dialog.h
index 4dc1e7c28..fdb2b89d2 100644
--- a/embed/ephy-embed-dialog.h
+++ b/embed/ephy-embed-dialog.h
@@ -37,9 +37,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_EMBED_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_DIALOG))
 #define EPHY_EMBED_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_EMBED_DIALOG, EphyEmbedDialogClass))
 
-typedef struct EphyEmbedDialogClass EphyEmbedDialogClass;
-typedef struct EphyEmbedDialog EphyEmbedDialog;
-typedef struct EphyEmbedDialogPrivate EphyEmbedDialogPrivate;
+typedef struct EphyEmbedDialogClass	EphyEmbedDialogClass;
+typedef struct EphyEmbedDialog		EphyEmbedDialog;
+typedef struct EphyEmbedDialogPrivate	EphyEmbedDialogPrivate;
 
 struct EphyEmbedDialog
 {
@@ -69,4 +69,3 @@ EphyEmbed *		ephy_embed_dialog_get_embed		(EphyEmbedDialog *dialog);
 G_END_DECLS
 
 #endif
-
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 003ea9425..28c3706ff 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "ephy-embed-shell.h"
+#include "ephy-embed-single.h"
 #include "ephy-embed-factory.h"
 #include "ephy-marshal.h"
 #include "ephy-file-helpers.h"
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index c9da4cd32..20e6a4f5d 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -25,7 +25,7 @@
 #include "ephy-embed-single.h"
 #include "ephy-marshal.h"
 
-static void ephy_embed_single_class_init (gpointer g_class);
+static void ephy_embed_single_iface_init (gpointer g_class);
 
 GType
 ephy_embed_single_get_type (void)
@@ -36,8 +36,8 @@ ephy_embed_single_get_type (void)
 	{
 		static const GTypeInfo our_info =
 		{
-			sizeof (EphyEmbedSingleClass),
-			ephy_embed_single_class_init,
+			sizeof (EphyEmbedSingleIFace),
+			ephy_embed_single_iface_init,
 			NULL,
 		};
 
@@ -51,7 +51,7 @@ ephy_embed_single_get_type (void)
 }
 
 static void
-ephy_embed_single_class_init (gpointer g_class)
+ephy_embed_single_iface_init (gpointer g_class)
 {
 	static gboolean initialised = FALSE;
 
@@ -71,7 +71,7 @@ ephy_embed_single_class_init (gpointer g_class)
 	g_signal_new ("handle_content",
 		      EPHY_TYPE_EMBED_SINGLE,
 		      G_SIGNAL_RUN_LAST,
-		      G_STRUCT_OFFSET (EphyEmbedSingleClass, handle_content),
+		      G_STRUCT_OFFSET (EphyEmbedSingleIFace, handle_content),
 		      g_signal_accumulator_true_handled, NULL,
 		      ephy_marshal_BOOLEAN__STRING_STRING,
 		      G_TYPE_BOOLEAN,
@@ -92,8 +92,8 @@ ephy_embed_single_class_init (gpointer g_class)
 void
 ephy_embed_single_clear_cache (EphyEmbedSingle *single)
 {
-	EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (single);
-	klass->clear_cache (single);
+	EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single);
+	iface->clear_cache (single);
 }
 
 /**
@@ -105,8 +105,8 @@ ephy_embed_single_clear_cache (EphyEmbedSingle *single)
 void
 ephy_embed_single_clear_auth_cache (EphyEmbedSingle *single)
 {
-	EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (single);
-	klass->clear_auth_cache (single);
+	EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single);
+	iface->clear_auth_cache (single);
 }
 
 /**
@@ -120,8 +120,8 @@ void
 ephy_embed_single_set_offline_mode (EphyEmbedSingle *single,
 				    gboolean offline)
 {
-	EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (single);
-	klass->set_offline_mode (single, offline);
+	EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single);
+	iface->set_offline_mode (single, offline);
 }
 
 /**
@@ -135,8 +135,8 @@ void
 ephy_embed_single_load_proxy_autoconf (EphyEmbedSingle *single,
 				       const char* address)
 {
-	EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (single);
-	klass->load_proxy_autoconf (single, address);
+	EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single);
+	iface->load_proxy_autoconf (single, address);
 }
 
 /**
@@ -153,6 +153,6 @@ GList *
 ephy_embed_single_get_font_list (EphyEmbedSingle *single,
 				 const char *langGroup)
 {
-	EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (single);
-	return klass->get_font_list (single, langGroup);
+	EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single);
+	return iface->get_font_list (single, langGroup);
 }
diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index 89c80f3bb..e5457aa5a 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -28,15 +28,15 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_EMBED_SINGLE		(ephy_embed_single_get_type ())
 #define EPHY_EMBED_SINGLE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingle))
-#define EPHY_EMBED_SINGLE_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleClass))
+#define EPHY_EMBED_SINGLE_IFACE(k)	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIFace))
 #define EPHY_IS_EMBED_SINGLE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED_SINGLE))
-#define EPHY_IS_EMBED_SINGLE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_SINGLE))
-#define EPHY_EMBED_SINGLE_GET_CLASS(i)	(G_TYPE_INSTANCE_GET_INTERFACE ((i), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleClass))
+#define EPHY_IS_EMBED_SINGLE_IFACE(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_SINGLE))
+#define EPHY_EMBED_SINGLE_GET_IFACE(i)	(G_TYPE_INSTANCE_GET_INTERFACE ((i), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIFace))
 
-typedef struct EphyEmbedSingleClass	EphyEmbedSingleClass;
 typedef struct EphyEmbedSingle		EphyEmbedSingle;
+typedef struct EphyEmbedSingleIFace	EphyEmbedSingleIFace;
 
-struct EphyEmbedSingleClass
+struct EphyEmbedSingleIFace
 {
 	GTypeInterface base_iface;
 
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 9bf7ef1d2..3c51638ae 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -28,7 +28,7 @@
 #include "mozilla-embed-single.h"
 #include "mozilla-embed.h"
 
-static void ephy_embed_base_init (gpointer base_class);
+static void ephy_embed_base_init (gpointer g_class);
 
 GType
 ephy_embed_get_type (void)
@@ -39,7 +39,7 @@ ephy_embed_get_type (void)
 	{
 		static const GTypeInfo our_info =
 		{
-			sizeof (EphyEmbedClass),
+			sizeof (EphyEmbedIFace),
 			ephy_embed_base_init,
 			NULL,
 		};
@@ -63,7 +63,7 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_new_window",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, new_window),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, new_window),
 			      NULL, NULL,
 			      ephy_marshal_VOID__POINTER_INT,
 			      G_TYPE_NONE,
@@ -73,7 +73,7 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_context_menu",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, context_menu),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, context_menu),
 			      g_signal_accumulator_true_handled, NULL,
 			      ephy_marshal_BOOLEAN__OBJECT,
 			      G_TYPE_BOOLEAN,
@@ -82,7 +82,7 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_favicon",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, favicon),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, favicon),
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__STRING,
 			      G_TYPE_NONE,
@@ -91,7 +91,7 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_location",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, location),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, location),
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__STRING,
 			      G_TYPE_NONE,
@@ -100,7 +100,7 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_net_state",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, net_state),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, net_state),
 			      NULL, NULL,
 			      ephy_marshal_VOID__STRING_INT,
 			      G_TYPE_NONE,
@@ -110,7 +110,7 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_dom_mouse_click",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, dom_mouse_click),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, dom_mouse_click),
 			      g_signal_accumulator_true_handled, NULL,
 			      ephy_marshal_BOOLEAN__OBJECT,
 			      G_TYPE_BOOLEAN,
@@ -119,7 +119,7 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_dom_mouse_down",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, dom_mouse_down),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, dom_mouse_down),
 			      g_signal_accumulator_true_handled, NULL,
 			      ephy_marshal_BOOLEAN__OBJECT,
 			      G_TYPE_BOOLEAN,
@@ -128,7 +128,7 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_popup_blocked",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, popup_blocked),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, popup_blocked),
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE,
@@ -136,7 +136,7 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_security_change",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, security_change),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, security_change),
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE,
@@ -145,12 +145,13 @@ ephy_embed_base_init (gpointer g_class)
 		g_signal_new ("ge_zoom_change",
 			      EPHY_TYPE_EMBED,
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EphyEmbedClass, zoom_change),
+			      G_STRUCT_OFFSET (EphyEmbedIFace, zoom_change),
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__FLOAT,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_FLOAT);
+
 		initialized = TRUE;
 	}
 }
@@ -159,102 +160,102 @@ void
 ephy_embed_load_url (EphyEmbed *embed,
 		     const char *url)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->load_url (embed, url);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->load_url (embed, url);
 }
 
 void
 ephy_embed_stop_load (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->stop_load (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->stop_load (embed);
 }
 
 gboolean
 ephy_embed_can_go_back (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->can_go_back (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->can_go_back (embed);
 }
 
 gboolean
 ephy_embed_can_go_forward (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->can_go_forward (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->can_go_forward (embed);
 }
 
 gboolean
 ephy_embed_can_go_up (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->can_go_up (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->can_go_up (embed);
 }
 
 GSList *
 ephy_embed_get_go_up_list (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->get_go_up_list (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->get_go_up_list (embed);
 }
 
 void
 ephy_embed_go_back (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->go_back (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->go_back (embed);
 }
 
 void
 ephy_embed_go_forward (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->go_forward (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->go_forward (embed);
 }
 
 void
 ephy_embed_go_up (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->go_up (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->go_up (embed);
 }
 
 
 char *
 ephy_embed_get_title (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->get_title (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->get_title (embed);
 }
 
 char *
 ephy_embed_get_location (EphyEmbed *embed,
 			 gboolean toplevel)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->get_location (embed, toplevel);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->get_location (embed, toplevel);
 }
 
 char *
 ephy_embed_get_link_message (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->get_link_message (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->get_link_message (embed);
 }
 
 char *
 ephy_embed_get_js_status (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->get_js_status (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->get_js_status (embed);
 }
 
 void
 ephy_embed_reload (EphyEmbed *embed,
 		   EmbedReloadFlags flags)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->reload (embed, flags);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->reload (embed, flags);
 }
 
 void
@@ -262,22 +263,22 @@ ephy_embed_zoom_set (EphyEmbed *embed,
 		     float zoom,
 		     gboolean reflow)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->zoom_set (embed, zoom, reflow);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->zoom_set (embed, zoom, reflow);
 }
 
 float
 ephy_embed_zoom_get (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->zoom_get (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->zoom_get (embed);
 }
 
 int
 ephy_embed_shistory_n_items  (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->shistory_n_items (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->shistory_n_items (embed);
 }
 
 void
@@ -287,23 +288,23 @@ ephy_embed_shistory_get_nth (EphyEmbed *embed,
 			     char **url,
 			     char **title)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->shistory_get_nth (embed, nth, is_relative, url, title);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->shistory_get_nth (embed, nth, is_relative, url, title);
 }
 
 int
 ephy_embed_shistory_get_pos (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->shistory_get_pos (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->shistory_get_pos (embed);
 }
 
 void
 ephy_embed_shistory_go_nth (EphyEmbed *embed,
 			    int nth)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->shistory_go_nth (embed, nth);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->shistory_go_nth (embed, nth);
 }
 
 void
@@ -311,8 +312,8 @@ ephy_embed_get_security_level (EphyEmbed *embed,
 			       EmbedSecurityLevel *level,
 			       char **description)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->get_security_level (embed, level, description);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->get_security_level (embed, level, description);
 }
 
 void
@@ -321,60 +322,60 @@ ephy_embed_find_set_properties  (EphyEmbed *embed,
 				 gboolean case_sensitive,
 				 gboolean match_word)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->find_set_properties (embed, search_string, case_sensitive, match_word);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->find_set_properties (embed, search_string, case_sensitive, match_word);
 }
 
 gboolean
 ephy_embed_find_next (EphyEmbed *embed,
 		      gboolean backwards)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->find_next (embed, backwards);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->find_next (embed, backwards);
 }
 
 void
 ephy_embed_activate (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->activate (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->activate (embed);
 }
 
 void
 ephy_embed_set_encoding (EphyEmbed *embed,
 			 const char *encoding)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->set_encoding (embed, encoding);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->set_encoding (embed, encoding);
 }
 
 EphyEncodingInfo *
 ephy_embed_get_encoding_info (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->get_encoding_info (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->get_encoding_info (embed);
 }
 
 void
 ephy_embed_print (EphyEmbed *embed,
 		  EmbedPrintInfo *info)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->print (embed, info);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->print (embed, info);
 }
 
 void
 ephy_embed_print_preview_close (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	klass->print_preview_close (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	iface->print_preview_close (embed);
 }
 
 int
 ephy_embed_print_preview_n_pages (EphyEmbed *embed)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->print_preview_n_pages (embed);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->print_preview_n_pages (embed);
 }
 
 void
@@ -382,6 +383,6 @@ ephy_embed_print_preview_navigate (EphyEmbed *embed,
 				   EmbedPrintPreviewNavType type,
 				   int page)
 {
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->print_preview_navigate (embed, type, page);
+	EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed);
+	return iface->print_preview_navigate (embed, type, page);
 }
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 0dc4a655b..f047b4e4d 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -32,13 +32,13 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_EMBED			(ephy_embed_get_type ())
 #define EPHY_EMBED(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED, EphyEmbed))
-#define EPHY_EMBED_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED, EphyEmbedClass))
+#define EPHY_EMBED_IFACE(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED, EphyEmbedIFace))
 #define EPHY_IS_EMBED(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED))
-#define EPHY_IS_EMBED_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED))
-#define EPHY_EMBED_GET_CLASS(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED, EphyEmbedClass))
+#define EPHY_IS_EMBED_IFACE(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED))
+#define EPHY_EMBED_GET_IFACE(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED, EphyEmbedIFace))
 
-typedef struct EphyEmbedClass	EphyEmbedClass;
-typedef struct _EphyEmbed	EphyEmbed;
+typedef struct EphyEmbed	EphyEmbed;
+typedef struct EphyEmbedIFace	EphyEmbedIFace;
 
 typedef enum
 {
@@ -136,7 +136,7 @@ typedef enum
 	STATE_IS_SECURE_HIGH
 } EmbedSecurityLevel;
 
-struct EphyEmbedClass
+struct EphyEmbedIFace
 {
 	GTypeInterface base_iface;
 
diff --git a/embed/ephy-password-manager.h b/embed/ephy-password-manager.h
index d8ff42943..5cb141f0f 100644
--- a/embed/ephy-password-manager.h
+++ b/embed/ephy-password-manager.h
@@ -29,9 +29,9 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_PASSWORD_MANAGER		(ephy_password_manager_get_type ())
 #define EPHY_PASSWORD_MANAGER(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManager))
-#define EPHY_PASSWORD_MANAGER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerClass))
+#define EPHY_PASSWORD_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIFace))
 #define EPHY_IS_PASSWORD_MANAGER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PASSWORD_MANAGER))
-#define EPHY_IS_PASSWORD_MANAGER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PASSWORD_MANAGER))
+#define EPHY_IS_PASSWORD_MANAGER_IFACE(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PASSWORD_MANAGER))
 #define EPHY_PASSWORD_MANAGER_GET_IFACE(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIFace))
 
 #define EPHY_TYPE_PASSWORD_INFO			(ephy_password_info_get_type ())
diff --git a/embed/ephy-permission-manager.h b/embed/ephy-permission-manager.h
index d049f3fd4..40f9e295c 100644
--- a/embed/ephy-permission-manager.h
+++ b/embed/ephy-permission-manager.h
@@ -29,9 +29,9 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_PERMISSION_MANAGER		(ephy_permission_manager_get_type ())
 #define EPHY_PERMISSION_MANAGER(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManager))
-#define EPHY_PERMISSION_MANAGER_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManagerClass))
+#define EPHY_PERMISSION_MANAGER_IFACE(k)	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManagerIFace))
 #define EPHY_IS_PERMISSION_MANAGER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PERMISSION_MANAGER))
-#define EPHY_IS_PERMISSION_MANAGER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PERMISSION_MANAGER))
+#define EPHY_IS_PERMISSION_MANAGER_IFACE(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PERMISSION_MANAGER))
 #define EPHY_PERMISSION_MANAGER_GET_IFACE(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManagerIFace))
 
 #define EPHY_TYPE_PERMISSION_INFO		(ephy_permission_info_get_type ())
diff --git a/embed/mozilla/PrintingPromptService.cpp b/embed/mozilla/PrintingPromptService.cpp
index 3a2bd63ae..1da92c113 100644
--- a/embed/mozilla/PrintingPromptService.cpp
+++ b/embed/mozilla/PrintingPromptService.cpp
@@ -97,7 +97,21 @@ NS_IMETHODIMP GPrintingPromptService::ShowProgress(nsIDOMWindow *parent, nsIWebB
 NS_IMETHODIMP GPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings, 
 						    nsIObserver *printObserver)
 {
-    return NS_ERROR_NOT_IMPLEMENTED;
+	EphyDialog *dialog;
+	nsresult rv = NS_ERROR_ABORT;
+
+	dialog = ephy_print_setup_dialog_new ();
+	ephy_dialog_set_modal (dialog, TRUE);
+
+	int ret = ephy_dialog_run (dialog);
+	if (ret == GTK_RESPONSE_OK)
+	{
+		rv = NS_OK;
+	}
+
+	g_object_unref (dialog);
+
+	return rv;
 }
 
 /* void showPrinterProperties (in nsIDOMWindow parent, in wstring printerName, in nsIPrintSettings printSettings); */
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 84ace349d..0f13254d6 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -99,7 +99,7 @@ struct MozillaEmbedSinglePrivate
 };
 
 static void mozilla_embed_single_class_init	(MozillaEmbedSingleClass *klass);
-static void ephy_embed_single_iface_init	(EphyEmbedSingleClass *iface);
+static void ephy_embed_single_iface_init	(EphyEmbedSingleIFace *iface);
 static void ephy_cookie_manager_iface_init	(EphyCookieManagerIFace *iface);
 static void ephy_password_manager_iface_init	(EphyPasswordManagerIFace *iface);
 static void ephy_permission_manager_iface_init	(EphyPermissionManagerIFace *iface);
@@ -897,11 +897,11 @@ mozilla_embed_single_class_init (MozillaEmbedSingleClass *klass)
 
 	object_class->finalize = mozilla_embed_single_finalize;
 
-	g_type_class_add_private (object_class, sizeof(MozillaEmbedSinglePrivate));
+	g_type_class_add_private (object_class, sizeof (MozillaEmbedSinglePrivate));
 }
 
 static void
-ephy_embed_single_iface_init (EphyEmbedSingleClass *iface)
+ephy_embed_single_iface_init (EphyEmbedSingleIFace *iface)
 {
 	iface->clear_cache = impl_clear_cache;
 	iface->clear_auth_cache = impl_clear_auth_cache;
diff --git a/embed/mozilla/mozilla-embed-single.h b/embed/mozilla/mozilla-embed-single.h
index 3e47febeb..f8af8fba9 100644
--- a/embed/mozilla/mozilla-embed-single.h
+++ b/embed/mozilla/mozilla-embed-single.h
@@ -22,8 +22,6 @@
 #ifndef MOZILLA_EMBED_SINGLE_H
 #define MOZILLA_EMBED_SINGLE_H
 
-#include "ephy-embed-single.h"
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS
@@ -52,7 +50,7 @@ struct MozillaEmbedSingleClass
 	GObjectClass parent_class;
 };
 
-GType             mozilla_embed_single_get_type	     (void);
+GType	mozilla_embed_single_get_type	(void);
 
 G_END_DECLS
 
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 297b64747..f333c8768 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -44,7 +44,7 @@
 static void	mozilla_embed_class_init	(MozillaEmbedClass *klass);
 static void	mozilla_embed_init		(MozillaEmbed *gs);
 static void	mozilla_embed_destroy		(GtkObject *object);
-static void	ephy_embed_init			(EphyEmbedClass *embed_class);
+static void	ephy_embed_iface_init		(EphyEmbedIFace *iface);
 
 static void 
 mozilla_embed_connect_signals (MozillaEmbed *membed);
@@ -143,10 +143,10 @@ impl_manager_can_do_command (EphyCommandManager *manager,
 }
 
 static void
-ephy_command_manager_init (EphyCommandManagerClass *manager_class)
+ephy_command_manager_iface_init (EphyCommandManagerIFace *iface)
 {
-	manager_class->do_command = impl_manager_do_command;
-	manager_class->can_do_command = impl_manager_can_do_command;
+	iface->do_command = impl_manager_do_command;
+	iface->can_do_command = impl_manager_can_do_command;
 }
 	
 GType 
@@ -171,14 +171,14 @@ mozilla_embed_get_type (void)
 
 		static const GInterfaceInfo embed_info =
 		{
-			(GInterfaceInitFunc) ephy_embed_init,
+			(GInterfaceInitFunc) ephy_embed_iface_init,
         		NULL,
         		NULL
      		};
 
 		static const GInterfaceInfo ephy_command_manager_info =
 		{
-			(GInterfaceInitFunc) ephy_command_manager_init,
+			(GInterfaceInitFunc) ephy_command_manager_iface_init,
         		NULL,
         		NULL
      		 };
@@ -1089,38 +1089,38 @@ mozilla_embed_security_level (MozillaEmbed *membed)
 }
 
 static void
-ephy_embed_init (EphyEmbedClass *embed_class)
+ephy_embed_iface_init (EphyEmbedIFace *iface)
 {
-	embed_class->load_url = impl_load_url; 
-	embed_class->stop_load = impl_stop_load;
-	embed_class->can_go_back = impl_can_go_back;
-	embed_class->can_go_forward =impl_can_go_forward;
-	embed_class->can_go_up = impl_can_go_up;
-	embed_class->get_go_up_list = impl_get_go_up_list;
-	embed_class->go_back = impl_go_back;
-	embed_class->go_forward = impl_go_forward;
-	embed_class->go_up = impl_go_up;
-	embed_class->get_title = impl_get_title;
-	embed_class->get_location = impl_get_location;
-	embed_class->get_link_message = impl_get_link_message;
-	embed_class->get_js_status = impl_get_js_status;
-	embed_class->reload = impl_reload;
-	embed_class->zoom_set = impl_zoom_set;
-	embed_class->zoom_get = impl_zoom_get;
-	embed_class->shistory_n_items = impl_shistory_n_items;
-	embed_class->shistory_get_nth = impl_shistory_get_nth;
-	embed_class->shistory_get_pos = impl_shistory_get_pos;
-	embed_class->shistory_go_nth = impl_shistory_go_nth;
-	embed_class->get_security_level = impl_get_security_level;
-	embed_class->find_next = impl_find_next;
-	embed_class->activate = impl_activate;
-	embed_class->find_set_properties = impl_find_set_properties;
-	embed_class->set_encoding = impl_set_encoding;
-	embed_class->get_encoding_info = impl_get_encoding_info;
-	embed_class->print = impl_print;
-	embed_class->print_preview_close = impl_print_preview_close;
-	embed_class->print_preview_n_pages = impl_print_preview_n_pages;
-	embed_class->print_preview_navigate = impl_print_preview_navigate;
+	iface->load_url = impl_load_url; 
+	iface->stop_load = impl_stop_load;
+	iface->can_go_back = impl_can_go_back;
+	iface->can_go_forward =impl_can_go_forward;
+	iface->can_go_up = impl_can_go_up;
+	iface->get_go_up_list = impl_get_go_up_list;
+	iface->go_back = impl_go_back;
+	iface->go_forward = impl_go_forward;
+	iface->go_up = impl_go_up;
+	iface->get_title = impl_get_title;
+	iface->get_location = impl_get_location;
+	iface->get_link_message = impl_get_link_message;
+	iface->get_js_status = impl_get_js_status;
+	iface->reload = impl_reload;
+	iface->zoom_set = impl_zoom_set;
+	iface->zoom_get = impl_zoom_get;
+	iface->shistory_n_items = impl_shistory_n_items;
+	iface->shistory_get_nth = impl_shistory_get_nth;
+	iface->shistory_get_pos = impl_shistory_get_pos;
+	iface->shistory_go_nth = impl_shistory_go_nth;
+	iface->get_security_level = impl_get_security_level;
+	iface->find_next = impl_find_next;
+	iface->activate = impl_activate;
+	iface->find_set_properties = impl_find_set_properties;
+	iface->set_encoding = impl_set_encoding;
+	iface->get_encoding_info = impl_get_encoding_info;
+	iface->print = impl_print;
+	iface->print_preview_close = impl_print_preview_close;
+	iface->print_preview_n_pages = impl_print_preview_n_pages;
+	iface->print_preview_navigate = impl_print_preview_navigate;
 }
 
 void