fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-04-04 14:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix D-Bus activation name

Browse Source 
Originally the App uses org.dharkael.Flameshot in D-Bus.
Since we have moved the project under organization, the
name we are using now should be org.flameshot.Flameshot.
This need to be kept unified across the whole project.

This fixes D-Bus invocation problem and should fixes: #850 .
This commit is contained in:
Boyuan Yang
2020-09-07 10:49:34 -04:00
committed by borgmanJeremy
parent 308be25c51
commit 18f18ce7ef
6 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main.cpp
View File

@@ -71,7 +71,7 @@ main(int argc, char* argv[])
app.installTranslator(&qtTranslator);
app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
app.setApplicationName(QStringLiteral("flameshot"));
app.setOrganizationName(QStringLiteral("Dharkael"));
app.setOrganizationName(QStringLiteral("flameshot"));
auto c = Controller::getInstance();
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
@@ -82,7 +82,7 @@ main(int argc, char* argv[])
QObject::tr("Unable to connect via DBus"));
}
dbus.registerObject(QStringLiteral("/"), c);
dbus.registerService(QStringLiteral("org.dharkael.Flameshot"));
dbus.registerService(QStringLiteral("org.flameshot.Flameshot"));
#endif
// Exporting captures must be connected after the dbus interface
// or the dbus signal gets blocked until we end the exports.
@@ -96,7 +96,7 @@ main(int argc, char* argv[])
* ------------*/
QCoreApplication app(argc, argv);
app.setApplicationName(QStringLiteral("flameshot"));
app.setOrganizationName(QStringLiteral("Dharkael"));
app.setOrganizationName(QStringLiteral("flameshot"));
app.setApplicationVersion(qApp->applicationVersion());
CommandLineParser parser;
// Add description
@@ -234,7 +234,7 @@ main(int argc, char* argv[])
if (parser.isSet(helpOption) || parser.isSet(versionOption)) {
} else if (parser.isSet(launcherArgument)) { // LAUNCHER
QDBusMessage m =
QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
QDBusMessage::createMethodCall(QStringLiteral("org.flameshot.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("openLauncher"));
@@ -254,7 +254,7 @@ main(int argc, char* argv[])
// Send message
QDBusMessage m =
QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
QDBusMessage::createMethodCall(QStringLiteral("org.flameshot.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("graphicCapture"));
@@ -302,7 +302,7 @@ main(int argc, char* argv[])
// Send message
QDBusMessage m =
QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
QDBusMessage::createMethodCall(QStringLiteral("org.flameshot.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("fullScreen"));
@@ -354,7 +354,7 @@ main(int argc, char* argv[])
// Send message
QDBusMessage m =
QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
QDBusMessage::createMethodCall(QStringLiteral("org.flameshot.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("captureScreen"));
@@ -383,11 +383,11 @@ main(int argc, char* argv[])
bool someFlagSet = (filename || tray || help || mainColor || contrastColor);
ConfigHandler config;
if (autostart) {
QDBusMessage m =
QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("autostartEnabled"));
QDBusMessage m = QDBusMessage::createMethodCall(
QStringLiteral("org.flameshot.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("autostartEnabled"));
if (parser.value(autostartOption) == QLatin1String("false")) {
m << false;
} else if (parser.value(autostartOption) == QLatin1String("true")) {
@@ -410,11 +410,11 @@ main(int argc, char* argv[])
.arg(fh.parsedPattern());
}
if (tray) {
QDBusMessage m =
QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("trayIconEnabled"));
QDBusMessage m = QDBusMessage::createMethodCall(
QStringLiteral("org.flameshot.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("trayIconEnabled"));
if (parser.value(trayOption) == QLatin1String("false")) {
m << false;
} else if (parser.value(trayOption) == QLatin1String("true")) {
@@ -447,11 +447,11 @@ main(int argc, char* argv[])
// Open gui when no options
if (!someFlagSet) {
QDBusMessage m =
QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("openConfig"));
QDBusMessage m = QDBusMessage::createMethodCall(
QStringLiteral("org.flameshot.Flameshot"),
QStringLiteral("/"),
QLatin1String(""),
QStringLiteral("openConfig"));
QDBusConnection sessionBus = QDBusConnection::sessionBus();
if (!sessionBus.isConnected()) {
SystemNotification().sendMessage(