diff options
| author | ZenWalker <[email protected]> | 2016-08-29 02:12:19 +0200 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-10-19 16:49:16 +0300 |
| commit | 1ff030a2b103dfe68a8de8259c33808bc011d941 (patch) | |
| tree | efc531fcdd023caaabf6484c4dd11b11dfb39906 /mate-volume-control/applet-main.c | |
| parent | a3376784919d0acccf77d4747e3124ce57b88d0c (diff) | |
| download | mate-media-1ff030a2b103dfe68a8de8259c33808bc011d941.tar.bz2 mate-media-1ff030a2b103dfe68a8de8259c33808bc011d941.tar.xz | |
Port from libunique to GApplication and GtkApplication
applet-main.c: gtk2 and gtk3
Port to Gapplication based on this gnome-media commits:
https://github.com/GNOME/gnome-media/commit/7b5a8127cea09779dd172b0b7598d2ad03b2e47b
https://github.com/GNOME/gnome-media/commit/7283e156e0ea1b2d19292a97104b3ad49fc9e693
dialog-main.c: gtk3
Port to Gapplication and GtkApplication
I did this implementation
Fixes #77
Diffstat (limited to 'mate-volume-control/applet-main.c')
| -rw-r--r-- | mate-volume-control/applet-main.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mate-volume-control/applet-main.c b/mate-volume-control/applet-main.c index 1b4bb0a..883823a 100644 --- a/mate-volume-control/applet-main.c +++ b/mate-volume-control/applet-main.c @@ -27,7 +27,7 @@ #include <gtk/gtk.h> #include <libintl.h> -#include <unique/uniqueapp.h> +#include <gio/gio.h> #include <libmatemixer/matemixer.h> #include "gvc-applet.h" @@ -40,7 +40,7 @@ main (int argc, char **argv) { GError *error = NULL; GvcApplet *applet; - UniqueApp *app; + GApplication *app = NULL; GOptionEntry entries[] = { { "version", 'v', 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, N_("Enable debug"), NULL }, @@ -58,6 +58,7 @@ main (int argc, char **argv) if (error != NULL) { g_warning ("%s", error->message); + g_error_free (error); return 1; } if (show_version == TRUE) { @@ -68,9 +69,14 @@ main (int argc, char **argv) g_setenv ("G_MESSAGES_DEBUG", "all", FALSE); } - app = unique_app_new (GVC_APPLET_DBUS_NAME, NULL); + app = g_application_new (GVC_APPLET_DBUS_NAME, G_APPLICATION_FLAGS_NONE); - if (unique_app_is_running (app) == TRUE) { + if (!g_application_register (app, NULL, &error)) { + g_warning ("%s", error->message); + g_error_free (error); + return 1; + } + if (g_application_get_is_remote (app)) { g_warning ("Applet is already running, exiting"); return 0; } |