b=609784 rename DBus Notifications nsAlertsService to resolve collision with XP service r=roc
authorKarl Tomlinson <karlt+@karlt.net>
Fri, 15 Feb 2013 12:02:08 +1300
changeset 122371 0de2844c2c7bc87198e49c7ed2dd3d5d06d920c1
parent 122370 a911d160ec6b5a8953093aaad1facd363c62de0d
child 122372 44bddad4185a20ed7136d4164e6dedba794d23ff
push id23259
push userktomlinson@mozilla.com
push dateTue, 19 Feb 2013 22:23:06 +0000
treeherdermozilla-inbound@fba3a342a530 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs609784
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
b=609784 rename DBus Notifications nsAlertsService to resolve collision with XP service r=roc
toolkit/system/gnome/Makefile.in
toolkit/system/gnome/nsAlertsService.cpp
toolkit/system/gnome/nsAlertsService.h
toolkit/system/gnome/nsGnomeModule.cpp
toolkit/system/gnome/nsSystemAlertsService.cpp
toolkit/system/gnome/nsSystemAlertsService.h
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@@ -13,17 +13,17 @@ MODULE		= mozgnome
 LIBRARY_NAME	= mozgnome
 FORCE_SHARED_LIB = 1
 IS_COMPONENT	= 1
 FAIL_ON_WARNINGS = 1
 
 
 CPPSRCS = \
   nsGnomeModule.cpp \
-  nsAlertsService.cpp \
+  nsSystemAlertsService.cpp \
   nsAlertsIconListener.cpp \
   $(NULL)
 
 ifdef MOZ_ENABLE_GCONF
 CPPSRCS += \
   nsGConfService.cpp \
   $(NULL)
 endif
--- a/toolkit/system/gnome/nsGnomeModule.cpp
+++ b/toolkit/system/gnome/nsGnomeModule.cpp
@@ -17,18 +17,18 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGC
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init)
 #endif
 #ifdef MOZ_ENABLE_GIO
 #include "nsGIOService.h"
 #include "nsGSettingsService.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
 #endif
-#include "nsAlertsService.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAlertsService, Init)
+#include "nsSystemAlertsService.h"
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init)
 
 #ifdef MOZ_ENABLE_GCONF
 NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID);
 #endif
 #ifdef MOZ_ENABLE_GNOMEVFS
 NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID);
 #endif
 #ifdef MOZ_ENABLE_GIO
@@ -44,17 +44,17 @@ static const mozilla::Module::CIDEntry k
 #endif
 #ifdef MOZ_ENABLE_GNOMEVFS
   { &kNS_GNOMEVFSSERVICE_CID, false, NULL, nsGnomeVFSServiceConstructor },
 #endif
 #ifdef MOZ_ENABLE_GIO
   { &kNS_GIOSERVICE_CID, false, NULL, nsGIOServiceConstructor },
   { &kNS_GSETTINGSSERVICE_CID, false, NULL, nsGSettingsServiceConstructor },
 #endif
-  { &kNS_SYSTEMALERTSSERVICE_CID, false, NULL, nsAlertsServiceConstructor },
+  { &kNS_SYSTEMALERTSSERVICE_CID, false, NULL, nsSystemAlertsServiceConstructor },
   { NULL }
 };
 
 static const mozilla::Module::ContractIDEntry kGnomeContracts[] = {
 #ifdef MOZ_ENABLE_GCONF
   { NS_GCONFSERVICE_CONTRACTID, &kNS_GCONFSERVICE_CID },
 #endif
 #ifdef MOZ_ENABLE_GNOMEVFS
rename from toolkit/system/gnome/nsAlertsService.cpp
rename to toolkit/system/gnome/nsSystemAlertsService.cpp
--- a/toolkit/system/gnome/nsAlertsService.cpp
+++ b/toolkit/system/gnome/nsSystemAlertsService.cpp
@@ -1,42 +1,45 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsAlertsService.h"
+#include "nsSystemAlertsService.h"
 #include "nsAlertsIconListener.h"
 #include "nsAutoPtr.h"
 
-NS_IMPL_THREADSAFE_ADDREF(nsAlertsService)
-NS_IMPL_THREADSAFE_RELEASE(nsAlertsService)
+NS_IMPL_THREADSAFE_ADDREF(nsSystemAlertsService)
+NS_IMPL_THREADSAFE_RELEASE(nsSystemAlertsService)
 
-NS_INTERFACE_MAP_BEGIN(nsAlertsService)
+NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService)
    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService)
    NS_INTERFACE_MAP_ENTRY(nsIAlertsService)
 NS_INTERFACE_MAP_END_THREADSAFE
 
-nsAlertsService::nsAlertsService()
+nsSystemAlertsService::nsSystemAlertsService()
 {}
 
-nsAlertsService::~nsAlertsService()
+nsSystemAlertsService::~nsSystemAlertsService()
 {}
 
 nsresult
-nsAlertsService::Init()
+nsSystemAlertsService::Init()
 {
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, 
-                                                     const nsAString & aAlertText, bool aAlertTextClickable,
-                                                     const nsAString & aAlertCookie,
-                                                     nsIObserver * aAlertListener,
-                                                     const nsAString & aAlertName)
+NS_IMETHODIMP
+nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl,
+                                             const nsAString & aAlertTitle, 
+                                             const nsAString & aAlertText,
+                                             bool aAlertTextClickable,
+                                             const nsAString & aAlertCookie,
+                                             nsIObserver * aAlertListener,
+                                             const nsAString & aAlertName)
 {
   nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener();
   if (!alertListener)
     return NS_ERROR_OUT_OF_MEMORY;
 
   return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
                                        aAlertCookie, aAlertListener);
 }
rename from toolkit/system/gnome/nsAlertsService.h
rename to toolkit/system/gnome/nsSystemAlertsService.h
--- a/toolkit/system/gnome/nsAlertsService.h
+++ b/toolkit/system/gnome/nsSystemAlertsService.h
@@ -1,27 +1,27 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef nsAlertsService_h__
-#define nsAlertsService_h__
+#ifndef nsSystemAlertsService_h__
+#define nsSystemAlertsService_h__
 
 #include "nsIAlertsService.h"
 #include "nsCOMPtr.h"
 
-class nsAlertsService : public nsIAlertsService
+class nsSystemAlertsService : public nsIAlertsService
 {
 public:
   NS_DECL_NSIALERTSSERVICE
   NS_DECL_ISUPPORTS
 
-  nsAlertsService();
-  virtual ~nsAlertsService();
+  nsSystemAlertsService();
+  virtual ~nsSystemAlertsService();
 
   nsresult Init();
 
 protected:
 
 };
 
-#endif /* nsAlertsService_h__ */
+#endif /* nsSystemAlertsService_h__ */