Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1434544 - When launching remote instance without profile name search for already running firefox instances, r=jhorak

Browse Source 
We don't have profile name available when running with default profile.
With this patch Firefox looks for existing DBus interfaces and tries to pick one
instead of creating a new instance.

MozReview-Commit-ID: 223rRcEvTWv

--HG--
extra : rebase_source : ba8fdd8447a8c66291b748fa0b71c975105b2662
This commit is contained in:
Martin Stransky 2018-02-02 13:54:31 +01:00
parent bee6a81087
commit 515ac7b992
2 changed files with 67 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
widget/xremoteclient/DBusRemoteClient.cpp
View File

@ -78,23 +78,72 @@ DBusRemoteClient::SendCommandLine (const char *aProgram, const char *aUsername,
return rv;
}
bool
DBusRemoteClient::GetRemoteDestinationName(const char *aProgram,
const char *aProfile,
nsCString &aDestinationName)
{
if(!aProfile || aProfile[0] == '\0') {
// We don't have a profile name - search for active mozilla instances.
RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
dbus_message_new_method_call("org.freedesktop.DBus",
"/org/freedesktop/DBus",
"org.freedesktop.DBus",
"ListNames"));
if (!msg) {
return false;
}
// send message and get a handle for a reply
RefPtr<DBusMessage> reply = already_AddRefed<DBusMessage>(
dbus_connection_send_with_reply_and_block(mConnection, msg, -1, nullptr));
if (!reply) {
return false;
}
char **interfaces;
dbus_int32_t interfaceNums;
if (!dbus_message_get_args(reply, nullptr, DBUS_TYPE_ARRAY,
DBUS_TYPE_STRING, &interfaces, &interfaceNums,
DBUS_TYPE_INVALID)) {
return false;
}
nsAutoCString destinationTemplate;
destinationTemplate = nsPrintfCString("org.mozilla.%s", aProgram);
aDestinationName.SetLength(0);
for (int i = 0; i < interfaceNums; i++) {
if (strstr(interfaces[i], destinationTemplate.get())) {
aDestinationName = interfaces[i];
break;
}
}
dbus_free_string_array(interfaces);
return (!aDestinationName.IsEmpty());
} else {
// We have a profile name - just create the destination.
// D-Bus names can contain only [a-z][A-Z][0-9]_
// characters so adjust the profile string properly.
nsAutoCString profileName;
nsresult rv = mozilla::Base64Encode(nsAutoCString(aProfile), profileName);
NS_ENSURE_SUCCESS(rv, false);
profileName.ReplaceChar("+/=", '_');
aDestinationName = nsPrintfCString("org.mozilla.%s.%s", aProgram,
profileName.get());
return true;
}
}
nsresult
DBusRemoteClient::DoSendDBusCommandLine(const char *aProgram, const char *aProfile,
const char* aBuffer, int aLength)
{
if(!aProfile || aProfile[0] == '\0') {
return NS_ERROR_INVALID_ARG;
}
// D-Bus names can contain only [a-z][A-Z][0-9]_
// characters so adjust the profile string properly.
nsAutoCString profileName;
nsresult rv = mozilla::Base64Encode(nsAutoCString(aProfile), profileName);
NS_ENSURE_SUCCESS(rv, rv);
profileName.ReplaceChar("+/=", '_');
nsAutoCString destinationName;
destinationName = nsPrintfCString("org.mozilla.%s.%s", aProgram, profileName.get());
if (!GetRemoteDestinationName(aProgram, aProfile, destinationName))
return NS_ERROR_FAILURE;
nsAutoCString pathName;
pathName = nsPrintfCString("/org/mozilla/%s/Remote", aProgram);

7
widget/xremoteclient/DBusRemoteClient.h
View File

@ -9,6 +9,7 @@
#include "nsRemoteClient.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/DBusHelpers.h"
#include "nsString.h"
class DBusRemoteClient : public nsRemoteClient
{
@ -25,7 +26,11 @@ public:
void Shutdown();
private:
nsresult DoSendDBusCommandLine(const char *aProgram, const char *aProfile,
bool GetRemoteDestinationName(const char *aProgram,
const char *aProfile,
nsCString &aDestinationName);
nsresult DoSendDBusCommandLine(const char *aProgram,
const char *aProfile,
const char* aBuffer, int aLength);
RefPtr<DBusConnection> mConnection;
};