aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--embed/mozilla/EphyUtils.cpp13
-rw-r--r--embed/mozilla/EphyUtils.h2
-rw-r--r--embed/mozilla/EventContext.cpp2
4 files changed, 9 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 1622b763d..18279216b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-05-14 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/EphyUtils.cpp:
+ * embed/mozilla/EphyUtils.h:
+ * embed/mozilla/EventContext.cpp:
+
+ Use nsAString::Equals.
+
+2006-05-14 Christian Persch <chpe@cvs.gnome.org>
+
* src/bookmarks/ephy-bookmarks.c: (resolve_cb),
(ephy_local_bookmarks_init), (ephy_local_bookmarks_stop):
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index 28286990a..60b5e01af 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -347,16 +347,3 @@ EphyUtils::CollatePrintSettings (EmbedPrintInfo *info,
return NS_OK;
}
-
-PRBool
-EphyUtils::StringEquals (nsAString &s1, nsAString &s2)
-{
- if (s1.Length() != s2.Length())
- {
- return FALSE;
- }
-
- return (memcmp (s1.BeginReading(),
- s2.BeginReading(),
- s2.Length() * sizeof (PRUnichar)) == 0);
-}
diff --git a/embed/mozilla/EphyUtils.h b/embed/mozilla/EphyUtils.h
index e11280add..cc607a9f9 100644
--- a/embed/mozilla/EphyUtils.h
+++ b/embed/mozilla/EphyUtils.h
@@ -63,8 +63,6 @@ namespace EphyUtils
nsresult CollatePrintSettings (_EmbedPrintInfo *info,
nsIPrintSettings *settings,
gboolean preview);
- PRBool StringEquals (nsAString &s1,
- nsAString &s2);
}
#endif
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 6c16ee047..dfb29dac6 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -350,7 +350,7 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
imgMapName.Cut (0,1);
// Check if the current image is attached to the map we are looking for
- if (EphyUtils::StringEquals(imgMapName, mapName))
+ if (imgMapName.Equals(mapName))
{
nsString imgSrc;
rv = img->GetSrc (imgSrc);