diff options
| author | Michal Ratajsky <[email protected]> | 2014-07-05 01:41:22 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-10-09 16:53:00 +0200 |
| commit | cf427cb4ccfc269252c1f7744b4c730ef0bb7a4e (patch) | |
| tree | 2b623fa9cabd575907a1cf40378eeecb8f21efaa /mate-volume-control/src/gvc-stream-status-icon.c | |
| parent | a4cb2a2c9ab27e32449b5696bb989cc761ec73c7 (diff) | |
| download | mate-media-cf427cb4ccfc269252c1f7744b4c730ef0bb7a4e.tar.bz2 mate-media-cf427cb4ccfc269252c1f7744b4c730ef0bb7a4e.tar.xz | |
Initial port of the dialog
Diffstat (limited to 'mate-volume-control/src/gvc-stream-status-icon.c')
| -rw-r--r-- | mate-volume-control/src/gvc-stream-status-icon.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/mate-volume-control/src/gvc-stream-status-icon.c b/mate-volume-control/src/gvc-stream-status-icon.c index 86cd947..4e80e91 100644 --- a/mate-volume-control/src/gvc-stream-status-icon.c +++ b/mate-volume-control/src/gvc-stream-status-icon.c @@ -27,16 +27,12 @@ #include <gdk/gdkkeysyms-compat.h> #include <libmatemixer/matemixer.h> -#include "gvc-channel-bar.h" -#include "gvc-stream-status-icon.h" - -// XXX remove the #if and just use mate_gdk_spawn_command_line_on_screen after -// https://github.com/mate-desktop/mate-desktop/pull/120 -#if GTK_CHECK_VERSION (3, 0, 0) #define MATE_DESKTOP_USE_UNSTABLE_API + #include <libmate-desktop/mate-desktop-utils.h> -#define gdk_spawn_command_line_on_screen mate_gdk_spawn_command_line_on_screen -#endif + +#include "gvc-channel-bar.h" +#include "gvc-stream-status-icon.h" #define GVC_STREAM_STATUS_ICON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_STREAM_STATUS_ICON, GvcStreamStatusIconPrivate)) @@ -230,13 +226,14 @@ static void on_menu_activate_open_volume_control (GtkMenuItem *item, GvcStreamStatusIcon *icon) { - GError *error; - - error = NULL; - gdk_spawn_command_line_on_screen (gtk_widget_get_screen (icon->priv->dock), - "mate-volume-control", - &error); + GError *error = NULL; + // XXX update to libmate-desktop 1.9.1 and uncomment this + /* + mate_spawn_command_line_on_screen (gtk_widget_get_screen (icon->priv->dock), + "mate-volume-control", + &error); + */ if (error != NULL) { GtkWidget *dialog; |