summaryrefslogtreecommitdiffstats
path: root/browser/components/shell/nsGNOMEShellService.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-11 13:01:08 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-11 13:01:08 +0100
commite45706ca3acbb6530419433212becc61d5953a2d (patch)
tree09839ca2d524b28c1cdab2349bcdbd938668f139 /browser/components/shell/nsGNOMEShellService.cpp
parent154d68048274383cbbff5412942ada5f88c152ca (diff)
downloadUXP-e45706ca3acbb6530419433212becc61d5953a2d.tar
UXP-e45706ca3acbb6530419433212becc61d5953a2d.tar.gz
UXP-e45706ca3acbb6530419433212becc61d5953a2d.tar.lz
UXP-e45706ca3acbb6530419433212becc61d5953a2d.tar.xz
UXP-e45706ca3acbb6530419433212becc61d5953a2d.zip
Un-fold browsercomps.* from libxul
This resolves #16.
Diffstat (limited to 'browser/components/shell/nsGNOMEShellService.cpp')
-rw-r--r--browser/components/shell/nsGNOMEShellService.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp
index f6c2613d4..1001a52ae 100644
--- a/browser/components/shell/nsGNOMEShellService.cpp
+++ b/browser/components/shell/nsGNOMEShellService.cpp
@@ -14,7 +14,7 @@
#include "nsDirectoryServiceDefs.h"
#include "nsIPrefService.h"
#include "prenv.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
#include "nsIGConfService.h"
#include "nsIGIOService.h"
#include "nsIGSettingsService.h"
@@ -70,16 +70,16 @@ static const MimeTypeAssociation appTypes[] = {
// GConf registry key constants
#define DG_BACKGROUND "/desktop/gnome/background"
-#define kDesktopImageKey DG_BACKGROUND "/picture_filename"
-#define kDesktopOptionsKey DG_BACKGROUND "/picture_options"
-#define kDesktopDrawBGKey DG_BACKGROUND "/draw_background"
-#define kDesktopColorKey DG_BACKGROUND "/primary_color"
+static const char kDesktopImageKey[] = DG_BACKGROUND "/picture_filename";
+static const char kDesktopOptionsKey[] = DG_BACKGROUND "/picture_options";
+static const char kDesktopDrawBGKey[] = DG_BACKGROUND "/draw_background";
+static const char kDesktopColorKey[] = DG_BACKGROUND "/primary_color";
-#define kDesktopBGSchema "org.gnome.desktop.background"
-#define kDesktopImageGSKey "picture-uri"
-#define kDesktopOptionGSKey "picture-options"
-#define kDesktopDrawBGGSKey "draw-background"
-#define kDesktopColorGSKey "primary-color"
+static const char kDesktopBGSchema[] = "org.gnome.desktop.background";
+static const char kDesktopImageGSKey[] = "picture-uri";
+static const char kDesktopOptionGSKey[] = "picture-options";
+static const char kDesktopDrawBGGSKey[] = "draw-background";
+static const char kDesktopColorGSKey[] = "primary-color";
nsresult
nsGNOMEShellService::Init()
@@ -508,8 +508,7 @@ static void
ColorToCString(uint32_t aColor, nsCString& aResult)
{
// The #rrrrggggbbbb format is used to match gdk_color_to_string()
- aResult.SetLength(13);
- char *buf = aResult.BeginWriting();
+ char *buf = aResult.BeginWriting(13);
if (!buf)
return;