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_*.

8 files changed, 87 insertions, 87 deletions

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",