Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 821291 - Move libmozgnome into libxul. r=glandium,karlt

Browse Source 
--HG--
extra : commitid : 99eCKOxuHHi
extra : rebase_source : 7e148e7b3b72ffd4687df5ba342599c55fd41280
This commit is contained in:
Kit Cambridge 2015-11-24 12:16:33 -08:00
parent b8e5626be9
commit c7aea57412
14 changed files with 10 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
b2g/installer/package-manifest.in
View File

@ -716,11 +716,6 @@
@RESPATH@/components/PrivateBrowsing.manifest
@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
; GNOME hooks
#ifdef MOZ_ENABLE_GNOME_COMPONENT
@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
#endif
; Signed Packaged Content
@RESPATH@/components/InstallPackagedWebapp.manifest
@RESPATH@/components/InstallPackagedWebapp.js

4
browser/installer/Makefile.in
View File

@ -24,10 +24,6 @@ ifdef MOZ_DEBUG
DEFINES += -DMOZ_DEBUG=1
endif
ifdef MOZ_ENABLE_GNOME_COMPONENT
DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
endif
ifdef MOZ_WIDGET_GTK
DEFINES += -DMOZ_GTK=1
ifdef MOZ_ENABLE_GTK3

6
browser/installer/package-manifest.in
View File

@ -495,12 +495,6 @@
#ifdef XP_MACOSX
@RESPATH@/browser/components/SafariProfileMigrator.js
#endif
#ifdef MOZ_ENABLE_GNOME_COMPONENT
@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
#endif
#if defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT)
@RESPATH@/components/components.manifest
#endif
@RESPATH@/components/nsINIProcessor.manifest
@RESPATH@/components/nsINIProcessor.js
@RESPATH@/components/nsPrompter.manifest

10
configure.in
View File

@ -4702,16 +4702,6 @@ then
fi
AC_SUBST(MOZ_ENABLE_LIBPROXY)
dnl ========================================================
dnl = GNOME component (mozgnome)
dnl ========================================================
if test "$MOZ_ENABLE_GTK"
then
MOZ_ENABLE_GNOME_COMPONENT=1
fi
AC_SUBST(MOZ_ENABLE_GNOME_COMPONENT)
dnl ========================================================
dnl = libgnomeui support module
dnl ========================================================

5
mobile/android/b2gdroid/installer/package-manifest.in
View File

@ -477,11 +477,6 @@
@BINPATH@/components/url-classifier.xpt
#endif
; GNOME hooks
#ifdef MOZ_ENABLE_GNOME_COMPONENT
@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
#endif
; [Browser Chrome Files]
@BINPATH@/chrome/browser@JAREXT@
@BINPATH@/chrome/browser.manifest

5
mobile/android/installer/package-manifest.in
View File

@ -489,11 +489,6 @@
@BINPATH@/components/PrivateBrowsing.manifest
@BINPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
; GNOME hooks
#ifdef MOZ_ENABLE_GNOME_COMPONENT
@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
#endif
; [Browser Chrome Files]
@BINPATH@/chrome/browser@JAREXT@
@BINPATH@/chrome/browser.manifest

7
toolkit/system/gnome/moz.build
View File

@ -22,7 +22,7 @@ if CONFIG['MOZ_ENABLE_GIO']:
'nsPackageKitService.cpp'
]
XPCOMBinaryComponent('mozgnome')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/toolkit/components/build/',
@ -36,10 +36,5 @@ CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
if CONFIG['MOZ_ENABLE_GTK']:
CXXFLAGS += CONFIG['TK_CFLAGS']
OS_LIBS += CONFIG['MOZ_GCONF_LIBS']
OS_LIBS += CONFIG['GLIB_LIBS']
OS_LIBS += CONFIG['MOZ_GIO_LIBS']
OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']
if CONFIG['GNU_CXX']:
CXXFLAGS += ['-Wshadow']

1
toolkit/system/gnome/nsAlertsIconListener.cpp
View File

@ -12,6 +12,7 @@
#include "nsIImageToPixbuf.h"
#include "nsIStringBundle.h"
#include "nsIObserverService.h"
#include "nsIURI.h"
#include "nsCRT.h"
#include <dlfcn.h>

2
toolkit/system/gnome/nsAlertsIconListener.h
View File

@ -8,7 +8,7 @@
#include "nsCOMPtr.h"
#include "imgINotificationObserver.h"
#include "nsStringAPI.h"
#include "nsString.h"
#include "nsIObserver.h"
#include "nsWeakReference.h"

2
toolkit/system/gnome/nsGConfService.cpp
View File

@ -5,7 +5,7 @@
#include "mozilla/ArrayUtils.h"
#include "nsGConfService.h"
#include "nsStringAPI.h"
#include "nsString.h"
#include "nsCOMPtr.h"
#include "nsComponentManagerUtils.h"
#include "nsISupportsPrimitives.h"

4
toolkit/system/gnome/nsGIOService.cpp
View File

@ -4,7 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsGIOService.h"
#include "nsStringAPI.h"
#include "nsString.h"
#include "nsIURI.h"
#include "nsTArray.h"
#include "nsIStringEnumerator.h"
@ -69,7 +69,7 @@ NS_IMETHODIMP
nsGIOMimeApp::Launch(const nsACString& aUri)
{
GList uris = { 0 };
PromiseFlatCString flatUri(aUri);
nsPromiseFlatCString flatUri(aUri);
uris.data = const_cast<char*>(flatUri.get());
GError *error = nullptr;

2
toolkit/system/gnome/nsGSettingsService.cpp
View File

@ -6,7 +6,7 @@
#include "mozilla/ArrayUtils.h"
#include "nsGSettingsService.h"
#include "nsStringAPI.h"
#include "nsString.h"
#include "nsCOMPtr.h"
#include "nsMemory.h"
#include "prlink.h"

3
toolkit/system/gnome/nsPackageKitService.cpp
View File

@ -9,12 +9,13 @@
#include "nsIObserverService.h"
#include "nsISupportsPrimitives.h"
#include "nsPackageKitService.h"
#include "nsStringAPI.h"
#include "nsString.h"
#include "prlink.h"
#include "mozilla/unused.h"
#include <glib.h>
#include <glib-object.h>
#include <limits>
using namespace mozilla;

2
toolkit/toolkit.mozbuild
View File

@ -155,7 +155,7 @@ DIRS += [
'/toolkit/library',
]
if CONFIG['MOZ_ENABLE_GNOME_COMPONENT']:
if CONFIG['MOZ_ENABLE_GTK']:
DIRS += ['/toolkit/system/gnome']
DIRS += ['/addon-sdk']