forked from kiss-community/repo
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build
|
|
index d3bab6cf..656b32c7 100644
|
|
--- a/toolkit/components/remote/moz.build
|
|
+++ b/toolkit/components/remote/moz.build
|
|
@@ -26,7 +26,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
|
|
"nsUnixRemoteServer.h",
|
|
"RemoteUtils.h",
|
|
]
|
|
- else:
|
|
+ elif CONFIG["MOZ_X11"]:
|
|
SOURCES += [
|
|
"nsGTKRemoteServer.cpp",
|
|
"nsXRemoteClient.cpp",
|
|
diff --git a/toolkit/components/remote/nsRemoteService.cpp b/toolkit/components/remote/nsRemoteService.cpp
|
|
index 3bcf72a..e1b5323 100644
|
|
--- a/toolkit/components/remote/nsRemoteService.cpp
|
|
+++ b/toolkit/components/remote/nsRemoteService.cpp
|
|
@@ -7,12 +7,14 @@
|
|
|
|
|
|
#ifdef MOZ_WIDGET_GTK
|
|
-# ifdef MOZ_ENABLE_DBUS
|
|
+# if defined(MOZ_ENABLE_DBUS)
|
|
# include "nsDBusRemoteServer.h"
|
|
# include "nsDBusRemoteClient.h"
|
|
-# else
|
|
+# elif defined(MOZ_X11)
|
|
# include "nsGTKRemoteServer.h"
|
|
# include "nsXRemoteClient.h"
|
|
+# else
|
|
+# include "nsRemoteClient.h"
|
|
# endif
|
|
#elif defined(XP_WIN)
|
|
# include "nsWinRemoteServer.h"
|
|
@@ -95,8 +97,10 @@ RemoteResult nsRemoteService::StartClient(const char* aDesktopStartupID) {
|
|
#ifdef MOZ_WIDGET_GTK
|
|
# if defined(MOZ_ENABLE_DBUS)
|
|
client = MakeUnique<nsDBusRemoteClient>();
|
|
-# else
|
|
+# elif defined(MOZ_X11)
|
|
client = MakeUnique<nsXRemoteClient>();
|
|
+# else
|
|
+ return REMOTE_NOT_FOUND;
|
|
# endif
|
|
#elif defined(XP_WIN)
|
|
client = MakeUnique<nsWinRemoteClient>();
|
|
@@ -139,8 +143,10 @@ void nsRemoteService::StartupServer() {
|
|
#ifdef MOZ_WIDGET_GTK
|
|
# if defined(MOZ_ENABLE_DBUS)
|
|
mRemoteServer = MakeUnique<nsDBusRemoteServer>();
|
|
-# else
|
|
+# elif defined(MOZ_X11)
|
|
mRemoteServer = MakeUnique<nsGTKRemoteServer>();
|
|
+# else
|
|
+ return;
|
|
# endif
|
|
#elif defined(XP_WIN)
|
|
mRemoteServer = MakeUnique<nsWinRemoteServer>();
|