diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-11-08 00:12:02 +0300 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-11-08 00:22:07 +0300 |
| commit | aea290afd2d1dced9561e104d9e6bafbdff1775c (patch) | |
| tree | 88d9598f91f8ddef0823ffdaa1be5ccad5d35c32 | |
| parent | 2fda77e2a20462638f0314e5bd9dbcbfc98405a3 (diff) | |
Config: add UNIQUE_APPNAME variable
This also allows to change it at compile time.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config.h.in | 1 | ||||
| -rw-r--r-- | remmina/src/remmina.c | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3535f3d7e..c3cd22621 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,10 @@ if(NOT GIT_REVISION) endif() message(STATUS "Git Revision ${GIT_REVISION}") +if(NOT UNIQUE_APPNAME) + set(UNIQUE_APPNAME "org.Remmina") +endif() + if(NOT REMMINA_DATADIR) set(REMMINA_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}") endif() diff --git a/config.h.in b/config.h.in index 769295740..74feaf1be 100644 --- a/config.h.in +++ b/config.h.in @@ -16,6 +16,7 @@ #cmakedefine GTK_VERSION ${GTK_VERSION} #define remmina "remmina" +#define UNIQUE_APPNAME "${UNIQUE_APPNAME}" #define VERSION "${REMMINA_VERSION}" #define GIT_REVISION "${GIT_REVISION}" diff --git a/remmina/src/remmina.c b/remmina/src/remmina.c index 618548411..42c9bfe37 100644 --- a/remmina/src/remmina.c +++ b/remmina/src/remmina.c @@ -222,6 +222,7 @@ int main(int argc, char* argv[]) { TRACE_CALL("main"); GtkApplication *app; + const gchar *app_id; int status; gdk_set_allowed_backends("x11,broadway,quartz,wayland,mir"); @@ -249,7 +250,8 @@ int main(int argc, char* argv[]) gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif /* !HAVE_LIBGCRYPT */ - app = gtk_application_new("org.Remmina", G_APPLICATION_HANDLES_COMMAND_LINE); + app_id = g_application_id_is_valid(UNIQUE_APPNAME) ? UNIQUE_APPNAME : NULL; + app = gtk_application_new(app_id, G_APPLICATION_HANDLES_COMMAND_LINE); g_signal_connect(app, "startup", G_CALLBACK(remmina_on_startup), NULL); g_signal_connect(app, "command-line", G_CALLBACK(remmina_on_command_line), NULL); g_signal_connect(app, "handle-local-options", G_CALLBACK(remmina_on_local_cmdline), NULL); |