svnno****@sourc*****
svnno****@sourc*****
Sat Jan 5 19:59:46 JST 2008
Revision: 3345
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3345
Author: kous
Date: 2008-01-05 19:59:45 +0900 (Sat, 05 Jan 2008)
Log Message:
-----------
* module/embed/gecko/kz-mozhistorysearch.cpp: buildable.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.cpp
kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.h
kazehakase/trunk/module/embed/gecko/kz-mozhistorysearch.cpp
kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-01-05 10:18:19 UTC (rev 3344)
+++ kazehakase/trunk/ChangeLog 2008-01-05 10:59:45 UTC (rev 3345)
@@ -1,5 +1,7 @@
2008-01-05 Kouhei Sutou <kou****@cozmi*****>
+ * module/embed/gecko/kz-mozhistorysearch.cpp: buildable.
+
* module/embed/gecko/kz-mozwrapper.{cpp,h}: removing MozillaPrivate
dependency.
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.cpp 2008-01-05 10:18:19 UTC (rev 3344)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.cpp 2008-01-05 10:59:45 UTC (rev 3345)
@@ -162,12 +162,6 @@
return TRUE;
}
-const char *
-MozillaPrivate::Unescape(const char *text)
-{
- return (const char*)nsUnescape((char*)text);
-}
-
#ifdef MOZ_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_
#define KZ_CANVAS_WIDTH 1024
#define KZ_CANVAS_HEIGHT 800
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.h 2008-01-05 10:18:19 UTC (rev 3344)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.h 2008-01-05 10:59:45 UTC (rev 3345)
@@ -48,7 +48,6 @@
gboolean CreatePrintSettings (nsIPrintSettings **options);
GdkWindow *GetGdkWindow (nsIBaseWindow *window);
gboolean GetEventReceiver (nsIDOMWindow *domWindow, nsIDOMEventReceiver **receiver);
- const char *Unescape (const char *text);
#ifdef MOZ_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_
gboolean CreateThumbnail (nsIDOMWindow *domWindow,
const gchar *uri,
Modified: kazehakase/trunk/module/embed/gecko/kz-mozhistorysearch.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozhistorysearch.cpp 2008-01-05 10:18:19 UTC (rev 3344)
+++ kazehakase/trunk/module/embed/gecko/kz-mozhistorysearch.cpp 2008-01-05 10:59:45 UTC (rev 3345)
@@ -27,27 +27,27 @@
// Contributor(s):
// Pierre Phaneuf <pp****@ludus*****>
+#include "config.h"
+#include "kz-search.h"
+#include "kazehakase.h"
+#include <glib.h>
+
+#include <nsCOMPtr.h>
+#include <nsComponentManagerUtils.h>
#include <nsIURI.h>
#include <nsIIOService.h>
#include <nsCRT.h>
#include <nsIStorageStream.h>
#include <nsIOutputStream.h>
-#define MOZILLA_STRICT_API
-#include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#include <nsIComponentManager.h>
#include <nsNetCID.h>
#include <nsILocalFile.h>
#include <nsMemory.h>
-#include <glib.h>
-
#include "kz-mozhistorysearch.h"
#include "kz-mozutils.h"
-#include "MozillaPrivate.h"
-#include "config.h"
-#include "kz-search.h"
-#include "kazehakase.h"
+#include "utils.h"
static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
@@ -147,7 +147,7 @@
OpenStylesheet (nsIURI* uri, nsIChannel* *result)
{
nsresult rv;
- nsEmbedCString text, cssName;
+ nsCString text, cssName;
PRUint32 length;
rv = uri->GetPath(text);
@@ -157,7 +157,7 @@
text.get() + 5, NULL);
nsCOMPtr<nsILocalFile> cssFile;
- rv = NS_NewNativeLocalFile(nsEmbedCString(filename), PR_TRUE,
+ rv = NS_NewNativeLocalFile(nsCString(filename), PR_TRUE,
getter_AddRefs(cssFile));
g_free (filename);
@@ -165,7 +165,7 @@
rv = NS_NewFileURI(getter_AddRefs(cssURI), cssFile);
if (NS_FAILED(rv)) return rv;
- rv = NS_NewChannel(result, uri, nsEmbedCString("text/css"), nsnull);
+ rv = NS_NewChannel(result, uri, nsCString("text/css"), nsnull);
return rv;
}
@@ -174,7 +174,7 @@
OpenImage (nsIURI* uri, nsIChannel* *result)
{
nsresult rv;
- nsEmbedCString text;
+ nsCString text;
PRUint32 length;
rv = uri->GetPath(text);
@@ -183,7 +183,7 @@
gchar *filename = g_strndup(text.get() + 7, length - 7);
nsCOMPtr<nsILocalFile> cssFile;
- rv = NS_NewNativeLocalFile(nsEmbedCString(filename), PR_TRUE,
+ rv = NS_NewNativeLocalFile(nsCString(filename), PR_TRUE,
getter_AddRefs(cssFile));
g_free (filename);
@@ -191,7 +191,7 @@
rv = NS_NewFileURI(getter_AddRefs(cssURI), cssFile);
if (NS_FAILED(rv)) return rv;
- rv = NS_NewChannel(result, uri, nsEmbedCString("image/png"), nsnull);
+ rv = NS_NewChannel(result, uri, nsCString("image/png"), nsnull);
return rv;
}
@@ -200,7 +200,7 @@
KzMozHistorySearchProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
{
nsresult rv;
- nsEmbedCString text;
+ nsCString text;
rv = uri->GetPath(text);
if (NS_FAILED(rv)) return rv;
@@ -216,8 +216,7 @@
return rv;
}
- char *unescaped = nsCRT::strdup(text.get());
- unescaped = (char*)MozillaPrivate::Unescape(unescaped);
+ char *unescaped = url_decode(text.get());
nsCOMPtr<nsIStorageStream> sStream;
nsCOMPtr<nsIOutputStream> stream;
@@ -241,7 +240,7 @@
g_free(html);
}
- rv = NS_NewChannel(result, uri, nsEmbedCString("text/html"), nsnull);
+ rv = NS_NewChannel(result, uri, nsCString("text/html"), nsnull);
if (NS_FAILED(rv)) return rv;
return rv;
Modified: kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp 2008-01-05 10:18:19 UTC (rev 3344)
+++ kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp 2008-01-05 10:59:45 UTC (rev 3345)
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "kz-mozutils.h"
-
#define MOZILLA_INTERNAL_API
#include <nsIServiceManager.h>
#undef MOZILLA_INTERNAL_API
@@ -31,6 +29,7 @@
#include <nsEmbedString.h>
#undef MOZILLA_STRICT_API
+#include "kz-mozutils.h"
/*
* this codes was taken from embedding/browser/gtk/src/GtkPromptService.cpp