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.

4 files changed, 56 insertions, 44 deletions

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