diff options
author | monsta <[email protected]> | 2016-11-21 22:40:13 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2016-11-21 22:40:13 +0300 |
commit | 914205c39a5cc85779959a793337adff58ba0a60 (patch) | |
tree | cb986d8789749c133c90d34c9aaaa6a3956e2899 /mate-volume-control/dialog-main.c | |
parent | a8c8c031e835211b8fd3a16114816a9d2f9171f2 (diff) | |
download | mate-media-914205c39a5cc85779959a793337adff58ba0a60.tar.bz2 mate-media-914205c39a5cc85779959a793337adff58ba0a60.tar.xz |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmate-desktop >= 1.17
Diffstat (limited to 'mate-volume-control/dialog-main.c')
-rw-r--r-- | mate-volume-control/dialog-main.c | 50 |
1 files changed, 1 insertions, 49 deletions
diff --git a/mate-volume-control/dialog-main.c b/mate-volume-control/dialog-main.c index 56a321d..486ab4a 100644 --- a/mate-volume-control/dialog-main.c +++ b/mate-volume-control/dialog-main.c @@ -26,11 +26,7 @@ #include <gtk/gtk.h> #include <libintl.h> -#if GTK_CHECK_VERSION (3, 0, 0) #include <gio/gio.h> -#else -#include <unique/uniqueapp.h> -#endif #include <libmatemixer/matemixer.h> #include "gvc-mixer-dialog.h" @@ -67,20 +63,6 @@ on_dialog_close (GtkDialog *dialog, gpointer data) gtk_main_quit (); } -#if !GTK_CHECK_VERSION (3, 0, 0) -static UniqueResponse -on_app_message_received (UniqueApp *app, - int command, - UniqueMessageData *message_data, - guint time_, - gpointer user_data) -{ - gtk_window_present (GTK_WINDOW (user_data)); - - return UNIQUE_RESPONSE_OK; -} -#endif - static void remove_warning_dialog (void) { @@ -93,15 +75,10 @@ remove_warning_dialog (void) } static void -#if GTK_CHECK_VERSION (3, 0, 0) context_ready (MateMixerContext *context, GtkApplication *application) -#else -context_ready (MateMixerContext *context, UniqueApp *app) -#endif { /* The dialog might be already created, e.g. when reconnected * to a sound server */ -#if GTK_CHECK_VERSION (3, 0, 0) GtkApplication *app; GError *error = NULL; @@ -122,7 +99,6 @@ context_ready (MateMixerContext *context, UniqueApp *app) gtk_main_quit (); } -#endif if (app_dialog != NULL) return; @@ -139,28 +115,15 @@ context_ready (MateMixerContext *context, UniqueApp *app) gvc_mixer_dialog_set_page (GVC_MIXER_DIALOG (app_dialog), page); -#if !GTK_CHECK_VERSION (3, 0, 0) - g_signal_connect (G_OBJECT (app), - "message-received", - G_CALLBACK (on_app_message_received), - app_dialog); - -#endif gtk_widget_show (app_dialog); -#if GTK_CHECK_VERSION (3, 0, 0) g_signal_connect_swapped (app, "activate", G_CALLBACK (gtk_window_present), app_dialog); -#endif } static void on_context_state_notify (MateMixerContext *context, GParamSpec *pspec, -#if GTK_CHECK_VERSION (3, 0, 0) GtkApplication *app) -#else - UniqueApp *app) -#endif { MateMixerState state = mate_mixer_context_get_state (context); @@ -221,11 +184,8 @@ main (int argc, char **argv) GError *error = NULL; gchar *backend = NULL; MateMixerContext *context; -#if GTK_CHECK_VERSION (3, 0, 0) GApplication *app; -#else - UniqueApp *app; -#endif + GOptionEntry entries[] = { { "backend", 'b', 0, G_OPTION_ARG_STRING, &backend, N_("Sound system backend"), "pulse|alsa|oss|null" }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, N_("Enable debug"), NULL }, @@ -256,7 +216,6 @@ main (int argc, char **argv) g_setenv ("G_MESSAGES_DEBUG", "all", FALSE); } -#if GTK_CHECK_VERSION (3, 0, 0) app = g_application_new (GVC_DIALOG_DBUS_NAME, G_APPLICATION_FLAGS_NONE); if (!g_application_register (app, NULL, &error)) @@ -265,14 +224,7 @@ main (int argc, char **argv) g_error_free (error); return 1; } -#else - app = unique_app_new (GVC_DIALOG_DBUS_NAME, NULL); - if (unique_app_is_running (app) == TRUE) { - unique_app_send_message (app, UNIQUE_ACTIVATE, NULL); - return 0; - } -#endif if (mate_mixer_init () == FALSE) { g_warning ("libmatemixer initialization failed, exiting"); return 1; |