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'

4 files changed, 34 insertions, 34 deletions

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;