[Xfce4-commits] [apps/parole] 01/01: Fix disabling of multimedia keyboards

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

bluesabre pushed a commit to branch master
in repository apps/parole.

commit daf4b1786032962c62f31d4998f7e5906642e0ac
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Jun 15 19:36:25 2014 -0400

    Fix disabling of multimedia keyboards
---
 src/parole-player.c |   96 +++++++++++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 16502e5..c5a353a 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2596,38 +2596,52 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
 gboolean
 parole_player_key_press (GtkWidget *widget, GdkEventKey *ev, ParolePlayer *player)
 {
+    gboolean enabled;
+
     switch (ev->keyval)
     {
         case GDK_KEY_F11:
                 if ( player->priv->embedded != TRUE ) g_action_activate (G_ACTION(player->priv->media_fullscreen_action), NULL);
             return TRUE;
-#ifdef HAVE_XF86_KEYSYM
-        case XF86XK_AudioPlay:
-            parole_player_toggle_playpause(player);
-            return TRUE;
-        case XF86XK_AudioStop:
-            parole_player_pause_clicked (NULL, player);
-            return TRUE;
-        case XF86XK_AudioRaiseVolume:
-            parole_player_volume_up (NULL, player);
-            return TRUE;
-        case XF86XK_AudioLowerVolume:
-            parole_player_volume_down (NULL, player);
-            return TRUE;
-        case XF86XK_AudioMute:
-            parole_player_volume_mute (NULL, player);
-            return TRUE;
-        case XF86XK_AudioPrev:
-            parole_player_play_prev (player);
-            return TRUE;
-        case XF86XK_AudioNext:
-            parole_player_play_next (player, TRUE);
-            return TRUE;
-#endif /* HAVE_XF86_KEYSYM */
         default:
             break;
     }
 
+#ifdef HAVE_XF86_KEYSYM
+    g_object_get (G_OBJECT (player->priv->conf),
+                  "multimedia-keys", &enabled,
+                  NULL);
+    if (enabled)
+    {
+        switch (ev->keyval)
+        {
+            case XF86XK_AudioPlay:
+                parole_player_toggle_playpause (player);
+                return TRUE;
+            case XF86XK_AudioStop:
+                parole_player_pause_clicked (NULL, player);
+                return TRUE;
+            case XF86XK_AudioRaiseVolume:
+                parole_player_volume_up (NULL, player);
+                return TRUE;
+            case XF86XK_AudioLowerVolume:
+                parole_player_volume_down (NULL, player);
+                return TRUE;
+            case XF86XK_AudioMute:
+                parole_player_volume_mute (NULL, player);
+                return TRUE;
+            case XF86XK_AudioPrev:
+                parole_player_play_prev (player);
+                return TRUE;
+            case XF86XK_AudioNext:
+                parole_player_play_next (player, TRUE);
+                return TRUE;
+            default:
+                break;
+        }
+    }
+#endif /* HAVE_XF86_KEYSYM */
+
     return parole_player_handle_key_press (ev, player);
 }
 
@@ -2635,6 +2649,15 @@ parole_player_key_press (GtkWidget *widget, GdkEventKey *ev, ParolePlayer *playe
 static void
 parole_player_button_pressed_cb (ParoleButton *button, ParoleButtonKey key, ParolePlayer *player)
 {
+    gboolean enabled;
+
+    g_object_get (G_OBJECT (player->priv->conf),
+                  "multimedia-keys", &enabled,
+                  NULL);
+
+    if (!enabled)
+        return;
+
     PAROLE_DEBUG_ENUM ("Button Press:", key, ENUM_GTYPE_BUTTON_KEY);
 
     switch (key)
@@ -3012,24 +3035,6 @@ parole_player_set_wm_opacity_hint (GtkWidget *widget)
 }
 
 static void
-parole_player_setup_multimedia_keys (ParolePlayer *player)
-{
-    #ifdef HAVE_XF86_KEYSYM
-    gboolean enabled;
-    g_object_get   (G_OBJECT (player->priv->conf),
-                    "multimedia-keys", &enabled,
-                    NULL);
-
-    if ( enabled )
-    {
-        player->priv->button = parole_button_new ();
-        g_signal_connect (player->priv->button, "button-pressed",
-        G_CALLBACK (parole_player_button_pressed_cb), player);
-    }
-    #endif
-}
-
-static void
 parole_player_init (ParolePlayer *player)
 {
     GtkBuilder *builder;
@@ -3551,7 +3556,14 @@ parole_player_init (ParolePlayer *player)
 
     g_object_unref (builder);
 
-    parole_player_setup_multimedia_keys (player);
+    /*
+     * Set up multimedia keyboard buttons
+     */
+    #ifdef HAVE_XF86_KEYSYM
+    player->priv->button = parole_button_new ();
+    g_signal_connect (player->priv->button, "button-pressed",
+                      G_CALLBACK (parole_player_button_pressed_cb), player);
+    #endif
 
     g_signal_connect_swapped (player->priv->window, "notify::is-active",
               G_CALLBACK (parole_player_window_notify_is_active), player);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.