Consistently start enum names with EPHY_*.

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

	* embed/ephy-embed-event.c: (ephy_embed_event_context_get_type):
	* embed/ephy-embed-event.h:
	* embed/ephy-embed-persist.c: (ephy_embed_persist_flags_get_type):
	* embed/ephy-embed-persist.h:
	* embed/ephy-embed.c: (ephy_embed_net_state_get_type),
	(ephy_embed_ppv_navigation_get_type),
	(ephy_embed_security_level_get_type),
	(ephy_embed_document_type_get_type):
	* embed/ephy-embed.h:
	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_download):
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyHeaderSniffer.cpp:
	* embed/mozilla/EventContext.cpp:
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/mozilla-embed-persist.cpp:
	* embed/mozilla/mozilla-embed.cpp:
	* src/ephy-shell.c: (ephy_shell_new_tab):
	* src/ephy-tab.c: (ephy_tab_address_expire_get_type),
	(ephy_tab_navigation_flags_get_type), (ephy_tab_set_property),
	(ephy_tab_class_init), (ephy_tab_get_document_type),
	(ephy_tab_address_cb), (update_net_state_message),
	(build_progress_from_requests), (ensure_page_info),
	(ephy_tab_net_state_cb), (ephy_tab_dom_mouse_click_cb),
	(ephy_tab_init), (ephy_tab_update_navigation_flags),
	(ephy_tab_set_location), (ephy_tab_get_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):
	* src/popup-commands.c: (popup_cmd_copy_link_address),
	(save_property_url), (popup_cmd_set_image_as_background),
	(save_temp_source):
	* src/ppview-toolbar.c: (toolbar_cmd_ppv_goto_first),
	(toolbar_cmd_ppv_goto_last), (toolbar_cmd_ppv_go_back),
	(toolbar_cmd_ppv_go_forward):
	* src/toolbar.c: (sync_user_input_cb):
	* src/window-commands.c: (window_cmd_file_save_as),
	(save_temp_source):

	Consistently start enum names with EPHY_*.

22 files changed, 263 insertions, 220 deletions

diff --git a/ChangeLog b/ChangeLog
index 06f005707..89dd60ec4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2005-01-05  Crispin Flowerday  <gnome@flowerday.cx>
+
+	* embed/ephy-embed-event.c: (ephy_embed_event_context_get_type):
+	* embed/ephy-embed-event.h:
+	* embed/ephy-embed-persist.c: (ephy_embed_persist_flags_get_type):
+	* embed/ephy-embed-persist.h:
+	* embed/ephy-embed.c: (ephy_embed_net_state_get_type),
+	(ephy_embed_ppv_navigation_get_type),
+	(ephy_embed_security_level_get_type),
+	(ephy_embed_document_type_get_type):
+	* embed/ephy-embed.h:
+	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_download):
+	* embed/mozilla/EphyBrowser.cpp:
+	* embed/mozilla/EphyHeaderSniffer.cpp:
+	* embed/mozilla/EventContext.cpp:
+	* embed/mozilla/MozDownload.cpp:
+	* embed/mozilla/mozilla-embed-persist.cpp:
+	* embed/mozilla/mozilla-embed.cpp:
+	* src/ephy-shell.c: (ephy_shell_new_tab):
+	* src/ephy-tab.c: (ephy_tab_address_expire_get_type),
+	(ephy_tab_navigation_flags_get_type), (ephy_tab_set_property),
+	(ephy_tab_class_init), (ephy_tab_get_document_type),
+	(ephy_tab_address_cb), (update_net_state_message),
+	(build_progress_from_requests), (ensure_page_info),
+	(ephy_tab_net_state_cb), (ephy_tab_dom_mouse_click_cb),
+	(ephy_tab_init), (ephy_tab_update_navigation_flags),
+	(ephy_tab_set_location), (ephy_tab_get_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):
+	* src/popup-commands.c: (popup_cmd_copy_link_address),
+	(save_property_url), (popup_cmd_set_image_as_background),
+	(save_temp_source):
+	* src/ppview-toolbar.c: (toolbar_cmd_ppv_goto_first),
+	(toolbar_cmd_ppv_goto_last), (toolbar_cmd_ppv_go_back),
+	(toolbar_cmd_ppv_go_forward):
+	* src/toolbar.c: (sync_user_input_cb):
+	* src/window-commands.c: (window_cmd_file_save_as),
+	(save_temp_source):
+
+	Consistently start enum names with EPHY_*.
+
 2005-01-04  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/bookmarks/ephy-bookmark-action.c: (create_tool_item):
diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c
index aba3af6c0..316962689 100644
--- a/embed/ephy-embed-event.c
+++ b/embed/ephy-embed-event.c
@@ -34,14 +34,14 @@ ephy_embed_event_context_get_type (void)
 	{
 		static const GFlagsValue values[] =
 		{
-		{ EMBED_CONTEXT_NONE, "EMBED_CONTEXT_NONE", "none" },
-		{ EMBED_CONTEXT_DEFAULT, "EMBED_CONTEXT_DEFAULT", "default" },
-		{ EMBED_CONTEXT_LINK, "EMBED_CONTEXT_LINK", "link" },
-		{ EMBED_CONTEXT_IMAGE, "EMBED_CONTEXT_IMAGE", "image" },
-		{ EMBED_CONTEXT_DOCUMENT, "EMBED_CONTEXT_DOCUMENT", "document" },
-		{ EMBED_CONTEXT_INPUT, "EMBED_CONTEXT_INPUT", "input" },
-		{ EMBED_CONTEXT_XUL, "EMBED_CONTEXT_XUL", "xul" },
-		{ EMBED_CONTEXT_EMAIL_LINK, "EMBED_CONTEXT_EMAIL_LINK", "email-link" },
+		{ EPHY_EMBED_CONTEXT_NONE, "EPHY_EMBED_CONTEXT_NONE", "none" },
+		{ EPHY_EMBED_CONTEXT_DEFAULT, "EPHY_EMBED_CONTEXT_DEFAULT", "default" },
+		{ EPHY_EMBED_CONTEXT_LINK, "EPHY_EMBED_CONTEXT_LINK", "link" },
+		{ EPHY_EMBED_CONTEXT_IMAGE, "EPHY_EMBED_CONTEXT_IMAGE", "image" },
+		{ EPHY_EMBED_CONTEXT_DOCUMENT, "EPHY_EMBED_CONTEXT_DOCUMENT", "document" },
+		{ EPHY_EMBED_CONTEXT_INPUT, "EPHY_EMBED_CONTEXT_INPUT", "input" },
+		{ EPHY_EMBED_CONTEXT_XUL, "EPHY_EMBED_CONTEXT_XUL", "xul" },
+		{ EPHY_EMBED_CONTEXT_EMAIL_LINK, "EPHY_EMBED_CONTEXT_EMAIL_LINK", "email-link" },
 		{ 0, NULL, NULL }
 		};
 
diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h
index 19e9a770d..fde3ced29 100644
--- a/embed/ephy-embed-event.h
+++ b/embed/ephy-embed-event.h
@@ -42,14 +42,14 @@ typedef struct _EphyEmbedEvent		EphyEmbedEvent;
 
 typedef enum
 {
-	EMBED_CONTEXT_NONE     = 0,
-        EMBED_CONTEXT_DEFAULT  = 1 << 1,
-        EMBED_CONTEXT_LINK     = 1 << 2,
-        EMBED_CONTEXT_IMAGE    = 1 << 3,
-        EMBED_CONTEXT_DOCUMENT = 1 << 4,
-        EMBED_CONTEXT_INPUT    = 1 << 5,
-        EMBED_CONTEXT_XUL      = 1 << 7,
-	EMBED_CONTEXT_EMAIL_LINK = 1 << 8
+	EPHY_EMBED_CONTEXT_NONE     = 0,
+        EPHY_EMBED_CONTEXT_DEFAULT  = 1 << 1,
+        EPHY_EMBED_CONTEXT_LINK     = 1 << 2,
+        EPHY_EMBED_CONTEXT_IMAGE    = 1 << 3,
+        EPHY_EMBED_CONTEXT_DOCUMENT = 1 << 4,
+        EPHY_EMBED_CONTEXT_INPUT    = 1 << 5,
+        EPHY_EMBED_CONTEXT_XUL      = 1 << 7,
+	EPHY_EMBED_CONTEXT_EMAIL_LINK = 1 << 8
 } EphyEmbedEventContext;
 
 typedef enum
diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c
index 36be83084..025c86e52 100644
--- a/embed/ephy-embed-persist.c
+++ b/embed/ephy-embed-persist.c
@@ -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
- * #EphyEmbedPersistFlags include %EMBED_PERSIST_COPY_PAGE. Regardless, an
+ * #EphyEmbedPersistFlags include %EPHY_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.
  **/
@@ -129,7 +129,7 @@ ephy_embed_persist_set_embed (EphyEmbedPersist *persist,
  * @value: the title to be displayed by the filechooser
  *
  * Sets the title of the filechooser window. The filechooser will only be
- * displayed if %EMBED_PERSIST_ASK_DESTINATION has been set with
+ * displayed if %EPHY_EMBED_PERSIST_ASK_DESTINATION has been set with
  * ephy_embed_persist_set_flags().
  **/
 void
@@ -147,7 +147,7 @@ ephy_embed_persist_set_fc_title (EphyEmbedPersist *persist,
  * @value: the #EphyWindow which should be the filechooser's parent
  *
  * Sets the #EphyWindow which should be @persist's filechooser's parent. The
- * filechooser will only be displayed if %EMBED_PERSIST_ASK_DESTINATION has been
+ * filechooser will only be displayed if %EPHY_EMBED_PERSIST_ASK_DESTINATION has been
  * set with ephy_embed_persist_set_flags().
  **/
 void
@@ -591,7 +591,7 @@ ephy_embed_persist_cancel (EphyEmbedPersist *persist)
  *
  * Begins saving the file specified in @persist.
  *
- * If @persist's #EphyEmbedPersistFlags include %EMBED_PERSIST_ASK_DESTINATION, a
+ * If @persist's #EphyEmbedPersistFlags include %EPHY_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 #EphyEmbedPersistFlags include %EMBED_PERSIST_COPY_PAGE. If @persist's
+ * @persist's #EphyEmbedPersistFlags include %EPHY_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.
  *
@@ -640,11 +640,11 @@ ephy_embed_persist_flags_get_type (void)
 	{
 		static const GFlagsValue values[] =
 		{
-		{ EMBED_PERSIST_COPY_PAGE, "EMBED_PERSIST_COPY_PAGE", "copy-page" },
-		{ EMBED_PERSIST_MAINDOC, "EMBED_PERSIST_MAINDOC", "main-document" },
-		{ EMBED_PERSIST_NO_VIEW, "EMBED_PERSIST_NO_VIEW", "no-view" },
-		{ EMBED_PERSIST_ASK_DESTINATION, "EMBED_PERSIST_ASK_DESTINATION", "ask-destination" },
-		{ EMBED_PERSIST_DO_CONVERSION, "EMBED_PERSIST_DO_CONVERSION", "do-conversion" },
+		{ EPHY_EMBED_PERSIST_COPY_PAGE, "EPHY_EMBED_PERSIST_COPY_PAGE", "copy-page" },
+		{ EPHY_EMBED_PERSIST_MAINDOC, "EPHY_EMBED_PERSIST_MAINDOC", "main-document" },
+		{ EPHY_EMBED_PERSIST_NO_VIEW, "EPHY_EMBED_PERSIST_NO_VIEW", "no-view" },
+		{ EPHY_EMBED_PERSIST_ASK_DESTINATION, "EPHY_EMBED_PERSIST_ASK_DESTINATION", "ask-destination" },
+		{ EPHY_EMBED_PERSIST_DO_CONVERSION, "EPHY_EMBED_PERSIST_DO_CONVERSION", "do-conversion" },
 		{ 0, NULL, NULL }
 		};
 
diff --git a/embed/ephy-embed-persist.h b/embed/ephy-embed-persist.h
index fc65088a1..a2616cdb4 100644
--- a/embed/ephy-embed-persist.h
+++ b/embed/ephy-embed-persist.h
@@ -46,11 +46,11 @@ typedef struct EphyEmbedPersistPrivate EphyEmbedPersistPrivate;
 
 typedef enum
 {
-	EMBED_PERSIST_COPY_PAGE		= 1 << 0,
-	EMBED_PERSIST_MAINDOC		= 1 << 1,
-	EMBED_PERSIST_NO_VIEW		= 1 << 2,
-	EMBED_PERSIST_ASK_DESTINATION	= 1 << 3,
-	EMBED_PERSIST_DO_CONVERSION     = 1 << 4
+	EPHY_EMBED_PERSIST_COPY_PAGE		= 1 << 0,
+	EPHY_EMBED_PERSIST_MAINDOC		= 1 << 1,
+	EPHY_EMBED_PERSIST_NO_VIEW		= 1 << 2,
+	EPHY_EMBED_PERSIST_ASK_DESTINATION	= 1 << 3,
+	EPHY_EMBED_PERSIST_DO_CONVERSION     = 1 << 4
 } EphyEmbedPersistFlags;
 
 struct _EphyEmbedPersist
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 4b10947fa..b9789107e 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -38,16 +38,16 @@ ephy_embed_net_state_get_type (void)
 	{
 		static const GFlagsValue values[] =
 		{
-		{ EMBED_STATE_UNKNOWN, "EMBED_STATE_UNKNOWN", "unknown" },
-		{ EMBED_STATE_START, "EMBED_STATE_START", "start" },
-		{ EMBED_STATE_REDIRECTING, "EMBED_STATE_REDIRECTING", "redirecting" },
-		{ EMBED_STATE_TRANSFERRING, "EMBED_STATE_TRANSFERRING", "transferring" },
-		{ EMBED_STATE_NEGOTIATING, "EMBED_STATE_NEGOTIATING", "negotiating", },
-		{ EMBED_STATE_STOP, "EMBED_STATE_STOP", "stop" },
-		{ EMBED_STATE_IS_REQUEST, "EMBED_STATE_IS_REQUEST", "is-request" },
-		{ EMBED_STATE_IS_DOCUMENT, "EMBED_STATE_IS_DOCUMENT", "is-document" },
-		{ EMBED_STATE_IS_NETWORK, "EMBED_STATE_IS_NETWORK", "is-network" },
-		{ EMBED_STATE_IS_WINDOW, "EMBED_STATE_IS_WINDOW", "is-window" },
+		{ EPHY_EMBED_STATE_UNKNOWN, "EPHY_EMBED_STATE_UNKNOWN", "unknown" },
+		{ EPHY_EMBED_STATE_START, "EPHY_EMBED_STATE_START", "start" },
+		{ EPHY_EMBED_STATE_REDIRECTING, "EPHY_EMBED_STATE_REDIRECTING", "redirecting" },
+		{ EPHY_EMBED_STATE_TRANSFERRING, "EPHY_EMBED_STATE_TRANSFERRING", "transferring" },
+		{ EPHY_EMBED_STATE_NEGOTIATING, "EPHY_EMBED_STATE_NEGOTIATING", "negotiating", },
+		{ EPHY_EMBED_STATE_STOP, "EPHY_EMBED_STATE_STOP", "stop" },
+		{ EPHY_EMBED_STATE_IS_REQUEST, "EPHY_EMBED_STATE_IS_REQUEST", "is-request" },
+		{ EPHY_EMBED_STATE_IS_DOCUMENT, "EPHY_EMBED_STATE_IS_DOCUMENT", "is-document" },
+		{ EPHY_EMBED_STATE_IS_NETWORK, "EPHY_EMBED_STATE_IS_NETWORK", "is-network" },
+		{ EPHY_EMBED_STATE_IS_WINDOW, "EPHY_EMBED_STATE_IS_WINDOW", "is-window" },
 		{ 0, NULL, NULL }
 		};
 
@@ -88,11 +88,11 @@ ephy_embed_ppv_navigation_get_type (void)
 	{
 		static const GEnumValue values[] =
 		{
-		{ PRINTPREVIEW_GOTO_PAGENUM, "PRINTPREVIEW_GOTO_PAGENUM", "page-num" },
-		{ PRINTPREVIEW_PREV_PAGE, "PRINTPREVIEW_PREV_PAGE", "prev" },
-		{ PRINTPREVIEW_NEXT_PAGE, "PRINTPREVIEW_NEXT_PAGE", "next" },
-		{ PRINTPREVIEW_HOME, "PRINTPREVIEW_HOME", "home" },
-		{ PRINTPREVIEW_END, "PRINTPREVIEW_END", "end" },
+		{ EPHY_EMBED_PRINTPREVIEW_GOTO_PAGENUM, "EPHY_EMBED_PRINTPREVIEW_GOTO_PAGENUM", "page-num" },
+		{ EPHY_EMBED_PRINTPREVIEW_PREV_PAGE, "EPHY_EMBED_PRINTPREVIEW_PREV_PAGE", "prev" },
+		{ EPHY_EMBED_PRINTPREVIEW_NEXT_PAGE, "EPHY_EMBED_PRINTPREVIEW_NEXT_PAGE", "next" },
+		{ EPHY_EMBED_PRINTPREVIEW_HOME, "EPHY_EMBED_PRINTPREVIEW_HOME", "home" },
+		{ EPHY_EMBED_PRINTPREVIEW_END, "EPHY_EMBED_PRINTPREVIEW_END", "end" },
 		{ 0, NULL, NULL }
 		};
 
@@ -111,12 +111,12 @@ ephy_embed_security_level_get_type (void)
 	{
 		static const GEnumValue values[] =
 		{
-		{ STATE_IS_UNKNOWN, "STATE_IS_UNKNOWN", "unknown" },
-		{ STATE_IS_INSECURE, "STATE_IS_INSECURE", "insecure" },
-		{ STATE_IS_BROKEN, "STATE_IS_BROKEN", "broken" },
-		{ STATE_IS_SECURE_LOW, "STATE_IS_SECURE_LOW", "low" },
-		{ STATE_IS_SECURE_MED, "STATE_IS_SECURE_MED", "medium" },
-		{ STATE_IS_SECURE_HIGH, "STATE_IS_SECURE_HIGH", "high" },
+		{ EPHY_EMBED_STATE_IS_UNKNOWN, "EPHY_EMBED_STATE_IS_UNKNOWN", "unknown" },
+		{ EPHY_EMBED_STATE_IS_INSECURE, "EPHY_EMBED_STATE_IS_INSECURE", "insecure" },
+		{ EPHY_EMBED_STATE_IS_BROKEN, "EPHY_EMBED_STATE_IS_BROKEN", "broken" },
+		{ EPHY_EMBED_STATE_IS_SECURE_LOW, "EPHY_EMBED_STATE_IS_SECURE_LOW", "low" },
+		{ EPHY_EMBED_STATE_IS_SECURE_MED, "EPHY_EMBED_STATE_IS_SECURE_MED", "medium" },
+		{ EPHY_EMBED_STATE_IS_SECURE_HIGH, "EPHY_EMBED_STATE_IS_SECURE_HIGH", "high" },
 		{ 0, NULL, NULL }
 		};
 
@@ -135,10 +135,10 @@ ephy_embed_document_type_get_type (void)
 	{
 		static const GEnumValue values[] =
 		{
-		{ EMBED_DOCUMENT_HTML, "EMBED_DOCUMENT_HTML", "html" },
-		{ EMBED_DOCUMENT_XML, "EMBED_DOCUMENT_XML", "xml" },
-		{ EMBED_DOCUMENT_IMAGE, "EMBED_DOCUMENT_IMAGE", "image" },
-		{ EMBED_DOCUMENT_OTHER, "EMBED_DOCUMENT_OTHER", "other" },
+		{ EPHY_EMBED_DOCUMENT_HTML, "EPHY_EMBED_DOCUMENT_HTML", "html" },
+		{ EPHY_EMBED_DOCUMENT_XML, "EPHY_EMBED_DOCUMENT_XML", "xml" },
+		{ EPHY_EMBED_DOCUMENT_IMAGE, "EPHY_EMBED_DOCUMENT_IMAGE", "image" },
+		{ EPHY_EMBED_DOCUMENT_OTHER, "EPHY_EMBED_DOCUMENT_OTHER", "other" },
 		{ 0, NULL, NULL }
 		};
 
@@ -939,7 +939,7 @@ ephy_embed_print_preview_n_pages (EphyEmbed *embed)
  * ephy_embed_print_preview_navigate:
  * @embed: an #EphyEmbed
  * @type: an #EphyPrintPreviewNavType which determines where to navigate
- * @page: if @type is %PRINTPREVIEW_GOTO_PAGENUM, the desired page number
+ * @page: if @type is %EPHY_EMBED_PRINTPREVIEW_GOTO_PAGENUM, the desired page number
  *
  * Navigates @embed's print preview.
  **/
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 5bd97253c..b90e4c3a1 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -47,17 +47,17 @@ typedef struct _EphyEmbedIface	EphyEmbedIface;
 
 typedef enum
 {
-	EMBED_STATE_UNKNOWN		= 0,
-	EMBED_STATE_START		= 1 << 0,
-	EMBED_STATE_REDIRECTING		= 1 << 1,
-	EMBED_STATE_TRANSFERRING	= 1 << 2,
-	EMBED_STATE_NEGOTIATING		= 1 << 3,
-	EMBED_STATE_STOP		= 1 << 4,
-
-	EMBED_STATE_IS_REQUEST		= 1 << 5,
-	EMBED_STATE_IS_DOCUMENT		= 1 << 6,
-	EMBED_STATE_IS_NETWORK		= 1 << 7,
-	EMBED_STATE_IS_WINDOW		= 1 << 8
+	EPHY_EMBED_STATE_UNKNOWN		= 0,
+	EPHY_EMBED_STATE_START		= 1 << 0,
+	EPHY_EMBED_STATE_REDIRECTING		= 1 << 1,
+	EPHY_EMBED_STATE_TRANSFERRING	= 1 << 2,
+	EPHY_EMBED_STATE_NEGOTIATING		= 1 << 3,
+	EPHY_EMBED_STATE_STOP		= 1 << 4,
+
+	EPHY_EMBED_STATE_IS_REQUEST		= 1 << 5,
+	EPHY_EMBED_STATE_IS_DOCUMENT		= 1 << 6,
+	EPHY_EMBED_STATE_IS_NETWORK		= 1 << 7,
+	EPHY_EMBED_STATE_IS_WINDOW		= 1 << 8
 } EphyEmbedNetState;
 
 typedef enum
@@ -75,29 +75,29 @@ typedef enum
 
 typedef enum
 {
-	PRINTPREVIEW_GOTO_PAGENUM	= 0,
-	PRINTPREVIEW_PREV_PAGE		= 1,
-	PRINTPREVIEW_NEXT_PAGE		= 2,
-	PRINTPREVIEW_HOME		= 3,
-	PRINTPREVIEW_END		= 4
+	EPHY_EMBED_PRINTPREVIEW_GOTO_PAGENUM	= 0,
+	EPHY_EMBED_PRINTPREVIEW_PREV_PAGE		= 1,
+	EPHY_EMBED_PRINTPREVIEW_NEXT_PAGE		= 2,
+	EPHY_EMBED_PRINTPREVIEW_HOME		= 3,
+	EPHY_EMBED_PRINTPREVIEW_END		= 4
 } EphyEmbedPrintPreviewNavType;
 
 typedef enum
 {
-	STATE_IS_UNKNOWN,
-	STATE_IS_INSECURE,
-	STATE_IS_BROKEN,
-	STATE_IS_SECURE_LOW,
-	STATE_IS_SECURE_MED,
-	STATE_IS_SECURE_HIGH
+	EPHY_EMBED_STATE_IS_UNKNOWN,
+	EPHY_EMBED_STATE_IS_INSECURE,
+	EPHY_EMBED_STATE_IS_BROKEN,
+	EPHY_EMBED_STATE_IS_SECURE_LOW,
+	EPHY_EMBED_STATE_IS_SECURE_MED,
+	EPHY_EMBED_STATE_IS_SECURE_HIGH
 } EphyEmbedSecurityLevel;
 
 typedef enum
 {
-	EMBED_DOCUMENT_HTML,
-	EMBED_DOCUMENT_XML,
-	EMBED_DOCUMENT_IMAGE,
-	EMBED_DOCUMENT_OTHER
+	EPHY_EMBED_DOCUMENT_HTML,
+	EPHY_EMBED_DOCUMENT_XML,
+	EPHY_EMBED_DOCUMENT_IMAGE,
+	EPHY_EMBED_DOCUMENT_OTHER
 } EphyEmbedDocumentType;
 
 struct _EphyEmbedIface
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index efa3fc14b..93309a841 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -377,8 +377,8 @@ ephy_favicon_cache_download (EphyFaviconCache *cache,
 		(ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST));
 
 	ephy_embed_persist_set_dest (persist, dest);
-	ephy_embed_persist_set_flags (persist, EMBED_PERSIST_NO_VIEW |
-					       EMBED_PERSIST_DO_CONVERSION);
+	ephy_embed_persist_set_flags (persist, EPHY_EMBED_PERSIST_NO_VIEW |
+					       EPHY_EMBED_PERSIST_DO_CONVERSION);
 	ephy_embed_persist_set_max_size (persist, 100 * 1024);
 	ephy_embed_persist_set_source (persist, favicon_url);
 
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 1b31ac383..b2c623a6b 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -1136,7 +1136,7 @@ EphyBrowser::ShowCertificate ()
 EphyEmbedDocumentType
 EphyBrowser::GetDocumentType ()
 {
-  EphyEmbedDocumentType type = EMBED_DOCUMENT_OTHER;
+  EphyEmbedDocumentType type = EPHY_EMBED_DOCUMENT_OTHER;
 
   NS_ENSURE_TRUE (mDOMWindow, type);
 
@@ -1151,15 +1151,15 @@ EphyBrowser::GetDocumentType ()
 
   if (xmlDoc)
     {
-      type = EMBED_DOCUMENT_XML;
+      type = EPHY_EMBED_DOCUMENT_XML;
     }
   else if (imgDoc)
     {
-      type = EMBED_DOCUMENT_IMAGE;
+      type = EPHY_EMBED_DOCUMENT_IMAGE;
     }
   else if (htmlDoc)
     {
-      type = EMBED_DOCUMENT_HTML;
+      type = EPHY_EMBED_DOCUMENT_HTML;
     }
 
   return type;
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 88700e850..d751a6941 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -243,7 +243,7 @@ nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI)
 	mOriginalURI = inOriginalURI;
 
 	flags = ephy_embed_persist_get_flags (EPHY_EMBED_PERSIST (mEmbedPersist));
-	askDownloadDest = flags & EMBED_PERSIST_ASK_DESTINATION;
+	askDownloadDest = flags & EPHY_EMBED_PERSIST_ASK_DESTINATION;
 
 	nsEmbedString defaultFileName;
 
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 1ed3e1b29..cdcaf39aa 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -212,7 +212,7 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 
 	mEmbedEvent = info;
 
-	info->context = EMBED_CONTEXT_DOCUMENT;
+	info->context = EPHY_EMBED_CONTEXT_DOCUMENT;
 
 	nsCOMPtr<nsIDOMNode> node = do_QueryInterface(EventTarget, &rv);
 	if (NS_FAILED(rv) || !node) return NS_ERROR_FAILURE;
@@ -232,7 +232,7 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 	nsCOMPtr<nsIDOMXULDocument> xul_document = do_QueryInterface(domDoc);
 	if (xul_document)
 	{
-		info->context = EMBED_CONTEXT_NONE;
+		info->context = EPHY_EMBED_CONTEXT_NONE;
 		return NS_ERROR_FAILURE;
 	}
 
@@ -257,7 +257,7 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 
 		if (g_ascii_strcasecmp (tag.get(), "img") == 0)
 		{
-			info->context |= EMBED_CONTEXT_IMAGE;
+			info->context |= EPHY_EMBED_CONTEXT_IMAGE;
 
 			nsEmbedString img;
 			nsCOMPtr <nsIDOMHTMLImageElement> image = 
@@ -274,7 +274,7 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 		}
 		else if (g_ascii_strcasecmp (tag.get(), "textarea") == 0)
 		{
-			info->context |= EMBED_CONTEXT_INPUT;
+			info->context |= EPHY_EMBED_CONTEXT_INPUT;
 		}
 		else if (g_ascii_strcasecmp (tag.get(), "object") == 0)
 		{
@@ -291,7 +291,7 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 			// MIME types are always lower case
 			if (g_str_has_prefix (cValue.get(), "image/"))
 			{
-				info->context |= EMBED_CONTEXT_IMAGE;
+				info->context |= EPHY_EMBED_CONTEXT_IMAGE;
 				
 				nsEmbedString img;
 				
@@ -306,7 +306,7 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 			}
 			else
 			{
-				info->context = EMBED_CONTEXT_NONE;
+				info->context = EPHY_EMBED_CONTEXT_NONE;
 				return NS_OK;
 			}
 		}
@@ -361,7 +361,7 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 
 			if (g_ascii_strcasecmp (cValue.get(), "simple") == 0)
 			{
-				info->context |= EMBED_CONTEXT_LINK;
+				info->context |= EPHY_EMBED_CONTEXT_LINK;
 				dom_elem->GetAttributeNS (nsEmbedString(xlinknsLiteral),
 							  nsEmbedString(hrefLiteral), value);
 				
@@ -410,13 +410,13 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 					if (NS_SUCCEEDED (rv) && unescapedHref.Length())
 					{
 						SetStringProperty ("email", unescapedHref.get());
-						info->context |= EMBED_CONTEXT_EMAIL_LINK;
+						info->context |= EPHY_EMBED_CONTEXT_EMAIL_LINK;
 					}
 				}
 				
 				if (anchor && tmp.Length()) 
 				{
-					info->context |= EMBED_CONTEXT_LINK;
+					info->context |= EPHY_EMBED_CONTEXT_LINK;
 
 					SetStringProperty ("link", tmp);
 					CheckLinkScheme (tmp);
@@ -473,12 +473,12 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 			}
 			else if (g_ascii_strcasecmp (tag.get(), "option") == 0)
 			{
-				info->context = EMBED_CONTEXT_NONE;
+				info->context = EPHY_EMBED_CONTEXT_NONE;
 				return NS_OK;
 			}
 			else if (g_ascii_strcasecmp (tag.get(), "area") == 0)
 			{
-				info->context |= EMBED_CONTEXT_LINK;
+				info->context |= EPHY_EMBED_CONTEXT_LINK;
 				nsCOMPtr <nsIDOMHTMLAreaElement> area =
 						do_QueryInterface(node, &rv);
 				if (NS_SUCCEEDED(rv) && area)
@@ -498,7 +498,7 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 			}
 			else if (g_ascii_strcasecmp (tag.get(), "textarea") == 0)
 			{
-				info->context |= EMBED_CONTEXT_INPUT;
+				info->context |= EPHY_EMBED_CONTEXT_INPUT;
 			}
 
 			if (!has_background)
@@ -763,7 +763,7 @@ nsresult EventContext::CheckInput (nsIDOMNode *aNode)
 
 	if (g_ascii_strcasecmp (value.get(), "image") == 0)
 	{
-		mEmbedEvent->context |= EMBED_CONTEXT_IMAGE;
+		mEmbedEvent->context |= EPHY_EMBED_CONTEXT_IMAGE;
 		nsCOMPtr<nsIDOMHTMLInputElement> input;
 		input = do_QueryInterface (aNode);
 		if (!input) return NS_ERROR_FAILURE;
@@ -785,7 +785,7 @@ nsresult EventContext::CheckInput (nsIDOMNode *aNode)
 		 g_ascii_strcasecmp (value.get(), "button") != 0 &&
 		 g_ascii_strcasecmp (value.get(), "checkbox") != 0)
 	{
-		mEmbedEvent->context |= EMBED_CONTEXT_INPUT;
+		mEmbedEvent->context |= EPHY_EMBED_CONTEXT_INPUT;
 	}
 
 	return NS_OK;
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index ced33dc71..23c48fcd7 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -104,7 +104,7 @@ MozDownload::Init(nsIURI *aSource, nsIURI *aTarget, const PRUnichar *aDisplayNam
 
 		flags = ephy_embed_persist_get_flags (EPHY_EMBED_PERSIST (mEmbedPersist));
 
-		addToView = !(flags & EMBED_PERSIST_NO_VIEW);
+		addToView = !(flags & EPHY_EMBED_PERSIST_NO_VIEW);
 	}
 
 	mSource = aSource;
@@ -312,7 +312,7 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
 	if (NS_FAILED(aStatus) && NS_SUCCEEDED(mStatus))
         	mStatus = aStatus;
 
-	if (aStateFlags & STATE_START)
+	if (aStateFlags & EPHY_EMBED_STATE_START)
 	{
 		mDownloadState = EPHY_DOWNLOAD_DOWNLOADING;
 
@@ -323,7 +323,7 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
 	}
 
 	/* We will get this even in the event of a cancel */
-	if (aStateFlags & STATE_STOP)
+	if (aStateFlags & EPHY_EMBED_STATE_STOP)
 	{
 		/* Keep us alive */
 		nsCOMPtr<nsIDownload> kungFuDeathGrip(this);
@@ -554,18 +554,18 @@ nsresult InitiateMozillaDownload (nsIDOMDocument *domDocument, nsIURI *sourceURI
 
 	PRInt32 flags = nsIWebBrowserPersist::PERSIST_FLAGS_REPLACE_EXISTING_FILES;
 
-	if (!domDocument && !isHTML && !(ephy_flags & EMBED_PERSIST_COPY_PAGE) &&
-	    !(ephy_flags & EMBED_PERSIST_DO_CONVERSION))
+	if (!domDocument && !isHTML && !(ephy_flags & EPHY_EMBED_PERSIST_COPY_PAGE) &&
+	    !(ephy_flags & EPHY_EMBED_PERSIST_DO_CONVERSION))
 	{
 		flags |= nsIWebBrowserPersist::PERSIST_FLAGS_NO_CONVERSION;
 	}
-	if (ephy_flags & EMBED_PERSIST_COPY_PAGE)
+	if (ephy_flags & EPHY_EMBED_PERSIST_COPY_PAGE)
 	{
 		flags |= nsIWebBrowserPersist::PERSIST_FLAGS_FROM_CACHE;
 	}
 	webPersist->SetPersistFlags(flags);
 
-	if (!domDocument || !isHTML || ephy_flags & EMBED_PERSIST_COPY_PAGE)
+	if (!domDocument || !isHTML || ephy_flags & EPHY_EMBED_PERSIST_COPY_PAGE)
 	{
 		rv = webPersist->SaveURI (sourceURI, aCacheKey, nsnull,
 					  postData, nsnull, inDestFile);
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index 5d8f9dc6c..f042f4cb9 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -153,7 +153,7 @@ impl_save (EphyEmbedPersist *persist)
 		      "max_size", &max_size,
 		      NULL);
 
-	g_return_val_if_fail (!(flags & EMBED_PERSIST_COPY_PAGE)
+	g_return_val_if_fail (!(flags & EPHY_EMBED_PERSIST_COPY_PAGE)
 			      || embed != NULL, FALSE);	
 
 	EphyBrowser *browser = NULL;
@@ -218,7 +218,7 @@ impl_save (EphyEmbedPersist *persist)
 	nsCOMPtr<nsIDOMDocument> DOMDocument;
 	if (!uri)
 	{		
-		if (flags & EMBED_PERSIST_MAINDOC)
+		if (flags & EPHY_EMBED_PERSIST_MAINDOC)
 		{
                 	browser->GetDocument (getter_AddRefs(DOMDocument));
 		}
@@ -241,7 +241,7 @@ impl_save (EphyEmbedPersist *persist)
 	 * the page, which will possibly give a different page than the original which we
 	 * need for view source
 	 */
-	NS_ENSURE_TRUE (!(flags & EMBED_PERSIST_COPY_PAGE) || pageDescriptor, FALSE);
+	NS_ENSURE_TRUE (!(flags & EPHY_EMBED_PERSIST_COPY_PAGE) || pageDescriptor, FALSE);
 
 	if (filename == NULL)
 	{
@@ -300,7 +300,7 @@ impl_to_string (EphyEmbedPersist *persist)
 	browser = (EphyBrowser *) _mozilla_embed_get_ephy_browser (MOZILLA_EMBED(embed));
 	g_assert (browser != NULL);
 
-	if (flags & EMBED_PERSIST_MAINDOC)
+	if (flags & EPHY_EMBED_PERSIST_MAINDOC)
 	{
 		rv = browser->GetDocument (getter_AddRefs(DOMDocument));
 	}
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 15ef2311c..7d6681fb4 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -637,7 +637,7 @@ impl_get_security_level (EphyEmbed *embed,
 {
 	MozillaEmbedPrivate *mpriv = MOZILLA_EMBED (embed)->priv;
 
-	if (level) *level = STATE_IS_UNKNOWN;
+	if (level) *level = EPHY_EMBED_STATE_IS_UNKNOWN;
 	if (description) *description = NULL;
 
 	nsresult rv;
@@ -836,7 +836,7 @@ mozilla_embed_net_state_all_cb (GtkMozEmbed *embed, const char *aURI,
                                 gint state, guint status, 
 				MozillaEmbed *membed)
 {
-	EphyEmbedNetState estate = EMBED_STATE_UNKNOWN;
+	EphyEmbedNetState estate = EPHY_EMBED_STATE_UNKNOWN;
 	int i;
 
 	struct
@@ -846,15 +846,15 @@ mozilla_embed_net_state_all_cb (GtkMozEmbed *embed, const char *aURI,
 	}
 	conversion_map [] =
 	{
-		{ GTK_MOZ_EMBED_FLAG_START, EMBED_STATE_START },
-		{ GTK_MOZ_EMBED_FLAG_STOP, EMBED_STATE_STOP },
-		{ GTK_MOZ_EMBED_FLAG_REDIRECTING, EMBED_STATE_REDIRECTING },
-		{ GTK_MOZ_EMBED_FLAG_TRANSFERRING, EMBED_STATE_TRANSFERRING },
-		{ GTK_MOZ_EMBED_FLAG_NEGOTIATING, EMBED_STATE_NEGOTIATING },
-		{ GTK_MOZ_EMBED_FLAG_IS_REQUEST, EMBED_STATE_IS_REQUEST },
-		{ GTK_MOZ_EMBED_FLAG_IS_DOCUMENT, EMBED_STATE_IS_DOCUMENT },
-		{ GTK_MOZ_EMBED_FLAG_IS_NETWORK, EMBED_STATE_IS_NETWORK },
-		{ 0, EMBED_STATE_UNKNOWN }
+		{ GTK_MOZ_EMBED_FLAG_START, EPHY_EMBED_STATE_START },
+		{ GTK_MOZ_EMBED_FLAG_STOP, EPHY_EMBED_STATE_STOP },
+		{ GTK_MOZ_EMBED_FLAG_REDIRECTING, EPHY_EMBED_STATE_REDIRECTING },
+		{ GTK_MOZ_EMBED_FLAG_TRANSFERRING, EPHY_EMBED_STATE_TRANSFERRING },
+		{ GTK_MOZ_EMBED_FLAG_NEGOTIATING, EPHY_EMBED_STATE_NEGOTIATING },
+		{ GTK_MOZ_EMBED_FLAG_IS_REQUEST, EPHY_EMBED_STATE_IS_REQUEST },
+		{ GTK_MOZ_EMBED_FLAG_IS_DOCUMENT, EPHY_EMBED_STATE_IS_DOCUMENT },
+		{ GTK_MOZ_EMBED_FLAG_IS_NETWORK, EPHY_EMBED_STATE_IS_NETWORK },
+		{ 0, EPHY_EMBED_STATE_UNKNOWN }
 	};
 
 	for (i = 0; conversion_map[i].state != 0; i++)
@@ -915,7 +915,7 @@ mozilla_embed_dom_key_down_cb (GtkMozEmbed *embed, gpointer dom_event,
 
 		if (info->modifier == GDK_CONTROL_MASK)
 		{
-			info->context = EMBED_CONTEXT_DOCUMENT;	
+			info->context = EPHY_EMBED_CONTEXT_DOCUMENT;	
 		}
 
 		nsCOMPtr<nsIDOMDocument> doc;
@@ -1105,25 +1105,25 @@ mozilla_embed_security_level (PRUint32 state)
 	switch (state)
         {
         case nsIWebProgressListener::STATE_IS_INSECURE:
-                level = STATE_IS_INSECURE;
+                level = EPHY_EMBED_STATE_IS_INSECURE;
                 break;
         case nsIWebProgressListener::STATE_IS_BROKEN:
-                level = STATE_IS_BROKEN;
+                level = EPHY_EMBED_STATE_IS_BROKEN;
                 break;
         case nsIWebProgressListener::STATE_IS_SECURE|
              nsIWebProgressListener::STATE_SECURE_HIGH:
-                level = STATE_IS_SECURE_HIGH;
+                level = EPHY_EMBED_STATE_IS_SECURE_HIGH;
                 break;
         case nsIWebProgressListener::STATE_IS_SECURE|
              nsIWebProgressListener::STATE_SECURE_MED:
-                level = STATE_IS_SECURE_MED;
+                level = EPHY_EMBED_STATE_IS_SECURE_MED;
                 break;
         case nsIWebProgressListener::STATE_IS_SECURE|
              nsIWebProgressListener::STATE_SECURE_LOW:
-                level = STATE_IS_SECURE_LOW;
+                level = EPHY_EMBED_STATE_IS_SECURE_LOW;
                 break;
         default:
-                level = STATE_IS_UNKNOWN;
+                level = EPHY_EMBED_STATE_IS_UNKNOWN;
                 break;
         }
 	return level;
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index a4ebdf9f5..cd64585c1 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -665,7 +665,7 @@ ephy_shell_new_tab (EphyShell *shell,
 	if (flags & EPHY_NEW_TAB_HOME_PAGE ||
 	    flags & EPHY_NEW_TAB_NEW_PAGE)
 	{
-		ephy_tab_set_location (tab, "", TAB_ADDRESS_EXPIRE_NEXT);
+		ephy_tab_set_location (tab, "", EPHY_TAB_ADDRESS_EXPIRE_NEXT);
 		toolbar_activate_location (toolbar);
 		load_homepage (embed);
 	}
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 72a55a227..63b28eda6 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -151,9 +151,9 @@ ephy_tab_address_expire_get_type (void)
 	{
 		static const GEnumValue values[] = 
                 {
-                   { TAB_ADDRESS_EXPIRE_NOW, "TAB_ADDRESS_EXPIRE_NOW", "expire-now" },
-                   { TAB_ADDRESS_EXPIRE_NEXT, "TAB_ADDRESS_EXPIRE_NEXT", "expire-next" },
-                   { TAB_ADDRESS_EXPIRE_CURRENT, "TAB_ADDRESS_EXPIRE_CURRENT", "expire-current" },
+                   { EPHY_TAB_ADDRESS_EXPIRE_NOW, "EPHY_TAB_ADDRESS_EXPIRE_NOW", "expire-now" },
+                   { EPHY_TAB_ADDRESS_EXPIRE_NEXT, "EPHY_TAB_ADDRESS_EXPIRE_NEXT", "expire-next" },
+                   { EPHY_TAB_ADDRESS_EXPIRE_CURRENT, "EPHY_TAB_ADDRESS_EXPIRE_CURRENT", "expire-current" },
                    { 0, NULL, NULL }
                 };
 		type = g_enum_register_static ("EphyTabAddressExpire", values);
@@ -170,9 +170,9 @@ ephy_tab_navigation_flags_get_type (void)
 	{
 		static const GFlagsValue values[] = 
                 {
-                   { TAB_NAV_UP, "TAB_NAV_UP", "up" },
-                   { TAB_NAV_BACK, "TAB_NAV_BACK", "back" },
-                   { TAB_NAV_FORWARD, "TAB_NAV_FORWARD", "forward" },
+                   { EPHY_TAB_NAV_UP, "EPHY_TAB_NAV_UP", "up" },
+                   { EPHY_TAB_NAV_BACK, "EPHY_TAB_NAV_BACK", "back" },
+                   { EPHY_TAB_NAV_FORWARD, "EPHY_TAB_NAV_FORWARD", "forward" },
                    { 0, NULL, NULL }
                 };
 		type = g_flags_register_static ("EphyTabNavigationFlags", values);
@@ -224,7 +224,7 @@ ephy_tab_set_property (GObject *object,
 	{
 		case PROP_ADDRESS:
 			ephy_tab_set_location (tab, g_value_get_string (value),
-					       TAB_ADDRESS_EXPIRE_NOW);
+					       EPHY_TAB_ADDRESS_EXPIRE_NOW);
 			break;
 		case PROP_POPUPS_ALLOWED:
 			ephy_tab_set_popups_allowed
@@ -410,7 +410,7 @@ ephy_tab_class_init (EphyTabClass *class)
 							    "Document Type",
 							    "The tab's documen type",
 							    EPHY_TYPE_EMBED_DOCUMENT_TYPE,
-							    EMBED_DOCUMENT_HTML,
+							    EPHY_EMBED_DOCUMENT_HTML,
 							    G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class,
@@ -462,7 +462,7 @@ ephy_tab_class_init (EphyTabClass *class)
 							    "Security Level",
 							    "The tab's security level",
 							    EPHY_TYPE_EMBED_SECURITY_LEVEL,
-							    STATE_IS_UNKNOWN,
+							    EPHY_EMBED_STATE_IS_UNKNOWN,
 							     G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class,
@@ -851,7 +851,7 @@ ephy_tab_set_load_status (EphyTab *tab, gboolean status)
 EphyEmbedDocumentType
 ephy_tab_get_document_type (EphyTab *tab)
 {
-	g_return_val_if_fail (EPHY_IS_TAB (tab), EMBED_DOCUMENT_OTHER);
+	g_return_val_if_fail (EPHY_IS_TAB (tab), EPHY_EMBED_DOCUMENT_OTHER);
 
 	return tab->priv->document_type;
 }
@@ -1078,9 +1078,9 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
 		uv_address = address;
 	}
 
-	if (tab->priv->address_expire == TAB_ADDRESS_EXPIRE_NOW)
+	if (tab->priv->address_expire == EPHY_TAB_ADDRESS_EXPIRE_NOW)
 	{
-		ephy_tab_set_location (tab, uv_address, TAB_ADDRESS_EXPIRE_NOW);
+		ephy_tab_set_location (tab, uv_address, EPHY_TAB_ADDRESS_EXPIRE_NOW);
 	}
 
 	ephy_tab_set_link_message (tab, NULL);
@@ -1226,32 +1226,32 @@ update_net_state_message (EphyTab *tab, const char *uri, EphyEmbedNetState flags
 	if (host == NULL || host[0] == '\0') goto out;
 
 	/* IS_REQUEST and IS_NETWORK can be both set */
-	if (flags & EMBED_STATE_IS_REQUEST)
+	if (flags & EPHY_EMBED_STATE_IS_REQUEST)
 	{
-		if (flags & EMBED_STATE_REDIRECTING)
+		if (flags & EPHY_EMBED_STATE_REDIRECTING)
 		{
 			msg = _("Redirecting to %s...");
 		}
-		else if (flags & EMBED_STATE_TRANSFERRING)
+		else if (flags & EPHY_EMBED_STATE_TRANSFERRING)
 		{
 			msg = _("Transferring data from %s...");
 		}
-		else if (flags & EMBED_STATE_NEGOTIATING)
+		else if (flags & EPHY_EMBED_STATE_NEGOTIATING)
 		{
 			msg = _("Waiting for authorization from %s...");
 		}
 	}
 
-	if (flags & EMBED_STATE_IS_NETWORK)
+	if (flags & EPHY_EMBED_STATE_IS_NETWORK)
 	{
-		if (flags & EMBED_STATE_START)
+		if (flags & EPHY_EMBED_STATE_START)
 		{
 			msg = _("Loading %s...");
 		}
 	}
 
-	if ((flags & EMBED_STATE_IS_NETWORK) &&
-	    (flags & EMBED_STATE_STOP))
+	if ((flags & EPHY_EMBED_STATE_IS_NETWORK) &&
+	    (flags & EPHY_EMBED_STATE_STOP))
 	{
 		g_free (tab->priv->status_message);
 		tab->priv->status_message = NULL;
@@ -1277,13 +1277,13 @@ build_progress_from_requests (EphyTab *tab, EphyEmbedNetState state)
 {
 	int load_percent;
 
-	if (state & EMBED_STATE_IS_REQUEST)
+	if (state & EPHY_EMBED_STATE_IS_REQUEST)
         {
-                if (state & EMBED_STATE_START)
+                if (state & EPHY_EMBED_STATE_START)
                 {
 			tab->priv->total_requests ++;
 		}
-		else if (state & EMBED_STATE_STOP)
+		else if (state & EPHY_EMBED_STATE_STOP)
 		{
 			tab->priv->cur_requests ++;
 		}
@@ -1299,9 +1299,9 @@ static void
 ensure_page_info (EphyTab *tab, EphyEmbed *embed, const char *address)
 {
 	if ((tab->priv->address == NULL || *tab->priv->address == '\0') &&
-	    tab->priv->address_expire == TAB_ADDRESS_EXPIRE_NOW)
+	    tab->priv->address_expire == EPHY_TAB_ADDRESS_EXPIRE_NOW)
         {
-		ephy_tab_set_location (tab, address, TAB_ADDRESS_EXPIRE_NOW);
+		ephy_tab_set_location (tab, address, EPHY_TAB_ADDRESS_EXPIRE_NOW);
 	}
 
 	if (tab->priv->title == NULL)
@@ -1318,9 +1318,9 @@ ephy_tab_net_state_cb (EphyEmbed *embed,
 {
 	update_net_state_message (tab, uri, state);
 
-	if (state & EMBED_STATE_IS_NETWORK)
+	if (state & EPHY_EMBED_STATE_IS_NETWORK)
 	{
-		if (state & EMBED_STATE_START)
+		if (state & EPHY_EMBED_STATE_START)
 		{
 			tab->priv->total_requests = 0;
 			tab->priv->cur_requests = 0;
@@ -1330,12 +1330,12 @@ ephy_tab_net_state_cb (EphyEmbed *embed,
 			ephy_tab_set_load_status (tab, TRUE);
 			ephy_tab_update_navigation_flags (tab, embed);
 		}
-		else if (state & EMBED_STATE_STOP)
+		else if (state & EPHY_EMBED_STATE_STOP)
 		{
 			ephy_tab_set_load_percent (tab, 100);
 			ephy_tab_set_load_status (tab, FALSE);
 			ephy_tab_update_navigation_flags (tab, embed);
-			tab->priv->address_expire = TAB_ADDRESS_EXPIRE_NOW;
+			tab->priv->address_expire = EPHY_TAB_ADDRESS_EXPIRE_NOW;
 		}
 	}
 
@@ -1564,12 +1564,12 @@ ephy_tab_dom_mouse_click_cb (EphyEmbed *embed,
 		eel_gconf_get_boolean (CONF_INTERFACE_MIDDLE_CLICK_OPEN_URL) &&
 		!eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_ARBITRARY_URL);
 
-	is_link = (context & EMBED_CONTEXT_LINK) != 0;
-	is_image = (context & EMBED_CONTEXT_IMAGE) != 0;
-	is_middle_clickable = !((context & EMBED_CONTEXT_LINK)
-				|| (context & EMBED_CONTEXT_INPUT)
-				|| (context & EMBED_CONTEXT_EMAIL_LINK));
-	is_input = (context & EMBED_CONTEXT_INPUT) != 0;
+	is_link = (context & EPHY_EMBED_CONTEXT_LINK) != 0;
+	is_image = (context & EPHY_EMBED_CONTEXT_IMAGE) != 0;
+	is_middle_clickable = !((context & EPHY_EMBED_CONTEXT_LINK)
+				|| (context & EPHY_EMBED_CONTEXT_INPUT)
+				|| (context & EPHY_EMBED_CONTEXT_EMAIL_LINK));
+	is_input = (context & EPHY_EMBED_CONTEXT_INPUT) != 0;
 
 	/* ctrl+click or middle click opens the link in new tab */
 	if (is_link && ((is_left_click && with_control) || is_middle_click))
@@ -1646,10 +1646,10 @@ ephy_tab_init (EphyTab *tab)
 	tab->priv->height = -1;
 	tab->priv->load_percent = 0;
 	tab->priv->load_status = FALSE;
-	tab->priv->security_level = STATE_IS_UNKNOWN;
-	tab->priv->document_type = EMBED_DOCUMENT_HTML;
+	tab->priv->security_level = EPHY_EMBED_STATE_IS_UNKNOWN;
+	tab->priv->document_type = EPHY_EMBED_DOCUMENT_HTML;
 	tab->priv->zoom = 1.0;
-	tab->priv->address_expire = TAB_ADDRESS_EXPIRE_NOW;
+	tab->priv->address_expire = EPHY_TAB_ADDRESS_EXPIRE_NOW;
 
 	embed = ephy_embed_factory_new_object (EPHY_TYPE_EMBED);
 	g_assert (embed != NULL);
@@ -1765,17 +1765,17 @@ ephy_tab_update_navigation_flags (EphyTab *tab, EphyEmbed *embed)
 
 	if (ephy_embed_can_go_up (embed))
 	{
-		flags |= TAB_NAV_UP;
+		flags |= EPHY_TAB_NAV_UP;
 	}
 
 	if (ephy_embed_can_go_back (embed))
 	{
-		flags |= TAB_NAV_BACK;
+		flags |= EPHY_TAB_NAV_BACK;
 	}
 
 	if (ephy_embed_can_go_forward (embed))
 	{
-		flags |= TAB_NAV_FORWARD;
+		flags |= EPHY_TAB_NAV_FORWARD;
 	}
 
 	if (flags != tab->priv->nav_flags)
@@ -1953,10 +1953,10 @@ ephy_tab_set_location (EphyTab *tab,
 	if (tab->priv->address) g_free (tab->priv->address);
 	tab->priv->address = g_strdup (address);
 
-	if (expire == TAB_ADDRESS_EXPIRE_CURRENT &&
+	if (expire == EPHY_TAB_ADDRESS_EXPIRE_CURRENT &&
 	    !tab->priv->load_status)
 	{
-		tab->priv->address_expire = TAB_ADDRESS_EXPIRE_NOW;
+		tab->priv->address_expire = EPHY_TAB_ADDRESS_EXPIRE_NOW;
 	}
 	else
 	{
@@ -1987,7 +1987,7 @@ ephy_tab_set_security_level (EphyTab *tab, EphyEmbedSecurityLevel level)
 EphyEmbedSecurityLevel
 ephy_tab_get_security_level (EphyTab *tab)
 {
-	g_return_val_if_fail (EPHY_IS_TAB (tab), STATE_IS_UNKNOWN);
+	g_return_val_if_fail (EPHY_IS_TAB (tab), EPHY_EMBED_STATE_IS_UNKNOWN);
 
 	return tab->priv->security_level;
 }
diff --git a/src/ephy-tab.h b/src/ephy-tab.h
index 261291eb5..f140d398a 100644
--- a/src/ephy-tab.h
+++ b/src/ephy-tab.h
@@ -44,16 +44,16 @@ typedef struct _EphyTabPrivate	EphyTabPrivate;
 
 typedef enum
 {
-	TAB_NAV_UP	= 1 << 0,
-	TAB_NAV_BACK	= 1 << 1,
-	TAB_NAV_FORWARD	= 1 << 2
+	EPHY_TAB_NAV_UP	= 1 << 0,
+	EPHY_TAB_NAV_BACK	= 1 << 1,
+	EPHY_TAB_NAV_FORWARD	= 1 << 2
 } EphyTabNavigationFlags;
 
 typedef enum
 {
-	TAB_ADDRESS_EXPIRE_NOW,
-	TAB_ADDRESS_EXPIRE_NEXT,
-	TAB_ADDRESS_EXPIRE_CURRENT
+	EPHY_TAB_ADDRESS_EXPIRE_NOW,
+	EPHY_TAB_ADDRESS_EXPIRE_NEXT,
+	EPHY_TAB_ADDRESS_EXPIRE_CURRENT
 } EphyTabAddressExpire;
 
 struct _EphyTab
diff --git a/src/ephy-window.c b/src/ephy-window.c
index abb509098..9b5ab4f69 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1221,8 +1221,8 @@ sync_tab_document_type (EphyTab *tab,
 	sync_tab_zoom (tab, NULL, window);
 	
 	type = ephy_tab_get_document_type (tab);
-	can_find = (type != EMBED_DOCUMENT_IMAGE);
-	enable = (type == EMBED_DOCUMENT_HTML);
+	can_find = (type != EPHY_EMBED_DOCUMENT_IMAGE);
+	enable = (type == EPHY_EMBED_DOCUMENT_HTML);
 
 	action_group = window->priv->action_group;
 	action = gtk_action_group_get_action (action_group, "ViewEncoding");
@@ -1307,15 +1307,15 @@ sync_tab_navigation (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 
 	flags = ephy_tab_get_navigation_flags (tab);
 
-	if (flags & TAB_NAV_UP)
+	if (flags & EPHY_TAB_NAV_UP)
 	{
 		up = TRUE;
 	}
-	if (flags & TAB_NAV_BACK)
+	if (flags & EPHY_TAB_NAV_BACK)
 	{
 		back = TRUE;
 	}
-	if (flags & TAB_NAV_FORWARD)
+	if (flags & EPHY_TAB_NAV_FORWARD)
 	{
 		forward = TRUE;
 	}
@@ -1358,25 +1358,25 @@ sync_tab_security (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 
 	switch (level)
 	{
-		case STATE_IS_UNKNOWN:
+		case EPHY_EMBED_STATE_IS_UNKNOWN:
 			state = _("Unknown");
 			break;
-		case STATE_IS_INSECURE:
+		case EPHY_EMBED_STATE_IS_INSECURE:
 			state = _("Insecure");
 			break;
-		case STATE_IS_BROKEN:
+		case EPHY_EMBED_STATE_IS_BROKEN:
 			state = _("Broken");
 			stock_id = STOCK_LOCK_BROKEN;
 			break;
-		case STATE_IS_SECURE_MED:
+		case EPHY_EMBED_STATE_IS_SECURE_MED:
 			state = _("Medium");
 			stock_id = STOCK_LOCK_SECURE;
 			break;
-		case STATE_IS_SECURE_LOW:
+		case EPHY_EMBED_STATE_IS_SECURE_LOW:
 			state = _("Low");
 			stock_id = STOCK_LOCK_SECURE;
 			break;
-		case STATE_IS_SECURE_HIGH:
+		case EPHY_EMBED_STATE_IS_SECURE_HIGH:
 			state = _("High");
 			stock_id = STOCK_LOCK_SECURE;
 			break;
@@ -1548,7 +1548,7 @@ sync_tab_zoom (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 
 	zoom = ephy_tab_get_zoom (tab);
 	type = ephy_tab_get_document_type (tab);
-	can_zoom = (type != EMBED_DOCUMENT_IMAGE);
+	can_zoom = (type != EPHY_EMBED_DOCUMENT_IMAGE);
 
 	if (zoom >= ZOOM_MAXIMAL)
 	{
@@ -1657,7 +1657,7 @@ update_popups_tooltips (EphyWindow *window, EphyEmbedEvent *event)
 
 	context = ephy_embed_event_get_context (event);
 
-	if (context & EMBED_CONTEXT_IMAGE)
+	if (context & EPHY_EMBED_CONTEXT_IMAGE)
 	{
 		ephy_embed_event_get_property (event, "image", &value);
 		name = get_name_from_address_value (value);
@@ -1686,7 +1686,7 @@ update_popups_tooltips (EphyWindow *window, EphyEmbedEvent *event)
 		g_free (name);
 	}
 
-	if (context & EMBED_CONTEXT_EMAIL_LINK)
+	if (context & EPHY_EMBED_CONTEXT_EMAIL_LINK)
 	{
 		ephy_embed_event_get_property (event, "link", &value);
 
@@ -1703,7 +1703,7 @@ update_popups_tooltips (EphyWindow *window, EphyEmbedEvent *event)
 		g_free (tooltip);
 	}
 
-	if (context & EMBED_CONTEXT_LINK)
+	if (context & EPHY_EMBED_CONTEXT_LINK)
 	{
 		ephy_embed_event_get_property (event, "link", &value);
 
@@ -1756,31 +1756,31 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
 
 	LOG ("show_embed_popup context %x", context)
 
-	if ((context & EMBED_CONTEXT_EMAIL_LINK) &&
-	    (context & EMBED_CONTEXT_IMAGE))
+	if ((context & EPHY_EMBED_CONTEXT_EMAIL_LINK) &&
+	    (context & EPHY_EMBED_CONTEXT_IMAGE))
 	{
 		popup = "/EphyImageEmailLinkPopup";
 	}
-	else if (context & EMBED_CONTEXT_EMAIL_LINK)
+	else if (context & EPHY_EMBED_CONTEXT_EMAIL_LINK)
 	{
 		popup = "/EphyEmailLinkPopup";
 		update_edit_actions_sensitivity (window, TRUE);
 	}
-	else if ((context & EMBED_CONTEXT_LINK) &&
-		 (context & EMBED_CONTEXT_IMAGE))
+	else if ((context & EPHY_EMBED_CONTEXT_LINK) &&
+		 (context & EPHY_EMBED_CONTEXT_IMAGE))
 	{
 		popup = "/EphyImageLinkPopup";
 	}
-	else if (context & EMBED_CONTEXT_LINK)
+	else if (context & EPHY_EMBED_CONTEXT_LINK)
 	{
 		popup = "/EphyLinkPopup";
 		update_edit_actions_sensitivity (window, TRUE);
 	}
-	else if (context & EMBED_CONTEXT_IMAGE)
+	else if (context & EPHY_EMBED_CONTEXT_IMAGE)
 	{
 		popup = "/EphyImagePopup";
 	}
-	else if (context & EMBED_CONTEXT_INPUT)
+	else if (context & EPHY_EMBED_CONTEXT_INPUT)
 	{
 		popup = "/EphyInputPopup";
 		update_edit_actions_sensitivity (window, FALSE);
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 7a95c7611..de08abed7 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -168,13 +168,13 @@ popup_cmd_copy_link_address (GtkAction *action,
 
 	context = ephy_embed_event_get_context (event);
 
-	if (context & EMBED_CONTEXT_EMAIL_LINK)
+	if (context & EPHY_EMBED_CONTEXT_EMAIL_LINK)
 	{
 		ephy_embed_event_get_property (event, "email", &value);
 		address = g_value_get_string (value);
 		popup_cmd_copy_to_clipboard (window, address);
 	}
-	else if (context & EMBED_CONTEXT_LINK)
+	else if (context & EPHY_EMBED_CONTEXT_LINK)
 	{
 		ephy_embed_event_get_property (event, "link", &value);
 		address = g_value_get_string (value);
@@ -209,7 +209,7 @@ save_property_url (GtkAction *action,
 	ephy_embed_persist_set_fc_title (persist, title);
 	ephy_embed_persist_set_fc_parent (persist, GTK_WINDOW (window));
 	ephy_embed_persist_set_flags
-		(persist, ask_dest ? EMBED_PERSIST_ASK_DESTINATION : 0);
+		(persist, ask_dest ? EPHY_EMBED_PERSIST_ASK_DESTINATION : 0);
 	ephy_embed_persist_set_persist_key
 		(persist, CONF_STATE_SAVE_DIR);
 	ephy_embed_persist_set_source (persist, location);
@@ -311,7 +311,7 @@ popup_cmd_set_image_as_background (GtkAction *action,
 
 	ephy_embed_persist_set_embed (persist, embed);
 	ephy_embed_persist_set_dest (persist, dest);
-	ephy_embed_persist_set_flags (persist, EMBED_PERSIST_NO_VIEW);
+	ephy_embed_persist_set_flags (persist, EPHY_EMBED_PERSIST_NO_VIEW);
 	ephy_embed_persist_set_source (persist, location);
 
 	g_signal_connect (persist, "completed",
@@ -450,7 +450,7 @@ save_temp_source (const char *address)
 		(ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST));
 
 	ephy_embed_persist_set_source (persist, address);
-	ephy_embed_persist_set_flags (persist, EMBED_PERSIST_NO_VIEW);
+	ephy_embed_persist_set_flags (persist, EPHY_EMBED_PERSIST_NO_VIEW);
 	ephy_embed_persist_set_dest (persist, tmp);
 
 	g_signal_connect (persist, "completed",
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index 9b2e6824b..f2637252c 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -280,7 +280,7 @@ toolbar_cmd_ppv_goto_first (GtkUIManager *merge,
 	embed = ephy_window_get_active_embed (window);
 	g_return_if_fail (EPHY_IS_EMBED (embed));
 
-	ephy_embed_print_preview_navigate (embed, PRINTPREVIEW_HOME, 0);
+	ephy_embed_print_preview_navigate (embed, EPHY_EMBED_PRINTPREVIEW_HOME, 0);
 
 	t->priv->current_page = 1;
 
@@ -298,7 +298,7 @@ toolbar_cmd_ppv_goto_last  (GtkUIManager *merge,
 	g_return_if_fail (embed != NULL);
 
 	ephy_embed_print_preview_navigate (embed,
-					   PRINTPREVIEW_END,
+					   EPHY_EMBED_PRINTPREVIEW_END,
 					   0);
 
 	t->priv->current_page = ephy_embed_print_preview_n_pages (embed);
@@ -334,7 +334,7 @@ toolbar_cmd_ppv_go_back  (GtkUIManager *merge,
 	t->priv->current_page = clamp_page_limits (t, t->priv->current_page - 1);
 
 	ephy_embed_print_preview_navigate (embed,
-					   PRINTPREVIEW_GOTO_PAGENUM,
+					   EPHY_EMBED_PRINTPREVIEW_GOTO_PAGENUM,
 					   t->priv->current_page);
 
 	toolbar_update_sensitivity (t);
@@ -353,7 +353,7 @@ toolbar_cmd_ppv_go_forward (GtkUIManager *merge,
 	t->priv->current_page = clamp_page_limits (t, t->priv->current_page + 1);
 
 	ephy_embed_print_preview_navigate (embed,
-					   PRINTPREVIEW_GOTO_PAGENUM,
+					   EPHY_EMBED_PRINTPREVIEW_GOTO_PAGENUM,
 					   t->priv->current_page);
 
 	toolbar_update_sensitivity (t);
diff --git a/src/toolbar.c b/src/toolbar.c
index ed24eb858..e0f4a7f09 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -302,7 +302,7 @@ sync_user_input_cb (EphyLocationAction *action, GParamSpec *pspec, Toolbar *t)
 	address = ephy_location_action_get_address (action);
 
 	t->priv->updating_address = TRUE;
-	ephy_tab_set_location (tab, address, TAB_ADDRESS_EXPIRE_CURRENT);
+	ephy_tab_set_location (tab, address, EPHY_TAB_ADDRESS_EXPIRE_CURRENT);
 	t->priv->updating_address = FALSE;
 }
 
diff --git a/src/window-commands.c b/src/window-commands.c
index ff48de257..080610438 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -402,7 +402,7 @@ window_cmd_file_save_as (GtkAction *action,
 	ephy_embed_persist_set_fc_title (persist, _("Save As"));
 	ephy_embed_persist_set_fc_parent (persist,GTK_WINDOW (window));
 	ephy_embed_persist_set_flags
-		(persist, EMBED_PERSIST_MAINDOC | EMBED_PERSIST_ASK_DESTINATION);
+		(persist, EPHY_EMBED_PERSIST_MAINDOC | EPHY_EMBED_PERSIST_ASK_DESTINATION);
 	ephy_embed_persist_set_persist_key
 		(persist, CONF_STATE_SAVE_DIR);
 
@@ -691,8 +691,8 @@ save_temp_source (EphyEmbed *embed)
 		(ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST));
 
 	ephy_embed_persist_set_embed (persist, embed);
-	ephy_embed_persist_set_flags (persist, EMBED_PERSIST_COPY_PAGE |
-				      EMBED_PERSIST_NO_VIEW);
+	ephy_embed_persist_set_flags (persist, EPHY_EMBED_PERSIST_COPY_PAGE |
+				      EPHY_EMBED_PERSIST_NO_VIEW);
 	ephy_embed_persist_set_dest (persist, tmp);
 
 	g_signal_connect (persist, "completed",