[Pkg-xfce-commits] r258 - in goodies/xfmedia/debian: . patches
Yves-Alexis Perez
corsac-guest at costa.debian.org
Wed Oct 5 22:51:04 UTC 2005
Author: corsac-guest
Date: 2005-10-05 22:51:03 +0000 (Wed, 05 Oct 2005)
New Revision: 258
Added:
goodies/xfmedia/debian/patches/
goodies/xfmedia/debian/patches/00_trayicon-volume-scroll.patch
Log:
/!\ cdbs can't apply this patch, and i dont understand why, but I commit it, if someone has an idea why. The patch in itself is simple, it just add volume control to trayicon (with mouse wheel). See #332314
Added: goodies/xfmedia/debian/patches/00_trayicon-volume-scroll.patch
===================================================================
--- goodies/xfmedia/debian/patches/00_trayicon-volume-scroll.patch 2005-10-05 14:56:05 UTC (rev 257)
+++ goodies/xfmedia/debian/patches/00_trayicon-volume-scroll.patch 2005-10-05 22:51:03 UTC (rev 258)
@@ -0,0 +1,51 @@
+--- trayicon.c.old 2005-10-06 00:18:19.000000000 +0200
++++ trayicon.c 2005-10-06 00:17:15.000000000 +0200
+@@ -101,13 +101,35 @@
+ break;
+ }
+ } else if(evt->button == 3) {
+- if(tray_icon->menu) {
++ if(tray_icon->menu) {
+ gtk_menu_popup(GTK_MENU(tray_icon->menu), NULL, NULL, NULL,
+ NULL, evt->button, evt->time);
+ }
+ return TRUE;
+ }
+-
++ return FALSE;
++}
++static gboolean
++xfmedia_tray_icon_button_scroll_cb(GtkWidget *w, GdkEventScroll *evt,
++ gpointer user_data)
++{
++ XfmediaTrayIcon *tray_icon = user_data;
++ XfmediaMainwin *mwin = tray_icon->mwin;
++ if(evt->direction == GDK_SCROLL_UP) {
++ gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
++ volume += 2;
++ if(volume >100)
++ volume = 100;
++ xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
++ return TRUE;
++ } else if(evt->direction == GDK_SCROLL_DOWN) {
++ gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
++ volume -= 2;
++ if(volume <0)
++ volume = 0;
++ xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
++ return TRUE;
++ }
+ return FALSE;
+ }
+
+@@ -159,7 +181,9 @@
+ gtk_container_add(GTK_CONTAINER(evtbox), img);
+
+ g_signal_connect(G_OBJECT(evtbox), "button-press-event",
+- G_CALLBACK(xfmedia_tray_icon_button_press_cb), cb_data);
++ G_CALLBACK(xfmedia_tray_icon_button_press_cb), cb_data);
++ g_signal_connect(G_OBJECT(evtbox), "scroll-event",
++ G_CALLBACK(xfmedia_tray_icon_button_scroll_cb), cb_data);
+ g_signal_connect(G_OBJECT(tray_icon), "destroy",
+ G_CALLBACK(xfmedia_tray_icon_destroy_cb), cb_data);
+
More information about the Pkg-xfce-commits
mailing list