aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/mozilla-embed.cpp
diff options
context:
space:
mode:
authorCrispin Flowerday <gnome@flowerday.cx>2005-01-06 04:09:09 +0800
committerChristian Persch <chpe@src.gnome.org>2005-01-06 04:09:09 +0800
commita5d0e720fade615d0009a42d38b195a2db57b959 (patch)
tree680971bcad3fb63c103cdb282eba881d82aad6ba /embed/mozilla/mozilla-embed.cpp
parent41e8ca8d5152c7acf6e39070b49c8f3715110e8d (diff)
downloadgsoc2013-epiphany-a5d0e720fade615d0009a42d38b195a2db57b959.tar
gsoc2013-epiphany-a5d0e720fade615d0009a42d38b195a2db57b959.tar.gz
gsoc2013-epiphany-a5d0e720fade615d0009a42d38b195a2db57b959.tar.bz2
gsoc2013-epiphany-a5d0e720fade615d0009a42d38b195a2db57b959.tar.lz
gsoc2013-epiphany-a5d0e720fade615d0009a42d38b195a2db57b959.tar.xz
gsoc2013-epiphany-a5d0e720fade615d0009a42d38b195a2db57b959.tar.zst
gsoc2013-epiphany-a5d0e720fade615d0009a42d38b195a2db57b959.zip
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_*.
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
-rw-r--r--embed/mozilla/mozilla-embed.cpp36
1 files changed, 18 insertions, 18 deletions
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;