[kazehakase-svn] [3592] * module/embed/gecko/*: Workaround for Windows.

Back to archive index

svnno****@sourc***** svnno****@sourc*****
Thu Jan 29 14:48:48 JST 2009


Revision: 3592
          http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3592
Author:   ikezoe
Date:     2009-01-29 14:48:48 +0900 (Thu, 29 Jan 2009)

Log Message:
-----------
	* module/embed/gecko/*: Workaround for Windows.

Modified Paths:
--------------
    kazehakase/trunk/ChangeLog
    kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp
    kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.h
    kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedProgress.h
    kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.cpp
    kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.h
    kazehakase/trunk/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp
    kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
    kazehakase/trunk/module/embed/gecko/kz-mozutils.h
    kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
    kazehakase/trunk/module/embed/gecko/mozilla.cpp

Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/ChangeLog	2009-01-29 05:48:48 UTC (rev 3592)
@@ -1,6 +1,7 @@
 2009-01-29  Hiroyuki Ikezoe  <poinc****@ikezo*****>
 
 	* src/dialogs/kz-password-manager-dialog.c: Workaround fix on Windows.
+	* module/embed/gecko/*: Workaround for Windows.
 
 2009-01-27  Hiroyuki Ikezoe  <poinc****@ikezo*****>
 

Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp	2009-01-29 05:48:48 UTC (rev 3592)
@@ -19,6 +19,7 @@
  *   Christopher Blizzard <blizz****@mozil*****>
  */
 
+#include <mozilla-config.h>
 #include <nsServiceManagerUtils.h>
 #include <nsIComponentManager.h>
 
@@ -208,7 +209,7 @@
   mNavigation->SetSessionHistory(mSessionHistory);
 
   // create the window
-  mWindow->CreateWindow();
+  mWindow->CreateEmbedWindow();
 
   // bind the progress listener to the browser object
   nsCOMPtr<nsISupportsWeakReference> supportsWeak;

Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.h	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.h	2009-01-29 05:48:48 UTC (rev 3592)
@@ -22,6 +22,7 @@
 #ifndef __EmbedPrivate_h
 #define __EmbedPrivate_h
 
+#include <mozilla-config.h>
 #include <nsCOMPtr.h>
 #define MOZILLA_STRICT_API
 #include <nsEmbedString.h>

Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedProgress.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedProgress.h	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedProgress.h	2009-01-29 05:48:48 UTC (rev 3592)
@@ -22,6 +22,7 @@
 #ifndef __EmbedProgress_h
 #define __EmbedProgress_h
 
+#include <mozilla-config.h>
 #include <nsIWebProgressListener.h>
 #include <nsWeakReference.h>
 #include "EmbedPrivate.h"

Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.cpp	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.cpp	2009-01-29 05:48:48 UTC (rev 3592)
@@ -64,7 +64,7 @@
 }
 
 nsresult
-EmbedWindow::CreateWindow(void)
+EmbedWindow::CreateEmbedWindow(void)
 {
   nsresult rv;
   GtkWidget *ownerAsWidget = GTK_WIDGET(mOwner->mOwningWidget);

Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.h	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.h	2009-01-29 05:48:48 UTC (rev 3592)
@@ -54,7 +54,7 @@
   virtual ~EmbedWindow();
 
   nsresult Init            (EmbedPrivate *aOwner);
-  nsresult CreateWindow    (void);
+  nsresult CreateEmbedWindow (void);
   void     ReleaseChildren (void);
 
   NS_DECL_ISUPPORTS

Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp	2009-01-29 05:48:48 UTC (rev 3592)
@@ -306,26 +306,6 @@
         rv = EnsureProfileFileExists(localFile, domainDir);
     }
   }
-  else if (strcmp(prop, NS_APP_MAIL_50_DIR) == 0) {
-    rv = domainDir->Clone(getter_AddRefs(localFile));
-    if (NS_SUCCEEDED(rv))
-      rv = localFile->AppendNative(MAIL_DIR_50_NAME);
-  }
-  else if (strcmp(prop, NS_APP_IMAP_MAIL_50_DIR) == 0) {
-    rv = domainDir->Clone(getter_AddRefs(localFile));
-    if (NS_SUCCEEDED(rv))
-      rv = localFile->AppendNative(IMAP_MAIL_DIR_50_NAME);
-  }
-  else if (strcmp(prop, NS_APP_NEWS_50_DIR) == 0) {
-    rv = domainDir->Clone(getter_AddRefs(localFile));
-    if (NS_SUCCEEDED(rv))
-      rv = localFile->AppendNative(NEWS_DIR_50_NAME);
-  }
-  else if (strcmp(prop, NS_APP_MESSENGER_FOLDER_CACHE_50_DIR) == 0) {
-    rv = domainDir->Clone(getter_AddRefs(localFile));
-    if (NS_SUCCEEDED(rv))
-      rv = localFile->AppendNative(MSG_FOLDER_CACHE_DIR_50_NAME);
-  }
   else if (strcmp(prop, NS_APP_STORAGE_50_FILE) == 0) {
     rv = domainDir->Clone(getter_AddRefs(localFile));
     if (NS_SUCCEEDED(rv))
@@ -518,10 +498,6 @@
   (void) directoryService->Undefine(NS_APP_BOOKMARKS_50_FILE);
   (void) directoryService->Undefine(NS_APP_DOWNLOADS_50_FILE);
   (void) directoryService->Undefine(NS_APP_SEARCH_50_FILE);
-  (void) directoryService->Undefine(NS_APP_MAIL_50_DIR);
-  (void) directoryService->Undefine(NS_APP_IMAP_MAIL_50_DIR);
-  (void) directoryService->Undefine(NS_APP_NEWS_50_DIR);
-  (void) directoryService->Undefine(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR);
 
   return NS_OK;
 }

Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp	2009-01-29 05:48:48 UTC (rev 3592)
@@ -27,7 +27,6 @@
 
 #include <string.h>
 #include <math.h>
-#include <sys/utsname.h>
 #include <gtkmozembed.h>
 #include <gtkmozembed_internal.h>
 #include <glib/gi18n.h>

Modified: kazehakase/trunk/module/embed/gecko/kz-mozutils.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozutils.h	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/kz-mozutils.h	2009-01-29 05:48:48 UTC (rev 3592)
@@ -21,6 +21,7 @@
 #ifndef __KZ_MOZ_UTILS_H__
 #define __KZ_MOZ_UTILS_H__
 
+#include <mozilla-config.h>
 #include <gtk/gtk.h>
 #include <nsIServiceManager.h>
 #include <nsComponentManagerUtils.h>

Modified: kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp	2009-01-29 05:48:48 UTC (rev 3592)
@@ -33,6 +33,7 @@
 
 #define MOZILLA_CLIENT
 
+#include <mozilla-config.h>
 #include "kz-mozwrapper.h"
 #include <gtkmozembed_internal.h>
 
@@ -43,9 +44,11 @@
 #include <nsIDocShell.h>
 #include <nsIDocShellTreeItem.h>
 #include <nsIDocShellTreeOwner.h>
+#ifndef G_OS_WIN32
 #define nsAString_h___
 #include <nsIContent.h>
 #undef nsAString_h___
+#endif
 #define nsString_h___
 #include <nsIPrintOptions.h>
 #undef nsString_h___
@@ -94,11 +97,13 @@
 
 typedef nsString              nsAFlatString;
 typedef nsCString             nsAFlatCString;
+#ifndef G_OS_WIN32
 #  define nsString_h___
 #  define nsAString_h___
 #  include <nsPresContext.h>
 #  undef nsAString_h___
 #  undef nsString_h___
+#endif
 
 #include "kz-mozprogresslistener.h"
 #include "kz-mozutils.h"
@@ -2076,6 +2081,7 @@
 gboolean
 KzMozWrapper::GetRootRange (nsIDOMDocument *domDoc, nsIDOMRange *range)
 {
+#ifndef G_OS_WIN32
 	nsCOMPtr<nsIContent> rootContent;
 	nsCOMPtr<nsIDOMHTMLDocument> htmlDoc = do_QueryInterface(domDoc);
 	if (htmlDoc)
@@ -2099,6 +2105,9 @@
 	range->SetEnd(rootNode,childcount);
 
 	return TRUE;
+#else
+	return FALSE;
+#endif
 }
 
 gboolean
@@ -2107,6 +2116,7 @@
 				nsISelection *selection,
 				gboolean backward)
 {
+#ifndef G_OS_WIN32
 	nsCOMPtr<nsIContent> rootContent;
 	nsCOMPtr<nsIDOMHTMLDocument> htmlDoc = do_QueryInterface(domDoc);
 	if (htmlDoc)
@@ -2164,11 +2174,15 @@
 	}
 
 	return TRUE;
+#else
+	return FALSE;
+#endif
 }
 
 gboolean
 KzMozWrapper::SetZoomOnDocShell (float aZoom, nsIDocShell *DocShell)
 {
+#ifndef G_OS_WIN32
 	nsCOMPtr<nsPresContext> PresContext;
 	nsresult rv = DocShell->GetPresContext (getter_AddRefs(PresContext));
 	if (NS_FAILED(rv) || !PresContext) return FALSE;
@@ -2190,4 +2204,7 @@
 	if NS_FAILED(rv) return FALSE;
 	
 	return TRUE;
+#else
+	return FALSE;
+#endif
 }

Modified: kazehakase/trunk/module/embed/gecko/mozilla.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla.cpp	2009-01-29 00:49:38 UTC (rev 3591)
+++ kazehakase/trunk/module/embed/gecko/mozilla.cpp	2009-01-29 05:48:48 UTC (rev 3592)
@@ -32,7 +32,6 @@
 #include <nsIComponentRegistrar.h>
 #include <nsIComponentManager.h>
 #include <nsServiceManagerUtils.h>
-#include <sys/utsname.h>
 
 #include "mozilla.h"
 #include "mozilla-prefs.h"



More information about the Kazehakase-cvs mailing list
Back to archive index