[Xfce4-commits] <parole:0.2.2> Optional use of multimedia keys.

[Ali Abdallah]

Updating branch refs/heads/0.2.2
         to ab4c6e7d099cb6d256b7ec879695f0b96bcc8c89 (commit)
       from d4ea1ef1ef7a98e1d6af557d8f0b5903c5c91181 (commit)

commit ab4c6e7d099cb6d256b7ec879695f0b96bcc8c89
Author: Ali Abdallah <aliov at xfce.org>
Date:   Sun Jan 10 17:50:07 2010 +0100

    Optional use of multimedia keys.

 src/parole-player.c |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 3c837c1..e51e9d0 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1866,6 +1866,24 @@ 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)
 {
     GtkWidget *output;
@@ -2047,11 +2065,7 @@ parole_player_init (ParolePlayer *player)
     
     g_object_unref (builder);
     
-#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
+    parole_player_setup_multimedia_keys (player);
     
     g_signal_connect_swapped (player->priv->window, "notify::is-active",
 			      G_CALLBACK (parole_player_window_notify_is_active), player);