Ensure that flags and enums start with 'Ephy'

2005-01-03  Crispin Flowerday  <gnome@flowerday.cx>

	* embed/ephy-embed-event.c:
	* embed/ephy-embed-event.h:
	* embed/ephy-embed-persist.c: (ephy_embed_persist_set_flags):
	* embed/ephy-embed-persist.h:
	* embed/ephy-embed.c: (ephy_embed_base_init),
	(ephy_embed_get_security_level),
	(ephy_embed_print_preview_navigate):
	* embed/ephy-embed.h:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyBrowser.h:
	* embed/mozilla/EphyHeaderSniffer.cpp:
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/mozilla-embed-event.cpp:
	* embed/mozilla/mozilla-embed-persist.cpp:
	* embed/mozilla/mozilla-embed.cpp:
	* src/ephy-tab.c: (ephy_tab_address_expire_get_type),
	(ephy_tab_navigation_flags_get_type), (ephy_tab_document_type_cb),
	(update_net_state_message), (build_progress_from_requests),
	(ephy_tab_net_state_cb), (ephy_tab_dom_mouse_click_cb),
	(ephy_tab_security_change_cb), (ephy_tab_update_navigation_flags),
	(ephy_tab_set_location), (ephy_tab_set_security_level):
	* src/ephy-tab.h:
	* src/ephy-window.c: (sync_tab_document_type),
	(sync_tab_navigation), (sync_tab_security), (sync_tab_zoom),
	(update_popups_tooltips), (show_embed_popup),
	(ephy_window_class_init):
	* src/popup-commands.c: (popup_cmd_copy_link_address):

	Ensure that flags and enums start with 'Ephy'

18 files changed, 118 insertions, 86 deletions

diff --git a/ChangeLog b/ChangeLog
index 409705e5e..0b89bd98e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2005-01-03  Crispin Flowerday  <gnome@flowerday.cx>
+
+	* embed/ephy-embed-event.c:
+	* embed/ephy-embed-event.h:
+	* embed/ephy-embed-persist.c: (ephy_embed_persist_set_flags):
+	* embed/ephy-embed-persist.h:
+	* embed/ephy-embed.c: (ephy_embed_base_init),
+	(ephy_embed_get_security_level),
+	(ephy_embed_print_preview_navigate):
+	* embed/ephy-embed.h:
+	* embed/mozilla/EphyBrowser.cpp:
+	* embed/mozilla/EphyBrowser.h:
+	* embed/mozilla/EphyHeaderSniffer.cpp:
+	* embed/mozilla/MozDownload.cpp:
+	* embed/mozilla/mozilla-embed-event.cpp:
+	* embed/mozilla/mozilla-embed-persist.cpp:
+	* embed/mozilla/mozilla-embed.cpp:
+	* src/ephy-tab.c: (ephy_tab_address_expire_get_type),
+	(ephy_tab_navigation_flags_get_type), (ephy_tab_document_type_cb),
+	(update_net_state_message), (build_progress_from_requests),
+	(ephy_tab_net_state_cb), (ephy_tab_dom_mouse_click_cb),
+	(ephy_tab_security_change_cb), (ephy_tab_update_navigation_flags),
+	(ephy_tab_set_location), (ephy_tab_set_security_level):
+	* src/ephy-tab.h:
+	* src/ephy-window.c: (sync_tab_document_type),
+	(sync_tab_navigation), (sync_tab_security), (sync_tab_zoom),
+	(update_popups_tooltips), (show_embed_popup),
+	(ephy_window_class_init):
+	* src/popup-commands.c: (popup_cmd_copy_link_address):
+
+	Ensure that flags and enums start with 'Ephy'
+	
 2005-01-03  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/ephy-tab.c: (ephy_tab_get_property), (ephy_tab_class_init):
diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c
index a0ea523ea..aba3af6c0 100644
--- a/embed/ephy-embed-event.c
+++ b/embed/ephy-embed-event.c
@@ -113,7 +113,7 @@ ephy_embed_event_get_event_type (EphyEmbedEvent *event)
 	return iface->get_type (event);
 }
 
-EmbedEventContext
+EphyEmbedEventContext
 ephy_embed_event_get_context (EphyEmbedEvent *event)
 {
 	EphyEmbedEventIface *iface = EPHY_EMBED_EVENT_GET_IFACE (event);
diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h
index f3e342baf..19e9a770d 100644
--- a/embed/ephy-embed-event.h
+++ b/embed/ephy-embed-event.h
@@ -50,7 +50,7 @@ typedef enum
         EMBED_CONTEXT_INPUT    = 1 << 5,
         EMBED_CONTEXT_XUL      = 1 << 7,
 	EMBED_CONTEXT_EMAIL_LINK = 1 << 8
-} EmbedEventContext;
+} EphyEmbedEventContext;
 
 typedef enum
 {
@@ -66,7 +66,7 @@ struct _EphyEmbedEventIface
 
 	/* Methods */
 	EphyEmbedEventType	(* get_type)		(EphyEmbedEvent *event);
-	EmbedEventContext	(* get_context)		(EphyEmbedEvent *event);
+	EphyEmbedEventContext	(* get_context)		(EphyEmbedEvent *event);
 	guint			(* get_modifier)	(EphyEmbedEvent *event);
 	void			(* get_coordinates)	(EphyEmbedEvent *event,
 							 guint *x,
@@ -87,7 +87,7 @@ GType			ephy_embed_event_type_get_type 		(void);
 
 EphyEmbedEventType	ephy_embed_event_get_event_type	(EphyEmbedEvent *event);
 
-EmbedEventContext	ephy_embed_event_get_context	(EphyEmbedEvent *event);
+EphyEmbedEventContext	ephy_embed_event_get_context	(EphyEmbedEvent *event);
 
 guint			ephy_embed_event_get_modifier	(EphyEmbedEvent *event);
 
diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c
index 27f48026d..baa6a781c 100644
--- a/embed/ephy-embed-persist.c
+++ b/embed/ephy-embed-persist.c
@@ -49,7 +49,7 @@ struct EphyEmbedPersistPrivate
 	char *persist_key;
 	EphyEmbed *embed;
 	long max_size;
-	EmbedPersistFlags flags;
+	EphyEmbedPersistFlags flags;
 	GtkWindow *fc_parent;
 };
 
@@ -110,7 +110,7 @@ ephy_embed_persist_set_dest (EphyEmbedPersist *persist,
  * Sets the #EphyEmbed from which @persist will download data.
  *
  * An #EphyEmbed is absolutely required to download if @persist's
- * #EmbedPersistFlags include %EMBED_PERSIST_COPY_PAGE. Regardless, an
+ * #EphyEmbedPersistFlags include %EMBED_PERSIST_COPY_PAGE. Regardless, an
  * #EphyEmbed should be set for <emphasis>every</emphasis> #EphyEmbedPersist,
  * since it determines request information such as the referring page.
  **/
@@ -162,13 +162,13 @@ ephy_embed_persist_set_fc_parent (EphyEmbedPersist *persist,
 /**
  * ephy_embed_persist_set_flags:
  * @persist: an #EphyEmbedPersist
- * @value: the desired #EmbedPersistFlags
+ * @value: the desired #EphyEmbedPersistFlags
  *
  * Sets the flags to be used for @persist's download.
  **/
 void
 ephy_embed_persist_set_flags (EphyEmbedPersist *persist,
-			      EmbedPersistFlags value)
+			      EphyEmbedPersistFlags value)
 {
 	g_return_if_fail (EPHY_IS_EMBED_PERSIST (persist));
 
@@ -299,11 +299,11 @@ ephy_embed_persist_get_fc_parent (EphyEmbedPersist *persist)
  * ephy_embed_persist_get_flags:
  * @persist: an #EphyEmbedPersist
  *
- * Returns @persist's #EmbedPersistFlags.
+ * Returns @persist's #EphyEmbedPersistFlags.
  *
- * Return value: @persist's #EmbedPersistFlags
+ * Return value: @persist's #EphyEmbedPersistFlags
  **/
-EmbedPersistFlags
+EphyEmbedPersistFlags
 ephy_embed_persist_get_flags (EphyEmbedPersist *persist)
 {
 	g_return_val_if_fail (EPHY_IS_EMBED_PERSIST (persist), 0);
@@ -591,7 +591,7 @@ ephy_embed_persist_cancel (EphyEmbedPersist *persist)
  *
  * Begins saving the file specified in @persist.
  *
- * If @persist's #EmbedPersistFlags include %EMBED_PERSIST_ASK_DESTINATION, a
+ * If @persist's #EphyEmbedPersistFlags include %EMBED_PERSIST_ASK_DESTINATION, a
  * filechooser dialog will be shown first.
  *
  * The file will continue to download in the background until either the
@@ -615,7 +615,7 @@ ephy_embed_persist_save (EphyEmbedPersist *persist)
  *
  * The download is synchronous. An #EphyEmbed must be specified with
  * ephy_embed_persist_set_embed(). The function implicitly assumes that
- * @persist's #EmbedPersistFlags include %EMBED_PERSIST_COPY_PAGE. If @persist's
+ * @persist's #EphyEmbedPersistFlags include %EMBED_PERSIST_COPY_PAGE. If @persist's
  * #EphyEmbed has not finished downloading, this function will only return the
  * portion of data which has already been downloaded.
  *
diff --git a/embed/ephy-embed-persist.h b/embed/ephy-embed-persist.h
index 0c0c45fde..cb312a6d2 100644
--- a/embed/ephy-embed-persist.h
+++ b/embed/ephy-embed-persist.h
@@ -49,7 +49,7 @@ typedef enum
 	EMBED_PERSIST_NO_VIEW		= 1 << 2,
 	EMBED_PERSIST_ASK_DESTINATION	= 1 << 3,
 	EMBED_PERSIST_DO_CONVERSION     = 1 << 4
-} EmbedPersistFlags;
+} EphyEmbedPersistFlags;
 
 struct _EphyEmbedPersist
 {
@@ -93,7 +93,7 @@ void			 ephy_embed_persist_set_fc_parent	(EphyEmbedPersist *persist,
 								 GtkWindow *value);
 
 void			 ephy_embed_persist_set_flags		(EphyEmbedPersist *persist,
-								 EmbedPersistFlags value);
+								 EphyEmbedPersistFlags value);
 
 void			 ephy_embed_persist_set_max_size	(EphyEmbedPersist *persist,
 								 long value);
@@ -112,7 +112,7 @@ const char 		*ephy_embed_persist_get_fc_title	(EphyEmbedPersist *persist);
 
 GtkWindow		*ephy_embed_persist_get_fc_parent	(EphyEmbedPersist *persist);
 
-EmbedPersistFlags	 ephy_embed_persist_get_flags		(EphyEmbedPersist *persist);
+EphyEmbedPersistFlags	 ephy_embed_persist_get_flags		(EphyEmbedPersist *persist);
 
 long			 ephy_embed_persist_get_max_size	(EphyEmbedPersist *persist);
 
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 4c2a2c0b4..7fccf6cc4 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -194,7 +194,7 @@ ephy_embed_base_init (gpointer g_class)
 			      ephy_marshal_OBJECT__FLAGS,
 			      G_TYPE_OBJECT,
 			      1,
-			      EPHY_TYPE_EMBED_CHROME_MASK);
+			      EPHY_TYPE_EMBED_CHROME);
 /**
  * EphyEmbed::ge-popup-blocked:
  * @embed:
@@ -326,7 +326,7 @@ ephy_embed_base_init (gpointer g_class)
 /**
  * EphyEmbed::ge-security-change:
  * @embed:
- * @level: @embed's new #EmbedSecurityLevel
+ * @level: @embed's new #EphyEmbedSecurityLevel
  *
  * The ::ge_security_change signal is emitted when the security level of @embed
  * changes. For example, this will happen when the user browses from an
@@ -770,12 +770,12 @@ ephy_embed_shistory_go_nth (EphyEmbed *embed,
  * @level: return value of security level
  * @description: return value of the description of the security level
  *
- * Fetches the #EmbedSecurityLevel and a newly-allocated string description
+ * Fetches the #EphyEmbedSecurityLevel and a newly-allocated string description
  * of the security state of @embed.
  **/
 void
 ephy_embed_get_security_level (EphyEmbed *embed,
-			       EmbedSecurityLevel *level,
+			       EphyEmbedSecurityLevel *level,
 			       char **description)
 {
 	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
@@ -945,7 +945,7 @@ ephy_embed_print_preview_n_pages (EphyEmbed *embed)
  **/
 void
 ephy_embed_print_preview_navigate (EphyEmbed *embed,
-				   EmbedPrintPreviewNavType type,
+				   EphyEmbedPrintPreviewNavType type,
 				   int page)
 {
 	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 7540999de..5bd97253c 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -37,10 +37,10 @@ G_BEGIN_DECLS
 #define EPHY_EMBED_GET_IFACE(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED, EphyEmbedIface))
 
 #define EPHY_TYPE_EMBED_NET_STATE	(ephy_embed_net_state_get_type ())
-#define EPHY_TYPE_EMBED_CHROME_MASK     (ephy_embed_chrome_get_type ())
-#define EPHY_TYPE_EMBED_PPV_NAVIGATION	(ephy_embed_ppv_navigation_get_type ())
+#define EPHY_TYPE_EMBED_CHROME          (ephy_embed_chrome_get_type ())
 #define EPHY_TYPE_EMBED_SECURITY_LEVEL	(ephy_embed_security_level_get_type ())
 #define EPHY_TYPE_EMBED_DOCUMENT_TYPE	(ephy_embed_document_type_get_type ())
+#define EPHY_TYPE_EMBED_PRINT_PREVIEW_NAV_TYPE	(ephy_embed_ppv_navigation_get_type ())
 
 typedef struct _EphyEmbed	EphyEmbed;
 typedef struct _EphyEmbedIface	EphyEmbedIface;
@@ -58,7 +58,7 @@ typedef enum
 	EMBED_STATE_IS_DOCUMENT		= 1 << 6,
 	EMBED_STATE_IS_NETWORK		= 1 << 7,
 	EMBED_STATE_IS_WINDOW		= 1 << 8
-} EmbedNetState;
+} EphyEmbedNetState;
 
 typedef enum
 {
@@ -80,7 +80,7 @@ typedef enum
 	PRINTPREVIEW_NEXT_PAGE		= 2,
 	PRINTPREVIEW_HOME		= 3,
 	PRINTPREVIEW_END		= 4
-} EmbedPrintPreviewNavType;
+} EphyEmbedPrintPreviewNavType;
 
 typedef enum
 {
@@ -90,7 +90,7 @@ typedef enum
 	STATE_IS_SECURE_LOW,
 	STATE_IS_SECURE_MED,
 	STATE_IS_SECURE_HIGH
-} EmbedSecurityLevel;
+} EphyEmbedSecurityLevel;
 
 typedef enum
 {
@@ -98,7 +98,7 @@ typedef enum
 	EMBED_DOCUMENT_XML,
 	EMBED_DOCUMENT_IMAGE,
 	EMBED_DOCUMENT_OTHER
-} EmbedDocumentType;
+} EphyEmbedDocumentType;
 
 struct _EphyEmbedIface
 {
@@ -126,7 +126,7 @@ struct _EphyEmbedIface
 					 const char *location);
 	void	 (* net_state)		(EphyEmbed *embed,
 					 const char *uri,
-					 EmbedNetState state);
+					 EphyEmbedNetState state);
 	gboolean (* dom_mouse_click)	(EphyEmbed *embed,
 					 EphyEmbedEvent *event);
 	gboolean (* dom_mouse_down)	(EphyEmbed *embed,
@@ -135,7 +135,7 @@ struct _EphyEmbedIface
 					 const char *address,
 					 const char *features);
 	void	 (* security_change)	(EphyEmbed *embed,
-					 EmbedSecurityLevel level);
+					 EphyEmbedSecurityLevel level);
 	void	 (* zoom_change)	(EphyEmbed *embed,
 					 float new_zoom);
 	void	 (* content_change)	(EphyEmbed *embed,
@@ -143,7 +143,7 @@ struct _EphyEmbedIface
 	gboolean (* modal_alert)	(EphyEmbed *embed);
 	void	 (* modal_alert_closed)	(EphyEmbed *embed);
 	void	 (* document_type)	(EphyEmbed *embed,
-					 EmbedDocumentType type);
+					 EphyEmbedDocumentType type);
 	EphyEmbed * (* new_window)	(EphyEmbed *embed,
 					 EphyEmbedChrome chromemask);
 
@@ -176,7 +176,7 @@ struct _EphyEmbedIface
 	void		   (* shistory_go_nth)		(EphyEmbed *embed,
 							 int nth);
 	void		   (* get_security_level)	(EphyEmbed *embed,
-						  	 EmbedSecurityLevel *level,
+						  	 EphyEmbedSecurityLevel *level,
 						  	 char **description);
 	void		   (* show_page_certificate)	(EphyEmbed *embed);
 	void		   (* set_zoom)			(EphyEmbed *embed,
@@ -197,7 +197,7 @@ struct _EphyEmbedIface
 							 gboolean mode);
 	int		   (* print_preview_n_pages)	(EphyEmbed *embed);
 	void		   (* print_preview_navigate)	(EphyEmbed *embed,
-							 EmbedPrintPreviewNavType type,
+							 EphyEmbedPrintPreviewNavType type,
 							 int page);
 	void		   (* activate)			(EphyEmbed *embed);
 	gboolean	   (* has_modified_forms)	(EphyEmbed *embed);
@@ -262,7 +262,7 @@ void		  ephy_embed_shistory_go_nth		(EphyEmbed *embed,
 							 int nth);
 
 void		  ephy_embed_get_security_level		(EphyEmbed *embed,
-							 EmbedSecurityLevel *level,
+							 EphyEmbedSecurityLevel *level,
 						 	 char **description);
 
 void		  ephy_embed_show_page_certificate	(EphyEmbed *embed);
@@ -299,7 +299,7 @@ void		  ephy_embed_set_print_preview_mode	(EphyEmbed *embed,
 int		  ephy_embed_print_preview_n_pages	(EphyEmbed *embed);
 
 void		  ephy_embed_print_preview_navigate	(EphyEmbed *embed,
-							 EmbedPrintPreviewNavType type,
+							 EphyEmbedPrintPreviewNavType type,
 							 int page);
 
 /* Misc. utility */
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 9da900f57..1b31ac383 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -1133,10 +1133,10 @@ EphyBrowser::ShowCertificate ()
 #endif
 }
 
-EmbedDocumentType
+EphyEmbedDocumentType
 EphyBrowser::GetDocumentType ()
 {
-  EmbedDocumentType type = EMBED_DOCUMENT_OTHER;
+  EphyEmbedDocumentType type = EMBED_DOCUMENT_OTHER;
 
   NS_ENSURE_TRUE (mDOMWindow, type);
 
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index c2d583417..3b4f4ce06 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -147,7 +147,7 @@ public:
 	nsresult GetSecurityInfo (PRUint32 *aState, nsACString &aDescription);
 	nsresult ShowCertificate ();
 
-        EmbedDocumentType GetDocumentType ();
+        EphyEmbedDocumentType GetDocumentType ();
 
 	nsCOMPtr<nsIWebBrowser> mWebBrowser;
 private:
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index d65e13901..88700e850 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -237,7 +237,7 @@ filechooser_response_cb (EphyFileChooser *dialog, gint response, EphyHeaderSniff
 nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI)
 {
 	nsresult rv;
-	EmbedPersistFlags flags;
+	EphyEmbedPersistFlags flags;
 	PRBool askDownloadDest;
 
 	mOriginalURI = inOriginalURI;
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 103301425..ced33dc71 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -100,7 +100,7 @@ MozDownload::Init(nsIURI *aSource, nsIURI *aTarget, const PRUnichar *aDisplayNam
 
 	if (mEmbedPersist)
 	{
-		EmbedPersistFlags flags;
+		EphyEmbedPersistFlags flags;
 
 		flags = ephy_embed_persist_get_flags (EPHY_EMBED_PERSIST (mEmbedPersist));
 
@@ -523,7 +523,7 @@ nsresult InitiateMozillaDownload (nsIDOMDocument *domDocument, nsIURI *sourceURI
 {
 	nsresult rv = NS_OK;
 
-	EmbedPersistFlags ephy_flags;
+	EphyEmbedPersistFlags ephy_flags;
 	ephy_flags = ephy_embed_persist_get_flags (EPHY_EMBED_PERSIST (embedPersist));
 
 	PRBool isHTML = (contentType &&
diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp
index 3eda0aa45..6e37313d4 100644
--- a/embed/mozilla/mozilla-embed-event.cpp
+++ b/embed/mozilla/mozilla-embed-event.cpp
@@ -118,10 +118,10 @@ impl_get_type (EphyEmbedEvent *event)
 	return ((MozillaEmbedEvent *) event)->type;
 }
 
-static EmbedEventContext
+static EphyEmbedEventContext
 impl_get_context (EphyEmbedEvent *event)
 {
-	return (EmbedEventContext) ((MozillaEmbedEvent *) event)->context;
+	return (EphyEmbedEventContext) ((MozillaEmbedEvent *) event)->context;
 }
 
 static guint
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index 4e6b08efd..5d8f9dc6c 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -138,7 +138,7 @@ impl_save (EphyEmbedPersist *persist)
 	char *uri;
 	long max_size;
 	EphyEmbed *embed;
-	EmbedPersistFlags flags;
+	EphyEmbedPersistFlags flags;
 	EphyEmbedSingle *single;
 
 	single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
@@ -284,7 +284,7 @@ impl_to_string (EphyEmbedPersist *persist)
 {
 	EphyEmbed *embed;
 	nsCOMPtr<nsIDOMDocument> DOMDocument;
-	EmbedPersistFlags flags;
+	EphyEmbedPersistFlags flags;
 	EphyBrowser *browser;
 	nsresult rv = NS_OK;
 
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 8019e7fbe..15ef2311c 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -74,7 +74,7 @@ static void mozilla_embed_security_change_cb	(GtkMozEmbed *embed,
 						 gpointer request,
 						 PRUint32 state,
 						 MozillaEmbed *membed);
-static EmbedSecurityLevel mozilla_embed_security_level (PRUint32 state);
+static EphyEmbedSecurityLevel mozilla_embed_security_level (PRUint32 state);
 
 #define MOZILLA_EMBED_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), MOZILLA_TYPE_EMBED, MozillaEmbedPrivate))
 
@@ -632,7 +632,7 @@ impl_shistory_go_nth (EphyEmbed *embed,
 
 static void
 impl_get_security_level (EphyEmbed *embed,
-                         EmbedSecurityLevel *level,
+                         EphyEmbedSecurityLevel *level,
                          char **description)
 {
 	MozillaEmbedPrivate *mpriv = MOZILLA_EMBED (embed)->priv;
@@ -688,7 +688,7 @@ impl_print_preview_n_pages (EphyEmbed *embed)
 
 static void
 impl_print_preview_navigate (EphyEmbed *embed,
-			     EmbedPrintPreviewNavType type,
+			     EphyEmbedPrintPreviewNavType type,
 			     int page)
 {
 	MozillaEmbedPrivate *mpriv = MOZILLA_EMBED(embed)->priv;
@@ -836,13 +836,13 @@ mozilla_embed_net_state_all_cb (GtkMozEmbed *embed, const char *aURI,
                                 gint state, guint status, 
 				MozillaEmbed *membed)
 {
-	EmbedNetState estate = EMBED_STATE_UNKNOWN;
+	EphyEmbedNetState estate = EMBED_STATE_UNKNOWN;
 	int i;
 
 	struct
 	{
 		guint state;
-		EmbedNetState embed_state;
+		EphyEmbedNetState embed_state;
 	}
 	conversion_map [] =
 	{
@@ -861,7 +861,7 @@ mozilla_embed_net_state_all_cb (GtkMozEmbed *embed, const char *aURI,
 	{
 		if (state & conversion_map[i].state)
 		{
-			estate = (EmbedNetState) (estate | conversion_map[i].embed_state);	
+			estate = (EphyEmbedNetState) (estate | conversion_map[i].embed_state);	
 		}
 	}
 
@@ -1097,10 +1097,10 @@ mozilla_embed_security_change_cb (GtkMozEmbed *embed,
 			       mozilla_embed_security_level (state));
 }
 
-static EmbedSecurityLevel
+static EphyEmbedSecurityLevel
 mozilla_embed_security_level (PRUint32 state)
 {
-	EmbedSecurityLevel level;
+	EphyEmbedSecurityLevel level;
 
 	switch (state)
         {
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index dea86f867..72a55a227 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -73,7 +73,7 @@ struct _EphyTabPrivate
 	int load_percent;
 	gboolean visibility;
 	gboolean load_status;
-	TabAddressExpire address_expire;
+	EphyTabAddressExpire address_expire;
 	int cur_requests;
 	int total_requests;
 	int width;
@@ -81,11 +81,11 @@ struct _EphyTabPrivate
 	GtkToggleAction *action;
 	float zoom;
 	gboolean setting_zoom;
-	EmbedSecurityLevel security_level;
+	EphyEmbedSecurityLevel security_level;
 	GSList *hidden_popups;
 	GSList *shown_popups;
-	TabNavigationFlags nav_flags;
-	EmbedDocumentType document_type;
+	EphyTabNavigationFlags nav_flags;
+	EphyEmbedDocumentType document_type;
 };
 
 static void ephy_tab_class_init		(EphyTabClass *klass);
@@ -132,7 +132,7 @@ static void	ephy_tab_set_load_percent	(EphyTab *tab,
 static void	ephy_tab_update_navigation_flags(EphyTab *tab,
 						 EphyEmbed *embed);
 static void	ephy_tab_set_security_level	(EphyTab *tab,
-						 EmbedSecurityLevel level);
+						 EphyEmbedSecurityLevel level);
 static void	ephy_tab_set_title		(EphyTab *tab,
 						 EphyEmbed *embed,
 						 const char *new_title);
@@ -156,7 +156,7 @@ ephy_tab_address_expire_get_type (void)
                    { TAB_ADDRESS_EXPIRE_CURRENT, "TAB_ADDRESS_EXPIRE_CURRENT", "expire-current" },
                    { 0, NULL, NULL }
                 };
-		type = g_enum_register_static ("TabAddressExpire", values);
+		type = g_enum_register_static ("EphyTabAddressExpire", values);
 	}
 	return type;
 }
@@ -175,7 +175,7 @@ ephy_tab_navigation_flags_get_type (void)
                    { TAB_NAV_FORWARD, "TAB_NAV_FORWARD", "forward" },
                    { 0, NULL, NULL }
                 };
-		type = g_flags_register_static ("TabNavigationFlags", values);
+		type = g_flags_register_static ("EphyTabNavigationFlags", values);
 	}
 	return type;
 }
@@ -846,9 +846,9 @@ ephy_tab_set_load_status (EphyTab *tab, gboolean status)
  *
  * Returns the type of the document loaded in @tab.
  *
- * Return value: the #EmbedDocumentType
+ * Return value: the #EphyEmbedDocumentType
  **/
-EmbedDocumentType
+EphyEmbedDocumentType
 ephy_tab_get_document_type (EphyTab *tab)
 {
 	g_return_val_if_fail (EPHY_IS_TAB (tab), EMBED_DOCUMENT_OTHER);
@@ -1125,7 +1125,7 @@ ephy_tab_content_change_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
 
 static void
 ephy_tab_document_type_cb (EphyEmbed *embed,
-			   EmbedDocumentType type,
+			   EphyEmbedDocumentType type,
 			   EphyTab *tab)
 {
 	if (tab->priv->document_type != type)
@@ -1207,7 +1207,7 @@ build_load_percent (int requests_done, int requests_total)
 }
 
 static void
-update_net_state_message (EphyTab *tab, const char *uri, EmbedNetState flags)
+update_net_state_message (EphyTab *tab, const char *uri, EphyEmbedNetState flags)
 {
 	GnomeVFSURI *vfs_uri = NULL;
 	const char *msg = NULL;
@@ -1273,7 +1273,7 @@ out:
 }
 
 static void
-build_progress_from_requests (EphyTab *tab, EmbedNetState state)
+build_progress_from_requests (EphyTab *tab, EphyEmbedNetState state)
 {
 	int load_percent;
 
@@ -1313,7 +1313,7 @@ ensure_page_info (EphyTab *tab, EphyEmbed *embed, const char *address)
 static void
 ephy_tab_net_state_cb (EphyEmbed *embed,
 		       const char *uri,
-		       EmbedNetState state,
+		       EphyEmbedNetState state,
 		       EphyTab *tab)
 {
 	update_net_state_message (tab, uri, state);
@@ -1538,7 +1538,7 @@ ephy_tab_dom_mouse_click_cb (EphyEmbed *embed,
 			     EphyTab *tab)
 {
 	EphyEmbedEventType type;
-	EmbedEventContext context;
+	EphyEmbedEventContext context;
 	guint modifier;
 	gboolean handled = TRUE;
 	gboolean with_control, with_shift, is_left_click, is_middle_click;
@@ -1623,7 +1623,7 @@ ephy_tab_dom_mouse_click_cb (EphyEmbed *embed,
 }
 
 static void
-ephy_tab_security_change_cb (EphyEmbed *embed, EmbedSecurityLevel level,
+ephy_tab_security_change_cb (EphyEmbed *embed, EphyEmbedSecurityLevel level,
 			       EphyTab *tab)
 {
 	ephy_tab_set_security_level (tab, level);
@@ -1761,7 +1761,7 @@ ephy_tab_get_load_percent (EphyTab *tab)
 static void
 ephy_tab_update_navigation_flags (EphyTab *tab, EphyEmbed *embed)
 {
-	TabNavigationFlags flags = 0;
+	EphyTabNavigationFlags flags = 0;
 
 	if (ephy_embed_can_go_up (embed))
 	{
@@ -1794,7 +1794,7 @@ ephy_tab_update_navigation_flags (EphyTab *tab, EphyEmbed *embed)
  *
  * Return value: @tab's navigation flags
  **/
-TabNavigationFlags
+EphyTabNavigationFlags
 ephy_tab_get_navigation_flags (EphyTab *tab)
 {
 	g_return_val_if_fail (EPHY_IS_TAB (tab), 0);
@@ -1946,7 +1946,7 @@ ephy_tab_get_location (EphyTab *tab)
 void
 ephy_tab_set_location (EphyTab *tab,
 		       const char *address,
-		       TabAddressExpire expire)
+		       EphyTabAddressExpire expire)
 {
 	g_return_if_fail (EPHY_IS_TAB (tab));
 
@@ -1967,7 +1967,7 @@ ephy_tab_set_location (EphyTab *tab,
 }
 
 static void
-ephy_tab_set_security_level (EphyTab *tab, EmbedSecurityLevel level)
+ephy_tab_set_security_level (EphyTab *tab, EphyEmbedSecurityLevel level)
 {
 	g_return_if_fail (EPHY_IS_TAB (tab));
 
@@ -1984,7 +1984,7 @@ ephy_tab_set_security_level (EphyTab *tab, EmbedSecurityLevel level)
  *
  * Return value: @tab's loaded page's security level
  **/
-EmbedSecurityLevel
+EphyEmbedSecurityLevel
 ephy_tab_get_security_level (EphyTab *tab)
 {
 	g_return_val_if_fail (EPHY_IS_TAB (tab), STATE_IS_UNKNOWN);
diff --git a/src/ephy-tab.h b/src/ephy-tab.h
index 9cb9a9dbc..261291eb5 100644
--- a/src/ephy-tab.h
+++ b/src/ephy-tab.h
@@ -47,14 +47,14 @@ typedef enum
 	TAB_NAV_UP	= 1 << 0,
 	TAB_NAV_BACK	= 1 << 1,
 	TAB_NAV_FORWARD	= 1 << 2
-} TabNavigationFlags;
+} EphyTabNavigationFlags;
 
 typedef enum
 {
 	TAB_ADDRESS_EXPIRE_NOW,
 	TAB_ADDRESS_EXPIRE_NEXT,
 	TAB_ADDRESS_EXPIRE_CURRENT
-} TabAddressExpire;
+} EphyTabAddressExpire;
 
 struct _EphyTab
 {
@@ -83,7 +83,7 @@ EphyEmbed              *ephy_tab_get_embed		(EphyTab *tab);
 
 EphyTab		       *ephy_tab_for_embed		(EphyEmbed *embed);
 
-EmbedDocumentType	ephy_tab_get_document_type	(EphyTab *tab);
+EphyEmbedDocumentType	ephy_tab_get_document_type	(EphyTab *tab);
 
 const char             *ephy_tab_get_icon_address	(EphyTab *tab);
 
@@ -96,13 +96,13 @@ int			ephy_tab_get_load_percent	(EphyTab *tab);
 
 void			ephy_tab_set_location		(EphyTab *tab,
 							 const char *location,
-							 TabAddressExpire expire);
+							 EphyTabAddressExpire expire);
 
 const char             *ephy_tab_get_location		(EphyTab *tab);
 
-TabNavigationFlags	ephy_tab_get_navigation_flags	(EphyTab *tab);
+EphyTabNavigationFlags	ephy_tab_get_navigation_flags	(EphyTab *tab);
 
-EmbedSecurityLevel	ephy_tab_get_security_level	(EphyTab *tab);
+EphyEmbedSecurityLevel	ephy_tab_get_security_level	(EphyTab *tab);
 
 void			ephy_tab_get_size		(EphyTab *tab,
 							 int *width,
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 58c1b4326..abb509098 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1214,7 +1214,7 @@ sync_tab_document_type (EphyTab *tab,
 {
 	GtkActionGroup *action_group;
 	GtkAction *action;
-	EmbedDocumentType type;
+	EphyEmbedDocumentType type;
 	gboolean can_find, enable;
 
 	/* update zoom actions */
@@ -1297,7 +1297,7 @@ sync_tab_message (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 static void
 sync_tab_navigation (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 {
-	TabNavigationFlags flags;
+	EphyTabNavigationFlags flags;
 	GtkActionGroup *action_group;
 	GtkAction *action;
 	gboolean up = FALSE, back = FALSE, forward = FALSE;
@@ -1344,7 +1344,7 @@ static void
 sync_tab_security (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 {
 	EphyEmbed *embed;
-	EmbedSecurityLevel level;
+	EphyEmbedSecurityLevel level;
 	char *description = NULL;
 	char *state = NULL;
 	char *tooltip;
@@ -1540,7 +1540,7 @@ sync_tab_zoom (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 {
 	GtkActionGroup *action_group;
 	GtkAction *action;
-	EmbedDocumentType type;
+	EphyEmbedDocumentType type;
 	gboolean can_zoom_in = TRUE, can_zoom_out = TRUE, can_zoom_normal = FALSE, can_zoom;
 	float zoom;
 
@@ -1637,7 +1637,7 @@ get_name_from_address_value (const GValue *value)
 static void
 update_popups_tooltips (EphyWindow *window, EphyEmbedEvent *event)
 {
-	EmbedEventContext context;
+	EphyEmbedEventContext context;
 	GtkActionGroup *group = window->priv->popups_action_group;
 	const GValue *value;
 	GtkAction *action;
@@ -1733,7 +1733,7 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
 {
 	GtkActionGroup *action_group;
 	GtkAction *action;
-	EmbedEventContext context;
+	EphyEmbedEventContext context;
 	const char *popup;
 	const GValue *value;
 	gboolean framed, has_background, can_open_in_new;
@@ -2318,7 +2318,7 @@ ephy_window_class_init (EphyWindowClass *klass)
 					 g_param_spec_flags ("chrome",
 							     "chrome",
 							     "Window chrome",
-							     EPHY_TYPE_EMBED_CHROME_MASK,
+							     EPHY_TYPE_EMBED_CHROME,
 							     EPHY_EMBED_CHROME_ALL,
 							     G_PARAM_CONSTRUCT_ONLY |
 							     G_PARAM_READWRITE));
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 4804b3316..7a95c7611 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -159,7 +159,7 @@ popup_cmd_copy_link_address (GtkAction *action,
 			     EphyWindow *window)
 {
 	EphyEmbedEvent *event;
-	EmbedEventContext context;
+	EphyEmbedEventContext context;
 	const char *address;
 	const GValue *value;