SOURCES: xfmedia-dbus_use_newapi.patch (NEW), xfmedia-trayicon-vol...

[baggins]

Author: baggins                      Date: Mon May 22 11:12:18 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from debian

---- Files affected:
SOURCES:
   xfmedia-dbus_use_newapi.patch (NONE -> 1.1)  (NEW), xfmedia-trayicon-volume-scroll.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/xfmedia-dbus_use_newapi.patch
diff -u /dev/null SOURCES/xfmedia-dbus_use_newapi.patch:1.1
--- /dev/null	Mon May 22 13:12:18 2006
+++ SOURCES/xfmedia-dbus_use_newapi.patch	Mon May 22 13:12:13 2006
@@ -0,0 +1,12 @@
+--- src/remote.c
++++ src/remote.c
+@@ -490,7 +490,7 @@
+         g_snprintf(name, 64, XFMEDIA_DBUS_SERVICE_FMT, i);
+         dbus_error_init(&derr);
+         ret = dbus_bus_request_name(dbus_conn, name,
+-                DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &derr);
++                DBUS_NAME_FLAG_DO_NOT_QUEUE, &derr);
+         if(ret < 0) {
+             g_warning("Unable to acquire D-BUS service '%s': %s." \
+                 "  Remote control interface will not be available.",
+

================================================================
Index: SOURCES/xfmedia-trayicon-volume-scroll.patch
diff -u /dev/null SOURCES/xfmedia-trayicon-volume-scroll.patch:1.1
--- /dev/null	Mon May 22 13:12:18 2006
+++ SOURCES/xfmedia-trayicon-volume-scroll.patch	Mon May 22 13:12:13 2006
@@ -0,0 +1,51 @@
+--- src/trayicon.c.old	2005-10-06 00:18:19.000000000 +0200
++++ src/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);
+     
================================================================