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'

1 files changed, 8 insertions, 8 deletions

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)
         {