7 files changed, 18 insertions, 18 deletions
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)
         {