aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-event.c16
-rw-r--r--embed/ephy-embed-event.h16
-rw-r--r--embed/ephy-embed-persist.c20
-rw-r--r--embed/ephy-embed-persist.h10
-rw-r--r--embed/ephy-embed.c52
-rw-r--r--embed/ephy-embed.h52
-rw-r--r--embed/ephy-favicon-cache.c4
-rw-r--r--embed/mozilla/EphyBrowser.cpp8
-rw-r--r--embed/mozilla/EphyHeaderSniffer.cpp2
-rw-r--r--embed/mozilla/EventContext.cpp28
-rw-r--r--embed/mozilla/MozDownload.cpp14
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp8
-rw-r--r--embed/mozilla/mozilla-embed.cpp36
13 files changed, 133 insertions, 133 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:48:13 +0800