← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~pitti/indicator-sound/xfce-support into lp:indicator-sound

 

Martin Pitt has proposed merging lp:~pitti/indicator-sound/xfce-support into lp:indicator-sound.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


This makes the indicator work in an XFCE environment where gnome-volume-control is not available, but xfce4-mixer is.
-- 
https://code.launchpad.net/~pitti/indicator-sound/xfce-support/+merge/29058
Your team ayatana-commits is subscribed to branch lp:indicator-sound.
=== modified file 'src/dbus-menu-manager.c'
--- src/dbus-menu-manager.c	2010-06-18 09:02:20 +0000
+++ src/dbus-menu-manager.c	2010-07-02 08:17:24 +0000
@@ -172,7 +172,8 @@
 static void show_sound_settings_dialog (DbusmenuMenuitem *mi, gpointer user_data)
 {
   GError * error = NULL;
-  if (!g_spawn_command_line_async("gnome-volume-control", &error)) {
+  if (!g_spawn_command_line_async("gnome-volume-control", &error) &&
+      !g_spawn_command_line_async("xfce4-mixer", &error)) 
     g_warning("Unable to show dialog: %s", error->message);
     g_error_free(error);
   }


Follow ups