aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-09-27 00:50:32 +0800
committerChristian Persch <chpe@src.gnome.org>2004-09-27 00:50:32 +0800
commitd66a3acaab3c670737d59d002186881855aa582a (patch)
tree27fdd6976ed8865030ec07449d06185f86a50d7a /embed/mozilla
parent3a641a3b7a25d5ae85eaf5c3f1911c6033ea1e15 (diff)
downloadgsoc2013-epiphany-d66a3acaab3c670737d59d002186881855aa582a.tar
gsoc2013-epiphany-d66a3acaab3c670737d59d002186881855aa582a.tar.gz
gsoc2013-epiphany-d66a3acaab3c670737d59d002186881855aa582a.tar.bz2
gsoc2013-epiphany-d66a3acaab3c670737d59d002186881855aa582a.tar.lz
gsoc2013-epiphany-d66a3acaab3c670737d59d002186881855aa582a.tar.xz
gsoc2013-epiphany-d66a3acaab3c670737d59d002186881855aa582a.tar.zst
gsoc2013-epiphany-d66a3acaab3c670737d59d002186881855aa582a.zip
Fix compiler warnings.
2004-09-26 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EventContext.cpp: * embed/mozilla/GtkNSSDialogs.cpp: * embed/mozilla/mozilla-notifiers.cpp: * lib/egg/eggtrayicon.h: Fix compiler warnings. * src/ephy-window.c: (hide_embed_popup_cb), (show_embed_popup): Fix a signal leak.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/EphyBrowser.cpp8
-rw-r--r--embed/mozilla/EventContext.cpp2
-rw-r--r--embed/mozilla/GtkNSSDialogs.cpp6
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp2
4 files changed, 8 insertions, 10 deletions
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 77a2ed9eb..655c3b110 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -124,12 +124,12 @@ EphyFaviconEventListener::HandleFaviconLink (nsIDOMNode *node)
g_ascii_strcasecmp (rel.get(), "ICON") == 0)
{
PRUnichar hrefAttr[] = { 'h', 'r', 'e', 'f', '\0' };
- nsEmbedString value;
- rv = linkElement->GetAttribute (nsEmbedString (hrefAttr), value);
- if (NS_FAILED (rv) || !value.Length()) return NS_ERROR_FAILURE;
+ nsEmbedString hrefValue;
+ rv = linkElement->GetAttribute (nsEmbedString (hrefAttr), hrefValue);
+ if (NS_FAILED (rv) || !hrefValue.Length()) return NS_ERROR_FAILURE;
nsEmbedCString link;
- NS_UTF16ToCString (value, NS_CSTRING_ENCODING_UTF8, link);
+ NS_UTF16ToCString (hrefValue, NS_CSTRING_ENCODING_UTF8, link);
nsCOMPtr<nsIDOMDocument> domDoc;
node->GetOwnerDocument(getter_AddRefs(domDoc));
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index c3891bc5f..dbe89959b 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -142,7 +142,6 @@ nsresult EventContext::GatherTextUnder (nsIDOMNode* aNode, nsAString& aResult)
}
else
{
- nsCOMPtr<nsIDOMNode> nextSibling;
parentNode->GetNextSibling(getter_AddRefs(nextSibling));
node = nextSibling;
depth--;
@@ -371,7 +370,6 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
}
}
- PRUint16 type;
rv = node->GetNodeType(&type);
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 2d49de941..1f8926760 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -1349,11 +1349,11 @@ GtkNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx,
text = _("Could not verify this certificate for unknown reasons.");
}
- char *msg = g_strdup_printf ("<b>%s</b>", text);
+ char *vmsg = g_strdup_printf ("<b>%s</b>", text);
widget = glade_xml_get_widget (gxml, "label_verify_text");
g_return_val_if_fail (GTK_IS_LABEL (widget), NS_ERROR_FAILURE);
- gtk_label_set_markup (GTK_LABEL (widget), msg);
- g_free (msg);
+ gtk_label_set_markup (GTK_LABEL (widget), vmsg);
+ g_free (vmsg);
if (count > 0)
{
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index c00a18b6f..efb2f731d 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -757,7 +757,7 @@ get_system_language ()
if (sys_langs)
{
- char *lang = (char *)sys_langs->data;
+ lang = (char *)sys_langs->data;
/* FIXME this probably need to be smarter */
/* FIXME this can be up to 8 chars, not just 2 */