packages: xulrunner/xulrunner-gtkmozembed.patch - update from FC

lisu lisu at pld-linux.org
Wed Sep 28 14:59:36 CEST 2011


Author: lisu                         Date: Wed Sep 28 12:59:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update from FC

---- Files affected:
packages/xulrunner:
   xulrunner-gtkmozembed.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/xulrunner/xulrunner-gtkmozembed.patch
diff -u packages/xulrunner/xulrunner-gtkmozembed.patch:1.4 packages/xulrunner/xulrunner-gtkmozembed.patch:1.5
--- packages/xulrunner/xulrunner-gtkmozembed.patch:1.4	Wed Sep 28 12:47:57 2011
+++ packages/xulrunner/xulrunner-gtkmozembed.patch	Wed Sep 28 14:59:31 2011
@@ -1,6 +1,6 @@
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/Makefile.in
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/Makefile.in.gtkmozembed	2011-06-22 12:14:58.776816358 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/Makefile.in	2011-06-22 12:14:58.776816358 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed	2011-09-02 14:32:09.591292225 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in	2011-09-02 14:32:09.591292225 +0200
 @@ -0,0 +1,54 @@
 +# 
 +# ***** BEGIN LICENSE BLOCK *****
@@ -56,9 +56,9 @@
 +endif
 +
 +include $(topsrcdir)/config/rules.mk
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed	2011-06-22 12:14:58.777816363 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp	2011-06-22 12:14:58.777816363 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed	2011-09-02 14:32:09.591292225 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp	2011-09-02 14:32:09.591292225 +0200
 @@ -0,0 +1,253 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */
@@ -313,9 +313,9 @@
 +  return NS_OK;
 +}
 +
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed	2011-06-22 12:14:58.778816368 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h	2011-06-22 12:14:58.778816368 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed	2011-09-02 14:32:09.591292225 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h	2011-09-02 14:32:09.591292225 +0200
 @@ -0,0 +1,84 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* vim:set ts=2 sw=2 sts=2 et cindent: */
@@ -401,9 +401,9 @@
 +  nsCOMPtr<nsIStringBundle> mPIPStringBundle;
 +};
 +#endif /* __EmbedCertificates_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed	2011-06-22 12:14:58.780816378 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp	2011-06-22 12:14:58.780816378 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed	2011-09-02 14:32:09.592292230 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp	2011-09-02 14:32:09.592292230 +0200
 @@ -0,0 +1,156 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -561,9 +561,9 @@
 +  return NS_ERROR_NOT_IMPLEMENTED;
 +}
 +
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed	2011-06-22 12:14:58.781816383 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.h	2011-06-22 12:14:58.781816383 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed	2011-09-02 14:32:09.593292235 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h	2011-09-02 14:32:09.593292235 +0200
 @@ -0,0 +1,66 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -631,9 +631,9 @@
 +};
 +
 +#endif /* __EmbedContentListener_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed	2011-06-22 12:14:58.783816393 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp	2011-06-22 12:14:58.783816393 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed	2011-09-02 14:32:09.594292240 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp	2011-09-02 14:32:09.594292240 +0200
 @@ -0,0 +1,618 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */
@@ -1253,9 +1253,9 @@
 +  mEmbedCtxType |= GTK_MOZ_EMBED_CTX_DOCUMENT;
 +  return NS_OK;
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed	2011-06-22 12:14:58.784816398 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.h	2011-06-22 12:14:58.784816398 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed	2011-09-02 14:32:09.595292245 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h	2011-09-02 14:32:09.595292245 +0200
 @@ -0,0 +1,101 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */
@@ -1358,9 +1358,9 @@
 +  nsString                mCtxDocTitle;
 +}; // class EmbedContextMenuInfo
 +#endif // EmbedContextMenuInfo_h__
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed	2011-06-22 12:14:58.787816413 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.cpp	2011-06-22 12:14:58.787816413 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed	2011-09-02 14:32:09.596292250 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp	2011-09-02 14:32:09.596292250 +0200
 @@ -0,0 +1,304 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -1666,9 +1666,9 @@
 +  }
 +  return NS_OK;
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed	2011-06-22 12:14:58.788816418 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.h	2011-06-22 12:14:58.789816423 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed	2011-09-02 14:32:09.596292250 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h	2011-09-02 14:32:09.596292250 +0200
 @@ -0,0 +1,90 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -1760,9 +1760,9 @@
 +};
 +
 +#endif /* __EmbedEventListener_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed	2011-06-22 12:14:58.790816428 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.cpp	2011-06-22 12:14:58.790816428 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed	2011-09-02 14:32:09.597292255 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp	2011-09-02 14:32:09.597292255 +0200
 @@ -0,0 +1,88 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* vim:set ts=2 sw=4 sts=2 tw=80 et cindent: */
@@ -1852,9 +1852,9 @@
 +  NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
 +  return docShell->GetContentViewer(aViewer);
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed	2011-06-22 12:14:58.791816433 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.h	2011-06-22 12:14:58.791816433 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed	2011-09-02 14:32:09.597292255 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h	2011-09-02 14:32:09.597292255 +0200
 @@ -0,0 +1,67 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* vim:set ts=2 sw=2 sts=2 et cindent: */
@@ -1923,9 +1923,9 @@
 +GetContentViewer(nsIWebBrowser *webBrowser, nsIContentViewer **aViewer);
 +
 +#endif /* __EmbedTools_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed	2011-06-22 12:14:58.793816443 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.cpp	2011-06-22 12:14:58.793816443 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed	2011-09-02 14:32:09.598292260 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp	2011-09-02 14:32:09.598292260 +0200
 @@ -0,0 +1,983 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -2033,7 +2033,7 @@
 +  NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
 +};
 +
-+static /*const*/ GTKEmbedDirectoryProvider kDirectoryProvider;
++static const GTKEmbedDirectoryProvider kDirectoryProvider;
 +
 +NS_IMPL_QUERY_INTERFACE2(GTKEmbedDirectoryProvider,
 +                         nsIDirectoryServiceProvider,
@@ -2910,10 +2910,10 @@
 +  gtk_widget_destroy(sOffscreenWindow);
 +  sOffscreenWindow = 0;
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed	2011-06-22 12:14:58.795816453 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h	2011-06-22 12:14:58.795816453 +0200
-@@ -0,0 +1,187 @@
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed	2011-09-02 14:32:09.598292260 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h	2011-09-02 15:25:27.671352254 +0200
+@@ -0,0 +1,188 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -2962,6 +2962,7 @@
 +// object.
 +#include "nsIWebBrowserChrome.h"
 +#include "nsIAppShell.h"
++#include "nsIDOMEventTarget.h"
 +#include "nsTArray.h"
 +
 +#include "gtkmozembedprivate.h"
@@ -3101,9 +3102,9 @@
 +};
 +
 +#endif /* __EmbedPrivate_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed	2011-06-22 12:14:58.796816458 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.cpp	2011-06-22 12:14:58.796816458 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed	2011-09-02 14:32:09.599292265 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp	2011-09-02 14:32:09.599292265 +0200
 @@ -0,0 +1,215 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3320,9 +3321,9 @@
 +  
 +  uri->GetSpec(aString);
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed	2011-06-22 12:14:58.798816468 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.h	2011-06-22 12:14:58.798816468 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed	2011-09-02 14:32:09.599292265 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h	2011-09-02 14:32:09.599292265 +0200
 @@ -0,0 +1,66 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3390,9 +3391,9 @@
 +};
 +
 +#endif /* __EmbedProgress_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed	2011-06-22 12:14:58.800816478 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.cpp	2011-06-22 12:14:58.800816478 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed	2011-09-02 14:32:09.599292265 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp	2011-09-02 14:32:09.599292265 +0200
 @@ -0,0 +1,411 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -3805,9 +3806,9 @@
 +        }
 +    }
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed	2011-06-22 12:14:58.801816483 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.h	2011-06-22 12:14:58.801816483 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed	2011-09-02 14:32:09.600292270 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h	2011-09-02 14:32:09.600292270 +0200
 @@ -0,0 +1,113 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -3922,9 +3923,9 @@
 +    GtkWidget   *mComboBox;
 +    GtkWidget   *mCheckBox;
 +};
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed	2011-06-22 12:14:58.803816493 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.cpp	2011-06-22 12:14:58.803816493 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed	2011-09-02 14:32:09.600292270 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp	2011-09-02 14:32:09.600292270 +0200
 @@ -0,0 +1,474 @@
 +/*
 + * vim:ts=2:et:sw=2
@@ -4400,9 +4401,9 @@
 +
 +  return rv;
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed	2011-06-22 12:14:58.806816508 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.cpp	2011-06-22 12:14:58.806816508 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed	2011-09-02 14:32:09.601292274 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp	2011-09-02 14:32:09.601292274 +0200
 @@ -0,0 +1,106 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4510,9 +4511,9 @@
 +
 +  return NS_ERROR_FAILURE;
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed	2011-06-22 12:14:58.807816513 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.h	2011-06-22 12:14:58.807816513 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed	2011-09-02 14:32:09.601292274 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h	2011-09-02 14:32:09.601292274 +0200
 @@ -0,0 +1,54 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4568,9 +4569,9 @@
 +};
 +
 +#endif /* __EmbedWindowCreator_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed	2011-06-22 12:14:58.805816503 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.h	2011-06-22 12:14:58.805816503 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed	2011-09-02 14:32:09.602292278 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h	2011-09-02 14:32:09.602292278 +0200
 @@ -0,0 +1,101 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4673,9 +4674,9 @@
 +  
 +
 +#endif /* __EmbedWindow_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed2.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed	2011-06-22 12:14:58.816816558 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed2.cpp	2011-06-22 12:14:58.816816558 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed	2011-09-02 14:32:09.603292283 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp	2011-09-02 14:32:09.603292283 +0200
 @@ -0,0 +1,1132 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -5809,9 +5810,9 @@
 +                aNewEmbed, aChromeFlags);
 +
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_glue.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed	2011-06-22 12:14:58.818816568 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_glue.cpp	2011-06-22 12:14:58.818816568 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed	2011-09-02 14:32:09.604292288 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp	2011-09-02 14:32:09.604292288 +0200
 @@ -0,0 +1,116 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -5929,9 +5930,9 @@
 +  return XPCOMGlueLoadXULFunctions(GtkSymbolsInternal);
 +}
 +
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed	2011-06-22 12:14:58.813816543 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed.h	2011-06-22 12:14:58.814816548 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed	2011-09-02 14:32:09.604292288 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h	2011-09-02 14:32:09.604292288 +0200
 @@ -0,0 +1,287 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6220,9 +6221,9 @@
 +#endif /* __cplusplus */
 +
 +#endif /* gtkmozembed_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_internal.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed	2011-06-22 12:14:58.820816578 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_internal.h	2011-06-22 12:14:58.821816583 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed	2011-09-02 14:32:09.605292293 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h	2011-09-02 14:32:09.605292293 +0200
 @@ -0,0 +1,70 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6294,9 +6295,9 @@
 +
 +#endif /* gtkmozembed_internal_h */
 +
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedmarshal.list
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed	2011-06-22 12:14:58.821816583 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedmarshal.list	2011-06-22 12:14:58.822816588 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed	2011-09-02 14:32:09.605292293 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list	2011-09-02 14:32:09.605292293 +0200
 @@ -0,0 +1,34 @@
 +BOOL:STRING
 +BOOL:STRING,STRING
@@ -6332,9 +6333,9 @@
 +BOOL:POINTER
 +VOID:POINTER
 +BOOL:STRING,STRING,POINTER
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedprivate.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed	2011-06-22 12:14:58.823816593 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedprivate.h	2011-06-22 12:14:58.823816593 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed	2011-09-02 14:32:09.606292298 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h	2011-09-02 14:32:09.606292298 +0200
 @@ -0,0 +1,91 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6427,9 +6428,9 @@
 +#endif /* __cplusplus */
 +
 +#endif /* gtkmozembedprivate_h */
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed	2011-06-22 12:14:58.809816523 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.cpp	2011-06-22 12:14:58.809816523 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed	2011-09-02 14:32:09.606292298 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp	2011-09-02 14:32:09.606292298 +0200
 @@ -0,0 +1,349 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -6780,9 +6781,9 @@
 +        NS_WARNING("Unexpected button flags");
 +    }
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.h
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed	2011-06-22 12:14:58.811816533 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.h	2011-06-22 12:14:58.811816533 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed	2011-09-02 14:32:09.607292303 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h	2011-09-02 14:32:09.607292303 +0200
 @@ -0,0 +1,59 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -6843,9 +6844,9 @@
 +    void GetButtonLabel(PRUint32 aFlags, PRUint32 aPos,
 +                        const PRUnichar* aStringValue, nsAString &aLabel);
 +};
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/Makefile.in
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/Makefile.in.gtkmozembed	2011-06-22 12:14:58.812816538 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/Makefile.in	2011-06-22 12:14:58.812816538 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed	2011-09-02 14:32:09.607292303 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in	2011-09-02 14:32:09.607292303 +0200
 @@ -0,0 +1,112 @@
 +# 
 +# ***** BEGIN LICENSE BLOCK *****
@@ -6959,9 +6960,9 @@
 +
 +GARBAGE += $(MARSHAL_FILE).h $(MARSHAL_FILE).c
 +
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/Makefile.in
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/Makefile.in.gtkmozembed	2011-06-22 12:14:58.824816598 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/Makefile.in	2011-06-22 12:14:58.824816598 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed	2011-09-02 14:32:09.607292303 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in	2011-09-02 14:32:09.607292303 +0200
 @@ -0,0 +1,101 @@
 +# 
 +# ***** BEGIN LICENSE BLOCK *****
@@ -7064,9 +7065,9 @@
 +DEFINES           += -D_TIME_H=1
 +endif
 +endif
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed	2011-06-22 12:14:58.828816618 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp	2011-06-22 12:14:58.829816623 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed	2011-09-02 14:32:09.608292308 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp	2011-09-02 14:32:09.608292308 +0200
 @@ -0,0 +1,185 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -7253,9 +7254,9 @@
 +  gtk_moz_embed_load_url(GTK_MOZ_EMBED(embed), text);
 +  g_free(text);
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbed.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed	2011-06-22 12:14:58.827816613 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbed.cpp	2011-06-22 12:14:58.827816613 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed	2011-09-02 14:32:09.608292308 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp	2011-09-02 14:32:09.608292308 +0200
 @@ -0,0 +1,1145 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -8402,9 +8403,9 @@
 +    gtk_widget_set_sensitive(browser->forwardButton, FALSE);
 + }
 +
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed	2011-06-22 12:14:58.831816633 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp	2011-06-22 12:14:58.831816633 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed	2011-09-02 14:32:09.609292313 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp	2011-09-02 14:32:09.609292313 +0200
 @@ -0,0 +1,142 @@
 +/** simplemdi.c **/
 +/*
@@ -8548,9 +8549,9 @@
 +    gtk_main_quit();
 +    return(0);
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed	2011-06-22 12:14:58.832816638 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp	2011-06-22 12:14:58.832816638 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed	2011-09-02 14:32:09.609292313 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp	2011-09-02 14:32:09.609292313 +0200
 @@ -0,0 +1,86 @@
 +#include <gtk/gtk.h>
 +#include <gtkmozembed.h>
@@ -8638,9 +8639,9 @@
 +	
 +	return 0;
 +}
-diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
---- xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed	2011-06-22 12:14:58.833816643 +0200
-+++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp	2011-06-22 12:14:58.833816643 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed	2011-09-02 14:32:09.609292313 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp	2011-09-02 14:32:09.609292313 +0200
 @@ -0,0 +1,109 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -8751,10 +8752,10 @@
 +    fprintf(stderr, "Can't fork.\n");
 +  }
 +}
-diff -up xulrunner-5.0/mozilla-release/toolkit/library/Makefile.in.gtkmozembed xulrunner-5.0/mozilla-release/toolkit/library/Makefile.in
---- xulrunner-5.0/mozilla-release/toolkit/library/Makefile.in.gtkmozembed	2011-06-15 23:58:10.000000000 +0200
-+++ xulrunner-5.0/mozilla-release/toolkit/library/Makefile.in	2011-06-22 12:19:35.677237033 +0200
-@@ -77,6 +77,8 @@ CPPSRCS += dlldeps-xul.cpp
+diff -up xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in
+--- xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed	2011-08-31 21:16:33.000000000 +0200
++++ xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in	2011-09-02 14:32:09.610292318 +0200
+@@ -75,6 +75,8 @@ CPPSRCS += dlldeps-xul.cpp
  endif
  
  ifneq (,$(MOZ_ENABLE_GTK2))
@@ -8763,11 +8764,11 @@
  DEFINES += -DMOZ_ENABLE_GTK2
  endif
  
-diff -up xulrunner-5.0/mozilla-release/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-5.0/mozilla-release/toolkit/toolkit-makefiles.sh
---- xulrunner-5.0/mozilla-release/toolkit/toolkit-makefiles.sh.gtkmozembed	2011-06-15 23:58:10.000000000 +0200
-+++ xulrunner-5.0/mozilla-release/toolkit/toolkit-makefiles.sh	2011-06-22 12:14:58.837816663 +0200
-@@ -554,6 +554,9 @@ MAKEFILES_embedding="
-   embedding/browser/activex/src/plugin/Makefile
+diff -up xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh
+--- xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed	2011-08-31 21:16:37.000000000 +0200
++++ xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh	2011-09-02 14:32:09.610292318 +0200
+@@ -560,6 +560,9 @@ MAKEFILES_embedding="
+   embedding/browser/Makefile
    embedding/browser/build/Makefile
    embedding/browser/webBrowser/Makefile
 +  embedding/browser/gtk/Makefile
@@ -8776,9 +8777,10 @@
    embedding/components/Makefile
    embedding/components/appstartup/Makefile
    embedding/components/appstartup/src/Makefile
---- xulrunner-6.0/mozilla/toolkit/toolkit-tiers.mk~	2011-08-27 14:43:16.000000000 +0300
-+++ xulrunner-6.0/mozilla/toolkit/toolkit-tiers.mk	2011-08-27 14:44:44.646149063 +0300
-@@ -226,6 +226,12 @@
+diff -up xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk
+--- xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed	2011-08-31 21:16:37.000000000 +0200
++++ xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk	2011-09-02 14:32:09.611292323 +0200
+@@ -226,6 +226,12 @@ endif
  
  tier_platform_dirs += services/crypto/component
  
@@ -8791,3 +8793,8 @@
  tier_platform_dirs += startupcache
  
  ifdef APP_LIBXUL_STATICDIRS
+@@ -272,4 +278,3 @@ tier_platform_dirs += testing/xpcshell 
+ tier_platform_dirs += testing/mozmill
+ tier_platform_dirs += testing/tools/screenshot
+ endif
+-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-gtkmozembed.patch?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list