diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-03-17 17:02:38 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-03-17 17:02:38 +0800 |
| commit | dbdcf80ba8e559236f9937aaafba1d14b1cee46e (patch) | |
| tree | d5711b633861b6ffc879fbbce08ea1364e9a64c9 /embed/mozilla/GlobalHistory.cpp | |
| parent | 9765279aba4cbed66b182e91eaa18e8225305a18 (diff) | |
| download | gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.gz gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.bz2 gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.lz gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.xz gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.zst gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.zip | |
merging pre-gnome-2-8 branch
Diffstat (limited to 'embed/mozilla/GlobalHistory.cpp')
| -rw-r--r-- | embed/mozilla/GlobalHistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp index a612fb3b6..b8b7a19e5 100644 --- a/embed/mozilla/GlobalHistory.cpp +++ b/embed/mozilla/GlobalHistory.cpp @@ -111,7 +111,7 @@ NS_IMETHODIMP MozGlobalHistory::IsVisited (const char *aURL, PRBool *_retval) NS_IMETHODIMP MozGlobalHistory::SetPageTitle (const char *aURL, const PRUnichar *aTitle) { - const nsACString &title = NS_ConvertUCS2toUTF8 (aTitle); + const nsACString &title = NS_ConvertUTF16toUTF8 (aTitle); ephy_history_set_page_title (mGlobalHistory, aURL, PromiseFlatCString(title).get()); @@ -159,7 +159,7 @@ NS_IMETHODIMP MozGlobalHistory::GetLastPageVisited(char **aLastPageVisited) } #endif -#if MOZILLA_SNAPSHOT > 8 && MOZILLA_SNAPSHOT < 14 +#if MOZILLA_SNAPSHOT < 14 NS_IMETHODIMP MozGlobalHistory::SetLastPageVisited(const char *aLastPageVisited) { return NS_ERROR_NOT_IMPLEMENTED; |