Index: xfce-mixer-preferences.c
===================================================================
--- xfce-mixer-preferences.c	(revision 25708)
+++ xfce-mixer-preferences.c	(working copy)
@@ -8,9 +8,6 @@
 
 #define selfp (self->_priv)
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <string.h> /* memset() */
 
 #include "xfce-mixer-preferences.h"
@@ -31,14 +28,14 @@
 #  include <config.h>
 #endif
 
-#line 35 "xfce-mixer-preferences.c"
+#line 32 "xfce-mixer-preferences.c"
 
 #line 6 "mixer-preferences.gob"
 
 #include <gtk/gtk.h>
 #include <libxfce4util/libxfce4util.h>
 
-#line 42 "xfce-mixer-preferences.c"
+#line 39 "xfce-mixer-preferences.c"
 
 #line 13 "mixer-preferences.gob"
 
@@ -50,12 +47,12 @@
 #define MIXER_ROOT "Mixer"
 
 
-#line 54 "xfce-mixer-preferences.c"
+#line 51 "xfce-mixer-preferences.c"
 
 #line 22 "mixer-preferences.gob"
 
 
-#line 59 "xfce-mixer-preferences.c"
+#line 56 "xfce-mixer-preferences.c"
 /* self casting macros */
 #define SELF(x) XFCE_MIXER_PREFERENCES(x)
 #define SELF_CONST(x) XFCE_MIXER_PREFERENCES_CONST(x)
@@ -80,8 +77,10 @@
 	PROP_DEVICE,
 	PROP_MASTER,
 	PROP_LAUNCHER_COMMAND,
+	PROP_LAUNCHER_SHOW,
 	PROP_LAUNCHER_RUN_IN_TERMINAL,
-	PROP_LAUNCHER_USE_STARTUP_NOTIFICATION
+	PROP_LAUNCHER_USE_STARTUP_NOTIFICATION,
+	PROP_BAR_COLOR
 };
 
 /* pointer to the class of our parent */
@@ -154,7 +153,7 @@
 				VAR = NULL;
 			}
 		}
-#line 158 "xfce-mixer-preferences.c"
+#line 157 "xfce-mixer-preferences.c"
 	memset(&device, 0, sizeof(device));
 #undef VAR
 #undef device
@@ -168,7 +167,7 @@
 				VAR = NULL;
 			}
 		}
-#line 172 "xfce-mixer-preferences.c"
+#line 171 "xfce-mixer-preferences.c"
 	memset(&master, 0, sizeof(master));
 #undef VAR
 #undef master
@@ -182,33 +181,47 @@
 				VAR = NULL;
 			}
 		}
-#line 186 "xfce-mixer-preferences.c"
+#line 185 "xfce-mixer-preferences.c"
 	memset(&probably_master, 0, sizeof(probably_master));
 #undef VAR
 #undef probably_master
 #define launcher_command (self->_priv->launcher_command)
 #define VAR launcher_command
 	{
-#line 51 "mixer-preferences.gob"
+#line 53 "mixer-preferences.gob"
 	
 			if (VAR) {
 				g_free (VAR);
 				VAR = NULL;
 			}
 		}
-#line 200 "xfce-mixer-preferences.c"
+#line 199 "xfce-mixer-preferences.c"
 	memset(&launcher_command, 0, sizeof(launcher_command));
 #undef VAR
 #undef launcher_command
+#define bar_color (self->_priv->bar_color)
+#define VAR bar_color
+	{
+#line 64 "mixer-preferences.gob"
+	
+			if (VAR) {
+				gdk_color_free (VAR);
+				VAR = NULL;
+			}
+		}
+#line 213 "xfce-mixer-preferences.c"
+	memset(&bar_color, 0, sizeof(bar_color));
+#undef VAR
+#undef bar_color
 #define master_lst (self->master_lst)
 #define VAR master_lst
 	{
-#line 62 "mixer-preferences.gob"
+#line 72 "mixer-preferences.gob"
 	
 			stringlist_free(VAR);
 			VAR = NULL;
 		}
-#line 212 "xfce-mixer-preferences.c"
+#line 225 "xfce-mixer-preferences.c"
 	memset(&master_lst, 0, sizeof(master_lst));
 #undef VAR
 #undef master_lst
@@ -259,6 +272,15 @@
 		PROP_LAUNCHER_COMMAND,
 		param_spec);
 	param_spec = g_param_spec_boolean
+		("launcher_show" /* name */,
+		 "show icon" /* nick */,
+		 "show icon" /* blurb */,
+		 FALSE /* default_value */,
+		 (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE));
+	g_object_class_install_property (g_object_class,
+		PROP_LAUNCHER_SHOW,
+		param_spec);
+	param_spec = g_param_spec_boolean
 		("launcher_run_in_terminal" /* name */,
 		 "start the program in a terminal" /* nick */,
 		 "start the program in a terminal" /* blurb */,
@@ -276,43 +298,57 @@
 	g_object_class_install_property (g_object_class,
 		PROP_LAUNCHER_USE_STARTUP_NOTIFICATION,
 		param_spec);
+	param_spec = g_param_spec_pointer
+		("bar_color" /* name */,
+		 "bar color" /* nick */,
+		 "color to paint the volume bar" /* blurb */,
+		 (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE));
+	g_object_class_install_property (g_object_class,
+		PROP_BAR_COLOR,
+		param_spec);
     }
 }
 #undef __GOB_FUNCTION__
-#line 192 "mixer-preferences.gob"
+#line 227 "mixer-preferences.gob"
 static void 
 xfce_mixer_preferences_init (XfceMixerPreferences * self G_GNUC_UNUSED)
-#line 286 "xfce-mixer-preferences.c"
+#line 316 "xfce-mixer-preferences.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Preferences::init"
 	self->_priv = G_TYPE_INSTANCE_GET_PRIVATE(self,XFCE_TYPE_MIXER_PREFERENCES,XfceMixerPreferencesPrivate);
 #line 22 "mixer-preferences.gob"
 	self->_priv->device = NULL;
-#line 292 "xfce-mixer-preferences.c"
+#line 322 "xfce-mixer-preferences.c"
 #line 27 "mixer-preferences.gob"
 	self->_priv->master = NULL;
-#line 295 "xfce-mixer-preferences.c"
+#line 325 "xfce-mixer-preferences.c"
 #line 35 "mixer-preferences.gob"
 	self->probably_master = NULL;
-#line 298 "xfce-mixer-preferences.c"
+#line 328 "xfce-mixer-preferences.c"
 #line 43 "mixer-preferences.gob"
+	self->_priv->launcher_show = TRUE;
+#line 331 "xfce-mixer-preferences.c"
+#line 43 "mixer-preferences.gob"
 	self->_priv->launcher_command = NULL;
-#line 301 "xfce-mixer-preferences.c"
-#line 51 "mixer-preferences.gob"
+#line 334 "xfce-mixer-preferences.c"
+#line 53 "mixer-preferences.gob"
 	self->_priv->launcher_run_in_terminal = FALSE;
-#line 304 "xfce-mixer-preferences.c"
-#line 51 "mixer-preferences.gob"
+#line 337 "xfce-mixer-preferences.c"
+#line 53 "mixer-preferences.gob"
 	self->_priv->launcher_use_startup_notification = FALSE;
-#line 307 "xfce-mixer-preferences.c"
-#line 51 "mixer-preferences.gob"
+#line 340 "xfce-mixer-preferences.c"
+#line 53 "mixer-preferences.gob"
+	self->_priv->bar_color = NULL;
+#line 343 "xfce-mixer-preferences.c"
+#line 64 "mixer-preferences.gob"
 	self->master_lst = NULL;
-#line 310 "xfce-mixer-preferences.c"
+#line 346 "xfce-mixer-preferences.c"
  {
-#line 193 "mixer-preferences.gob"
+#line 228 "mixer-preferences.gob"
 
 		self_fill_probably_master (self);
 	
-#line 316 "xfce-mixer-preferences.c"
+#line 352 "xfce-mixer-preferences.c"
  }
 }
 #undef __GOB_FUNCTION__
@@ -331,7 +367,7 @@
 	switch (property_id) {
 	case PROP_DEVICE:
 		{
-#line 70 "mixer-preferences.gob"
+#line 80 "mixer-preferences.gob"
 
 		if (selfp->device) {
 			g_free (selfp->device);
@@ -345,12 +381,12 @@
 			g_object_set (G_OBJECT (self), "master", NULL, NULL);
 		}
 	
-#line 349 "xfce-mixer-preferences.c"
+#line 385 "xfce-mixer-preferences.c"
 		}
 		break;
 	case PROP_MASTER:
 		{
-#line 90 "mixer-preferences.gob"
+#line 100 "mixer-preferences.gob"
 
 		if (selfp->master) {
 			g_free (selfp->master);
@@ -361,12 +397,12 @@
 		else
 			selfp->master = NULL;
 	
-#line 365 "xfce-mixer-preferences.c"
+#line 401 "xfce-mixer-preferences.c"
 		}
 		break;
 	case PROP_LAUNCHER_COMMAND:
 		{
-#line 110 "mixer-preferences.gob"
+#line 120 "mixer-preferences.gob"
 
 		if (selfp->launcher_command) {
 			g_free (self->_priv->launcher_command);
@@ -374,23 +410,46 @@
 		}
 		selfp->launcher_command = g_strdup (g_value_get_string (VAL));
 	
-#line 378 "xfce-mixer-preferences.c"
+#line 414 "xfce-mixer-preferences.c"
 		}
 		break;
+	case PROP_LAUNCHER_SHOW:
+		{
+#line 131 "mixer-preferences.gob"
+self->_priv->launcher_show = g_value_get_boolean (VAL);
+#line 421 "xfce-mixer-preferences.c"
+		}
+		break;
 	case PROP_LAUNCHER_RUN_IN_TERMINAL:
 		{
-#line 121 "mixer-preferences.gob"
+#line 135 "mixer-preferences.gob"
 self->_priv->launcher_run_in_terminal = g_value_get_boolean (VAL);
-#line 385 "xfce-mixer-preferences.c"
+#line 428 "xfce-mixer-preferences.c"
 		}
 		break;
 	case PROP_LAUNCHER_USE_STARTUP_NOTIFICATION:
 		{
-#line 125 "mixer-preferences.gob"
+#line 139 "mixer-preferences.gob"
 self->_priv->launcher_use_startup_notification = g_value_get_boolean (VAL);
-#line 392 "xfce-mixer-preferences.c"
+#line 435 "xfce-mixer-preferences.c"
 		}
 		break;
+	case PROP_BAR_COLOR:
+		{
+#line 146 "mixer-preferences.gob"
+
+		GdkColor* val = g_value_peek_pointer (VAL);
+		if (selfp->bar_color) {
+			gdk_color_free (selfp->bar_color);
+			selfp->bar_color = NULL;
+		}
+		if (val) {
+	                selfp->bar_color = gdk_color_copy (val);
+		}
+	
+#line 451 "xfce-mixer-preferences.c"
+		}
+		break;
 	default:
 /* Apparently in g++ this is needed, glib is b0rk */
 #ifndef __PRETTY_FUNCTION__
@@ -417,48 +476,68 @@
 	switch (property_id) {
 	case PROP_DEVICE:
 		{
-#line 83 "mixer-preferences.gob"
+#line 93 "mixer-preferences.gob"
 
 		g_value_set_string (VAL, selfp->device);
 	
-#line 425 "xfce-mixer-preferences.c"
+#line 484 "xfce-mixer-preferences.c"
 		}
 		break;
 	case PROP_MASTER:
 		{
-#line 100 "mixer-preferences.gob"
+#line 110 "mixer-preferences.gob"
 
 		if (!self->_priv->master)
 			g_value_set_string (VAL, self->probably_master);
 		else
 			g_value_set_string (VAL, self->_priv->master);
 	
-#line 437 "xfce-mixer-preferences.c"
+#line 496 "xfce-mixer-preferences.c"
 		}
 		break;
 	case PROP_LAUNCHER_COMMAND:
 		{
-#line 117 "mixer-preferences.gob"
+#line 127 "mixer-preferences.gob"
 
 		g_value_set_string (VAL, selfp->launcher_command);
 	
-#line 446 "xfce-mixer-preferences.c"
+#line 505 "xfce-mixer-preferences.c"
 		}
 		break;
+	case PROP_LAUNCHER_SHOW:
+		{
+#line 131 "mixer-preferences.gob"
+g_value_set_boolean (VAL, self->_priv->launcher_show);
+#line 512 "xfce-mixer-preferences.c"
+		}
+		break;
 	case PROP_LAUNCHER_RUN_IN_TERMINAL:
 		{
-#line 121 "mixer-preferences.gob"
+#line 135 "mixer-preferences.gob"
 g_value_set_boolean (VAL, self->_priv->launcher_run_in_terminal);
-#line 453 "xfce-mixer-preferences.c"
+#line 519 "xfce-mixer-preferences.c"
 		}
 		break;
 	case PROP_LAUNCHER_USE_STARTUP_NOTIFICATION:
 		{
-#line 125 "mixer-preferences.gob"
+#line 139 "mixer-preferences.gob"
 g_value_set_boolean (VAL, self->_priv->launcher_use_startup_notification);
-#line 460 "xfce-mixer-preferences.c"
+#line 526 "xfce-mixer-preferences.c"
 		}
 		break;
+	case PROP_BAR_COLOR:
+		{
+#line 156 "mixer-preferences.gob"
+
+		if (selfp->bar_color) {
+			GdkColor* val = gdk_color_copy (selfp->bar_color);
+			g_value_set_pointer (VAL, val);
+		} else
+			g_value_set_pointer (VAL, NULL);
+	
+#line 539 "xfce-mixer-preferences.c"
+		}
+		break;
 	default:
 /* Apparently in g++ this is needed, glib is b0rk */
 #ifndef __PRETTY_FUNCTION__
@@ -472,33 +551,33 @@
 #undef __GOB_FUNCTION__
 
 
-#line 129 "mixer-preferences.gob"
+#line 164 "mixer-preferences.gob"
 XfceMixerPreferences * 
 xfce_mixer_preferences_new (void)
-#line 479 "xfce-mixer-preferences.c"
+#line 558 "xfce-mixer-preferences.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Preferences::new"
 {
-#line 130 "mixer-preferences.gob"
+#line 165 "mixer-preferences.gob"
 	
 		return XFCE_MIXER_PREFERENCES (GET_NEW);
 	}}
-#line 487 "xfce-mixer-preferences.c"
+#line 566 "xfce-mixer-preferences.c"
 #undef __GOB_FUNCTION__
 
-#line 134 "mixer-preferences.gob"
+#line 169 "mixer-preferences.gob"
 void 
 xfce_mixer_preferences_fill_probably_master (XfceMixerPreferences * self)
-#line 493 "xfce-mixer-preferences.c"
+#line 572 "xfce-mixer-preferences.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Preferences::fill_probably_master"
-#line 134 "mixer-preferences.gob"
+#line 169 "mixer-preferences.gob"
 	g_return_if_fail (self != NULL);
-#line 134 "mixer-preferences.gob"
+#line 169 "mixer-preferences.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFERENCES (self));
-#line 500 "xfce-mixer-preferences.c"
+#line 579 "xfce-mixer-preferences.c"
 {
-#line 135 "mixer-preferences.gob"
+#line 170 "mixer-preferences.gob"
 	
 		if (self->probably_master) {
 			g_free (self->probably_master);
@@ -512,22 +591,22 @@
 
 		self->probably_master = self_find_probably_master (self);
 	}}
-#line 516 "xfce-mixer-preferences.c"
+#line 595 "xfce-mixer-preferences.c"
 #undef __GOB_FUNCTION__
 
-#line 149 "mixer-preferences.gob"
+#line 184 "mixer-preferences.gob"
 gchar * 
 xfce_mixer_preferences_find_probably_master (XfceMixerPreferences * self)
-#line 522 "xfce-mixer-preferences.c"
+#line 601 "xfce-mixer-preferences.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Preferences::find_probably_master"
-#line 149 "mixer-preferences.gob"
+#line 184 "mixer-preferences.gob"
 	g_return_val_if_fail (self != NULL, (gchar * )0);
-#line 149 "mixer-preferences.gob"
+#line 184 "mixer-preferences.gob"
 	g_return_val_if_fail (XFCE_IS_MIXER_PREFERENCES (self), (gchar * )0);
-#line 529 "xfce-mixer-preferences.c"
+#line 608 "xfce-mixer-preferences.c"
 {
-#line 150 "mixer-preferences.gob"
+#line 185 "mixer-preferences.gob"
 	
 		/* search om, find "Master", return index or -1 */
 		gchar *r_s;
@@ -569,23 +648,23 @@
 
 		return g_strdup (r_s);
 	}}
-#line 573 "xfce-mixer-preferences.c"
+#line 652 "xfce-mixer-preferences.c"
 #undef __GOB_FUNCTION__
 
 
-#line 197 "mixer-preferences.gob"
+#line 232 "mixer-preferences.gob"
 void 
 xfce_mixer_preferences_load (XfceMixerPreferences * self, XfceRc * rc)
-#line 580 "xfce-mixer-preferences.c"
+#line 659 "xfce-mixer-preferences.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Preferences::load"
-#line 197 "mixer-preferences.gob"
+#line 232 "mixer-preferences.gob"
 	g_return_if_fail (self != NULL);
-#line 197 "mixer-preferences.gob"
+#line 232 "mixer-preferences.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFERENCES (self));
-#line 587 "xfce-mixer-preferences.c"
+#line 666 "xfce-mixer-preferences.c"
 {
-#line 198 "mixer-preferences.gob"
+#line 233 "mixer-preferences.gob"
 	
 		/* configurable:
 			Device
@@ -599,14 +678,24 @@
 		gchar const* launcher_command;
 		gboolean launcher_run_in_terminal;
 		gboolean launcher_use_startup_notification;
+		gboolean launcher_show;
 		gchar const* master_control;
+		gchar const* bar_color_s;
+		GdkColor* bar_color;
 
 		device = xfce_rc_read_entry (rc, "Device", NULL);
 		launcher_command = xfce_rc_read_entry (rc, "LauncherCommand", NULL);
 		launcher_run_in_terminal = xfce_rc_read_bool_entry (rc, "LauncherRunInTerminal", FALSE);
 		launcher_use_startup_notification = xfce_rc_read_bool_entry (rc, "LauncherUseStartupNotification", FALSE);
+		launcher_show = xfce_rc_read_bool_entry (rc, "LauncherShow", TRUE);
 		master_control = xfce_rc_read_entry (rc, "MasterControl", NULL);
 
+                if ((bar_color_s = xfce_rc_read_entry (rc, "BarColor", NULL))) {
+		    bar_color = g_new(GdkColor, 1);
+                    gdk_color_parse(bar_color_s, bar_color);
+                } else
+		    bar_color = NULL;
+
 		if (device) {
 			g_object_set (G_OBJECT (self), "device", device, NULL);
 		}
@@ -615,28 +704,30 @@
 					"launcher_command", launcher_command, 
 					"launcher_run_in_terminal", (gboolean) launcher_run_in_terminal,
 					"launcher_use_startup_notification", (gboolean) launcher_use_startup_notification,
+					"launcher_show", (gboolean) launcher_show,
+					"bar_color", bar_color, 
 				NULL);
 
 		if (master_control) {
 			g_object_set (G_OBJECT (self), "master", master_control, NULL);
 		}
 	}}
-#line 625 "xfce-mixer-preferences.c"
+#line 716 "xfce-mixer-preferences.c"
 #undef __GOB_FUNCTION__
 
-#line 234 "mixer-preferences.gob"
+#line 281 "mixer-preferences.gob"
 void 
 xfce_mixer_preferences_save (XfceMixerPreferences * self, XfceRc * rc)
-#line 631 "xfce-mixer-preferences.c"
+#line 722 "xfce-mixer-preferences.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Preferences::save"
-#line 234 "mixer-preferences.gob"
+#line 281 "mixer-preferences.gob"
 	g_return_if_fail (self != NULL);
-#line 234 "mixer-preferences.gob"
+#line 281 "mixer-preferences.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFERENCES (self));
-#line 638 "xfce-mixer-preferences.c"
+#line 729 "xfce-mixer-preferences.c"
 {
-#line 235 "mixer-preferences.gob"
+#line 282 "mixer-preferences.gob"
 	
 		/* configurable:
 			Device
@@ -650,14 +741,27 @@
 		gboolean launcher_run_in_terminal;
 		gboolean launcher_use_startup_notification;
 		gchar const* device;
+		gboolean launcher_show;
 		gchar const* master_control;
+		gchar bar_color[8];
 
 		launcher_command = self->_priv->launcher_command;
 		launcher_run_in_terminal = self->_priv->launcher_run_in_terminal;
 		launcher_use_startup_notification = self->_priv->launcher_use_startup_notification;
+		launcher_show = self->_priv->launcher_show;
 		device = self->_priv->device;
 		master_control = self->_priv->master;
 
+		if (self->_priv->bar_color != NULL) {
+			g_snprintf(bar_color, 8, "#%02X%02X%02X",
+			    (guint)self->_priv->bar_color->red >> 8,
+			    (guint)self->_priv->bar_color->green >> 8,
+			    (guint)self->_priv->bar_color->blue >> 8);
+			xfce_rc_write_entry (rc, "BarColor", bar_color);
+		} else {
+			xfce_rc_delete_entry (rc, "BarColor", FALSE);
+		}
+
 		if (device != NULL) {
 			xfce_rc_write_entry (rc, "Device", device);
 		} else {
@@ -672,13 +776,13 @@
 
 		xfce_rc_write_bool_entry (rc, "LauncherRunInTerminal", launcher_run_in_terminal);
 		xfce_rc_write_bool_entry (rc, "LauncherUseStartupNotification", launcher_use_startup_notification);
+		xfce_rc_write_bool_entry (rc, "LauncherShow", launcher_show);
 
 		if (master_control != NULL) {
 			xfce_rc_write_entry (rc, "MasterControl", master_control);
 		} else {
 			xfce_rc_delete_entry (rc, "MasterControl", FALSE);
 		}
-
 	}}
-#line 684 "xfce-mixer-preferences.c"
+#line 788 "xfce-mixer-preferences.c"
 #undef __GOB_FUNCTION__
Index: xfce-mixer-slider-tiny.c
===================================================================
--- xfce-mixer-slider-tiny.c	(revision 25708)
+++ xfce-mixer-slider-tiny.c	(working copy)
@@ -8,9 +8,6 @@
 
 #define selfp (self->_priv)
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <string.h> /* memset() */
 
 #include "xfce-mixer-slider-tiny.h"
@@ -31,19 +28,19 @@
 #  include <config.h>
 #endif
 
-#line 35 "xfce-mixer-slider-tiny.c"
+#line 32 "xfce-mixer-slider-tiny.c"
 
 #line 6 "mixer-slider-tiny.gob"
 
 #include "xfce-mixer-control.h"
 
-#line 41 "xfce-mixer-slider-tiny.c"
+#line 38 "xfce-mixer-slider-tiny.c"
 
 #line 10 "mixer-slider-tiny.gob"
 
 extern GtkTooltips *tooltips;
 
-#line 47 "xfce-mixer-slider-tiny.c"
+#line 44 "xfce-mixer-slider-tiny.c"
 /* self casting macros */
 #define SELF(x) XFCE_MIXER_SLIDER_TINY(x)
 #define SELF_CONST(x) XFCE_MIXER_SLIDER_TINY_CONST(x)
@@ -60,8 +57,8 @@
 /* here are local prototypes */
 static void xfce_mixer_slider_tiny_class_init (XfceMixerSliderTinyClass * c) G_GNUC_UNUSED;
 static void xfce_mixer_slider_tiny_init (XfceMixerSliderTiny * self) G_GNUC_UNUSED;
-static void ___6_xfce_mixer_slider_tiny_value_changed (XfceMixerControl * pself) G_GNUC_UNUSED;
-static void ___7_xfce_mixer_slider_tiny_vcname_changed (XfceMixerControl * pself) G_GNUC_UNUSED;
+static void ___7_xfce_mixer_slider_tiny_value_changed (XfceMixerControl * pself) G_GNUC_UNUSED;
+static void ___8_xfce_mixer_slider_tiny_vcname_changed (XfceMixerControl * pself) G_GNUC_UNUSED;
 
 /* pointer to the class of our parent */
 static XfceMixerControlClass *parent_class = NULL;
@@ -71,6 +68,7 @@
 #define self_scroll_cb xfce_mixer_slider_tiny_scroll_cb
 #define self_button_cb xfce_mixer_slider_tiny_button_cb
 #define self_new xfce_mixer_slider_tiny_new
+#define self_set_color xfce_mixer_slider_tiny_set_color
 GType
 xfce_mixer_slider_tiny_get_type (void)
 {
@@ -121,25 +119,25 @@
 
 	parent_class = g_type_class_ref (XFCE_TYPE_MIXER_CONTROL);
 
-#line 127 "mixer-slider-tiny.gob"
-	xfce_mixer_control_class->value_changed = ___6_xfce_mixer_slider_tiny_value_changed;
-#line 141 "mixer-slider-tiny.gob"
-	xfce_mixer_control_class->vcname_changed = ___7_xfce_mixer_slider_tiny_vcname_changed;
-#line 129 "xfce-mixer-slider-tiny.c"
+#line 132 "mixer-slider-tiny.gob"
+	xfce_mixer_control_class->value_changed = ___7_xfce_mixer_slider_tiny_value_changed;
+#line 146 "mixer-slider-tiny.gob"
+	xfce_mixer_control_class->vcname_changed = ___8_xfce_mixer_slider_tiny_vcname_changed;
+#line 127 "xfce-mixer-slider-tiny.c"
 }
 #undef __GOB_FUNCTION__
 #line 33 "mixer-slider-tiny.gob"
 static void 
 xfce_mixer_slider_tiny_init (XfceMixerSliderTiny * self G_GNUC_UNUSED)
-#line 135 "xfce-mixer-slider-tiny.c"
+#line 133 "xfce-mixer-slider-tiny.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Slider:Tiny::init"
 #line 10 "mixer-slider-tiny.gob"
 	self->progress = NULL;
-#line 140 "xfce-mixer-slider-tiny.c"
+#line 138 "xfce-mixer-slider-tiny.c"
 #line 10 "mixer-slider-tiny.gob"
 	self->eb = NULL;
-#line 143 "xfce-mixer-slider-tiny.c"
+#line 141 "xfce-mixer-slider-tiny.c"
  {
 #line 34 "mixer-slider-tiny.gob"
 
@@ -175,7 +173,7 @@
 		g_signal_connect_swapped (self->eb, "button-press-event", G_CALLBACK(self_button_cb), self);
 		g_signal_connect_swapped (self->eb, "button-release-event", G_CALLBACK(self_button_cb), self);
 	
-#line 179 "xfce-mixer-slider-tiny.c"
+#line 177 "xfce-mixer-slider-tiny.c"
  }
 }
 #undef __GOB_FUNCTION__
@@ -184,14 +182,14 @@
 #line 19 "mixer-slider-tiny.gob"
 void 
 xfce_mixer_slider_tiny_set_vval (XfceMixerSliderTiny * self, gint vval)
-#line 188 "xfce-mixer-slider-tiny.c"
+#line 186 "xfce-mixer-slider-tiny.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Slider:Tiny::set_vval"
 #line 19 "mixer-slider-tiny.gob"
 	g_return_if_fail (self != NULL);
 #line 19 "mixer-slider-tiny.gob"
 	g_return_if_fail (XFCE_IS_MIXER_SLIDER_TINY (self));
-#line 195 "xfce-mixer-slider-tiny.c"
+#line 193 "xfce-mixer-slider-tiny.c"
 {
 #line 20 "mixer-slider-tiny.gob"
 	
@@ -206,21 +204,21 @@
 		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(self->progress),
 		  val / 100.0);
 	}}
-#line 210 "xfce-mixer-slider-tiny.c"
+#line 208 "xfce-mixer-slider-tiny.c"
 #undef __GOB_FUNCTION__
 
 
 #line 68 "mixer-slider-tiny.gob"
 gboolean 
 xfce_mixer_slider_tiny_scroll_cb (XfceMixerSliderTiny * self, GdkEventScroll * event, GtkWidget * w)
-#line 217 "xfce-mixer-slider-tiny.c"
+#line 215 "xfce-mixer-slider-tiny.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Slider:Tiny::scroll_cb"
 #line 68 "mixer-slider-tiny.gob"
 	g_return_val_if_fail (self != NULL, (gboolean )0);
 #line 68 "mixer-slider-tiny.gob"
 	g_return_val_if_fail (XFCE_IS_MIXER_SLIDER_TINY (self), (gboolean )0);
-#line 224 "xfce-mixer-slider-tiny.c"
+#line 222 "xfce-mixer-slider-tiny.c"
 {
 #line 69 "mixer-slider-tiny.gob"
 	
@@ -242,20 +240,20 @@
 		return TRUE;
 
 	}}
-#line 246 "xfce-mixer-slider-tiny.c"
+#line 244 "xfce-mixer-slider-tiny.c"
 #undef __GOB_FUNCTION__
 
 #line 89 "mixer-slider-tiny.gob"
 gboolean 
 xfce_mixer_slider_tiny_button_cb (XfceMixerSliderTiny * self, GdkEventButton * b, GtkWidget * widget)
-#line 252 "xfce-mixer-slider-tiny.c"
+#line 250 "xfce-mixer-slider-tiny.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Slider:Tiny::button_cb"
 #line 89 "mixer-slider-tiny.gob"
 	g_return_val_if_fail (self != NULL, (gboolean )0);
 #line 89 "mixer-slider-tiny.gob"
 	g_return_val_if_fail (XFCE_IS_MIXER_SLIDER_TINY (self), (gboolean )0);
-#line 259 "xfce-mixer-slider-tiny.c"
+#line 257 "xfce-mixer-slider-tiny.c"
 {
 #line 90 "mixer-slider-tiny.gob"
 	
@@ -264,7 +262,7 @@
 
 		y = (int)b->y;
 
-		if (b->button == 3 || b->button == 2) {
+		if (b->button == 2) {
 			if (b->type == GDK_BUTTON_PRESS) {
 				y = 0;
 			} else {
@@ -288,13 +286,13 @@
 		self_set_vval (self, y);
 		return TRUE;
 	}}
-#line 292 "xfce-mixer-slider-tiny.c"
+#line 290 "xfce-mixer-slider-tiny.c"
 #undef __GOB_FUNCTION__
 
 #line 122 "mixer-slider-tiny.gob"
 XfceMixerControl * 
 xfce_mixer_slider_tiny_new (void)
-#line 298 "xfce-mixer-slider-tiny.c"
+#line 296 "xfce-mixer-slider-tiny.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Slider:Tiny::new"
 {
@@ -302,25 +300,44 @@
 	
 		return XFCE_MIXER_CONTROL(GET_NEW);
 	}}
-#line 306 "xfce-mixer-slider-tiny.c"
+#line 304 "xfce-mixer-slider-tiny.c"
 #undef __GOB_FUNCTION__
 
 #line 127 "mixer-slider-tiny.gob"
+void 
+xfce_mixer_slider_tiny_set_color (XfceMixerSliderTiny * self, GdkColor * color)
+#line 310 "xfce-mixer-slider-tiny.c"
+{
+#define __GOB_FUNCTION__ "Xfce:Mixer:Slider:Tiny::set_color"
+#line 127 "mixer-slider-tiny.gob"
+	g_return_if_fail (self != NULL);
+#line 127 "mixer-slider-tiny.gob"
+	g_return_if_fail (XFCE_IS_MIXER_SLIDER_TINY (self));
+#line 317 "xfce-mixer-slider-tiny.c"
+{
+#line 128 "mixer-slider-tiny.gob"
+	
+		gtk_widget_modify_bg(self->progress, GTK_STATE_PRELIGHT, color);
+	}}
+#line 323 "xfce-mixer-slider-tiny.c"
+#undef __GOB_FUNCTION__
+
+#line 132 "mixer-slider-tiny.gob"
 static void 
-___6_xfce_mixer_slider_tiny_value_changed (XfceMixerControl * pself G_GNUC_UNUSED)
-#line 312 "xfce-mixer-slider-tiny.c"
+___7_xfce_mixer_slider_tiny_value_changed (XfceMixerControl * pself G_GNUC_UNUSED)
+#line 329 "xfce-mixer-slider-tiny.c"
 #define PARENT_HANDLER(___pself) \
 	{ if(XFCE_MIXER_CONTROL_CLASS(parent_class)->value_changed) \
 		(* XFCE_MIXER_CONTROL_CLASS(parent_class)->value_changed)(___pself); }
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Slider:Tiny::value_changed"
-#line 127 "mixer-slider-tiny.gob"
+#line 132 "mixer-slider-tiny.gob"
 	g_return_if_fail (pself != NULL);
-#line 127 "mixer-slider-tiny.gob"
+#line 132 "mixer-slider-tiny.gob"
 	g_return_if_fail (XFCE_IS_MIXER_CONTROL (pself));
-#line 322 "xfce-mixer-slider-tiny.c"
+#line 339 "xfce-mixer-slider-tiny.c"
 {
-#line 129 "mixer-slider-tiny.gob"
+#line 134 "mixer-slider-tiny.gob"
 	
 		gint v;
 
@@ -332,26 +349,26 @@
 
 		gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (self->progress), ((gdouble) v) / 100.0);
 	}}
-#line 336 "xfce-mixer-slider-tiny.c"
+#line 353 "xfce-mixer-slider-tiny.c"
 #undef __GOB_FUNCTION__
 #undef PARENT_HANDLER
 
-#line 141 "mixer-slider-tiny.gob"
+#line 146 "mixer-slider-tiny.gob"
 static void 
-___7_xfce_mixer_slider_tiny_vcname_changed (XfceMixerControl * pself G_GNUC_UNUSED)
-#line 343 "xfce-mixer-slider-tiny.c"
+___8_xfce_mixer_slider_tiny_vcname_changed (XfceMixerControl * pself G_GNUC_UNUSED)
+#line 360 "xfce-mixer-slider-tiny.c"
 #define PARENT_HANDLER(___pself) \
 	{ if(XFCE_MIXER_CONTROL_CLASS(parent_class)->vcname_changed) \
 		(* XFCE_MIXER_CONTROL_CLASS(parent_class)->vcname_changed)(___pself); }
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Slider:Tiny::vcname_changed"
-#line 141 "mixer-slider-tiny.gob"
+#line 146 "mixer-slider-tiny.gob"
 	g_return_if_fail (pself != NULL);
-#line 141 "mixer-slider-tiny.gob"
+#line 146 "mixer-slider-tiny.gob"
 	g_return_if_fail (XFCE_IS_MIXER_CONTROL (pself));
-#line 353 "xfce-mixer-slider-tiny.c"
+#line 370 "xfce-mixer-slider-tiny.c"
 {
-#line 143 "mixer-slider-tiny.gob"
+#line 148 "mixer-slider-tiny.gob"
 	
 		Self *self;
 		char *sanename;
@@ -365,6 +382,6 @@
 		}
 		g_free (sanename);
 	}}
-#line 369 "xfce-mixer-slider-tiny.c"
+#line 386 "xfce-mixer-slider-tiny.c"
 #undef __GOB_FUNCTION__
 #undef PARENT_HANDLER
Index: xfce-mixer-preferences.h
===================================================================
--- xfce-mixer-preferences.h	(revision 25708)
+++ xfce-mixer-preferences.h	(working copy)
@@ -80,10 +80,14 @@
 #define XFCE_MIXER_PREFERENCES_GET_PROP_MASTER(arg)	"master", __extension__ ({gchar **z = (arg); z;})
 #define XFCE_MIXER_PREFERENCES_PROP_LAUNCHER_COMMAND(arg)    	"launcher_command", __extension__ ({gchar *z = (arg); z;})
 #define XFCE_MIXER_PREFERENCES_GET_PROP_LAUNCHER_COMMAND(arg)	"launcher_command", __extension__ ({gchar **z = (arg); z;})
+#define XFCE_MIXER_PREFERENCES_PROP_LAUNCHER_SHOW(arg)    	"launcher_show", __extension__ ({gboolean z = (arg); z;})
+#define XFCE_MIXER_PREFERENCES_GET_PROP_LAUNCHER_SHOW(arg)	"launcher_show", __extension__ ({gboolean *z = (arg); z;})
 #define XFCE_MIXER_PREFERENCES_PROP_LAUNCHER_RUN_IN_TERMINAL(arg)    	"launcher_run_in_terminal", __extension__ ({gboolean z = (arg); z;})
 #define XFCE_MIXER_PREFERENCES_GET_PROP_LAUNCHER_RUN_IN_TERMINAL(arg)	"launcher_run_in_terminal", __extension__ ({gboolean *z = (arg); z;})
 #define XFCE_MIXER_PREFERENCES_PROP_LAUNCHER_USE_STARTUP_NOTIFICATION(arg)    	"launcher_use_startup_notification", __extension__ ({gboolean z = (arg); z;})
 #define XFCE_MIXER_PREFERENCES_GET_PROP_LAUNCHER_USE_STARTUP_NOTIFICATION(arg)	"launcher_use_startup_notification", __extension__ ({gboolean *z = (arg); z;})
+#define XFCE_MIXER_PREFERENCES_PROP_BAR_COLOR(arg)    	"bar_color", __extension__ ({gpointer z = (arg); z;})
+#define XFCE_MIXER_PREFERENCES_GET_PROP_BAR_COLOR(arg)	"bar_color", __extension__ ({gpointer *z = (arg); z;})
 #else /* __GNUC__ && !__STRICT_ANSI__ */
 #define XFCE_MIXER_PREFERENCES_PROP_DEVICE(arg)    	"device",(gchar *)(arg)
 #define XFCE_MIXER_PREFERENCES_GET_PROP_DEVICE(arg)	"device",(gchar **)(arg)
@@ -91,10 +95,14 @@
 #define XFCE_MIXER_PREFERENCES_GET_PROP_MASTER(arg)	"master",(gchar **)(arg)
 #define XFCE_MIXER_PREFERENCES_PROP_LAUNCHER_COMMAND(arg)    	"launcher_command",(gchar *)(arg)
 #define XFCE_MIXER_PREFERENCES_GET_PROP_LAUNCHER_COMMAND(arg)	"launcher_command",(gchar **)(arg)
+#define XFCE_MIXER_PREFERENCES_PROP_LAUNCHER_SHOW(arg)    	"launcher_show",(gboolean )(arg)
+#define XFCE_MIXER_PREFERENCES_GET_PROP_LAUNCHER_SHOW(arg)	"launcher_show",(gboolean *)(arg)
 #define XFCE_MIXER_PREFERENCES_PROP_LAUNCHER_RUN_IN_TERMINAL(arg)    	"launcher_run_in_terminal",(gboolean )(arg)
 #define XFCE_MIXER_PREFERENCES_GET_PROP_LAUNCHER_RUN_IN_TERMINAL(arg)	"launcher_run_in_terminal",(gboolean *)(arg)
 #define XFCE_MIXER_PREFERENCES_PROP_LAUNCHER_USE_STARTUP_NOTIFICATION(arg)    	"launcher_use_startup_notification",(gboolean )(arg)
 #define XFCE_MIXER_PREFERENCES_GET_PROP_LAUNCHER_USE_STARTUP_NOTIFICATION(arg)	"launcher_use_startup_notification",(gboolean *)(arg)
+#define XFCE_MIXER_PREFERENCES_PROP_BAR_COLOR(arg)    	"bar_color",(gpointer )(arg)
+#define XFCE_MIXER_PREFERENCES_GET_PROP_BAR_COLOR(arg)	"bar_color",(gpointer *)(arg)
 #endif /* __GNUC__ && !__STRICT_ANSI__ */
 
 
Index: xfce-mixer-slider-tiny.h
===================================================================
--- xfce-mixer-slider-tiny.h	(revision 25708)
+++ xfce-mixer-slider-tiny.h	(working copy)
@@ -57,6 +57,8 @@
 					GdkEventScroll * event,
 					GtkWidget * w);
 XfceMixerControl * 	xfce_mixer_slider_tiny_new	(void);
+void 	xfce_mixer_slider_tiny_set_color	(XfceMixerSliderTiny * self,
+					GdkColor * color);
 
 #ifdef __cplusplus
 }
Index: xfce-mixer-preferences-private.h
===================================================================
--- xfce-mixer-preferences-private.h	(revision 25708)
+++ xfce-mixer-preferences-private.h	(working copy)
@@ -27,12 +27,16 @@
 #line 34 "mixer-preferences.gob"
 	gchar * master;
 #line 50 "mixer-preferences.gob"
+	gboolean launcher_show;
+#line 52 "mixer-preferences.gob"
 	gchar * launcher_command;
-#line 58 "mixer-preferences.gob"
+#line 60 "mixer-preferences.gob"
 	gboolean launcher_run_in_terminal;
-#line 59 "mixer-preferences.gob"
+#line 61 "mixer-preferences.gob"
 	gboolean launcher_use_startup_notification;
-#line 36 "xfce-mixer-preferences-private.h"
+#line 63 "mixer-preferences.gob"
+	GdkColor * bar_color;
+#line 40 "xfce-mixer-preferences-private.h"
 };
 void 	xfce_mixer_preferences_fill_probably_master	(XfceMixerPreferences * self);
 gchar * 	xfce_mixer_preferences_find_probably_master	(XfceMixerPreferences * self);
Index: xfce-mixer-control.c
===================================================================
--- xfce-mixer-control.c	(revision 25708)
+++ xfce-mixer-control.c	(working copy)
@@ -8,9 +8,6 @@
 
 #define selfp (self->_priv)
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <string.h> /* memset() */
 
 #include "xfce-mixer-control.h"
@@ -29,7 +26,7 @@
 #  include <config.h>
 #endif
 
-#line 33 "xfce-mixer-control.c"
+#line 30 "xfce-mixer-control.c"
 
 #line 8 "mixer-control.gob"
 
@@ -41,13 +38,13 @@
 #include <libxfce4util/libxfce4util.h>
 #define emit 
 
-#line 45 "xfce-mixer-control.c"
+#line 42 "xfce-mixer-control.c"
 
 #line 18 "mixer-control.gob"
 
 #include <gtk/gtk.h>
 
-#line 51 "xfce-mixer-control.c"
+#line 48 "xfce-mixer-control.c"
 /* self casting macros */
 #define SELF(x) XFCE_MIXER_CONTROL(x)
 #define SELF_CONST(x) XFCE_MIXER_CONTROL_CONST(x)
@@ -153,7 +150,7 @@
 				VAR = NULL;
 			}
 		}
-#line 157 "xfce-mixer-control.c"
+#line 154 "xfce-mixer-control.c"
 	memset(&location, 0, sizeof(location));
 #undef VAR
 #undef location
@@ -167,7 +164,7 @@
 				VAR = NULL;
 			}
 		}
-#line 171 "xfce-mixer-control.c"
+#line 168 "xfce-mixer-control.c"
 	memset(&vcname, 0, sizeof(vcname));
 #undef VAR
 #undef vcname
@@ -181,7 +178,7 @@
 				VAR = NULL;
 			}
 		}
-#line 185 "xfce-mixer-control.c"
+#line 182 "xfce-mixer-control.c"
 	memset(&value, 0, sizeof(value));
 #undef VAR
 #undef value
@@ -249,21 +246,21 @@
 #line 86 "mixer-control.gob"
 static void 
 xfce_mixer_control_init (XfceMixerControl * self G_GNUC_UNUSED)
-#line 253 "xfce-mixer-control.c"
+#line 250 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::init"
 #line 93 "mixer-control.gob"
 	self->location = NULL;
-#line 258 "xfce-mixer-control.c"
+#line 255 "xfce-mixer-control.c"
 #line 98 "mixer-control.gob"
 	self->orderno = 0;
-#line 261 "xfce-mixer-control.c"
+#line 258 "xfce-mixer-control.c"
 #line 132 "mixer-control.gob"
 	self->vcname = NULL;
-#line 264 "xfce-mixer-control.c"
+#line 261 "xfce-mixer-control.c"
 #line 137 "mixer-control.gob"
 	self->value = NULL;
-#line 267 "xfce-mixer-control.c"
+#line 264 "xfce-mixer-control.c"
 }
 #undef __GOB_FUNCTION__
 
@@ -286,7 +283,7 @@
 			self->orderno = g_value_get_int (VAL);
 			emit self_location_changed (self);
 		
-#line 290 "xfce-mixer-control.c"
+#line 287 "xfce-mixer-control.c"
 		}
 		break;
 	case PROP_LOCATION:
@@ -300,7 +297,7 @@
 			self->location = g_strdup (g_value_get_string (VAL));
 			emit self_location_changed (self);
 		
-#line 304 "xfce-mixer-control.c"
+#line 301 "xfce-mixer-control.c"
 		}
 		break;
 	case PROP_VALUE:
@@ -315,7 +312,7 @@
 			self->value = g_strdup (g_value_get_string (VAL));
 			emit self_value_changed (self);
 		
-#line 319 "xfce-mixer-control.c"
+#line 316 "xfce-mixer-control.c"
 		}
 		break;
 	case PROP_VCNAME:
@@ -329,7 +326,7 @@
 			self->vcname = g_strdup (g_value_get_string (VAL));
 			emit self_vcname_changed (self);
 		
-#line 333 "xfce-mixer-control.c"
+#line 330 "xfce-mixer-control.c"
 		}
 		break;
 	default:
@@ -362,7 +359,7 @@
 
 			g_value_set_int (VAL, self->orderno);
 		
-#line 366 "xfce-mixer-control.c"
+#line 363 "xfce-mixer-control.c"
 		}
 		break;
 	case PROP_LOCATION:
@@ -371,7 +368,7 @@
 
 			g_value_set_string (VAL, self->location);
 		
-#line 375 "xfce-mixer-control.c"
+#line 372 "xfce-mixer-control.c"
 		}
 		break;
 	case PROP_VALUE:
@@ -380,7 +377,7 @@
 
 			g_value_set_string (VAL, self->value);
 		
-#line 384 "xfce-mixer-control.c"
+#line 381 "xfce-mixer-control.c"
 		}
 		break;
 	case PROP_VCNAME:
@@ -389,7 +386,7 @@
 
 			g_value_set_string (VAL, self->vcname);
 		
-#line 393 "xfce-mixer-control.c"
+#line 390 "xfce-mixer-control.c"
 		}
 		break;
 	default:
@@ -416,14 +413,14 @@
 #line 39 "mixer-control.gob"
 gchar * 
 xfce_mixer_control_calc_sanename (XfceMixerControl * self)
-#line 420 "xfce-mixer-control.c"
+#line 417 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::calc_sanename"
 #line 39 "mixer-control.gob"
 	g_return_val_if_fail (self != NULL, (gchar * )0);
 #line 39 "mixer-control.gob"
 	g_return_val_if_fail (XFCE_IS_MIXER_CONTROL (self), (gchar * )0);
-#line 427 "xfce-mixer-control.c"
+#line 424 "xfce-mixer-control.c"
 {
 #line 40 "mixer-control.gob"
 	 /* make this pretty */
@@ -442,20 +439,20 @@
 
 		return g_strdup_printf("%s", _(self->vcname));
 	}}
-#line 446 "xfce-mixer-control.c"
+#line 443 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 #line 59 "mixer-control.gob"
 void 
 xfce_mixer_control_vcname_changed (XfceMixerControl * self)
-#line 452 "xfce-mixer-control.c"
+#line 449 "xfce-mixer-control.c"
 {
 	XfceMixerControlClass *klass;
 #line 59 "mixer-control.gob"
 	g_return_if_fail (self != NULL);
 #line 59 "mixer-control.gob"
 	g_return_if_fail (XFCE_IS_MIXER_CONTROL (self));
-#line 459 "xfce-mixer-control.c"
+#line 456 "xfce-mixer-control.c"
 	klass = XFCE_MIXER_CONTROL_GET_CLASS(self);
 
 	if(klass->vcname_changed)
@@ -465,14 +462,14 @@
 #line 64 "mixer-control.gob"
 void 
 xfce_mixer_control_value_changed (XfceMixerControl * self)
-#line 469 "xfce-mixer-control.c"
+#line 466 "xfce-mixer-control.c"
 {
 	XfceMixerControlClass *klass;
 #line 64 "mixer-control.gob"
 	g_return_if_fail (self != NULL);
 #line 64 "mixer-control.gob"
 	g_return_if_fail (XFCE_IS_MIXER_CONTROL (self));
-#line 476 "xfce-mixer-control.c"
+#line 473 "xfce-mixer-control.c"
 	klass = XFCE_MIXER_CONTROL_GET_CLASS(self);
 
 	if(klass->value_changed)
@@ -482,14 +479,14 @@
 #line 69 "mixer-control.gob"
 void 
 xfce_mixer_control_location_changed (XfceMixerControl * self)
-#line 486 "xfce-mixer-control.c"
+#line 483 "xfce-mixer-control.c"
 {
 	XfceMixerControlClass *klass;
 #line 69 "mixer-control.gob"
 	g_return_if_fail (self != NULL);
 #line 69 "mixer-control.gob"
 	g_return_if_fail (XFCE_IS_MIXER_CONTROL (self));
-#line 493 "xfce-mixer-control.c"
+#line 490 "xfce-mixer-control.c"
 	klass = XFCE_MIXER_CONTROL_GET_CLASS(self);
 
 	if(klass->location_changed)
@@ -499,14 +496,14 @@
 #line 74 "mixer-control.gob"
 gint 
 xfce_mixer_control_calc_num_value (XfceMixerControl * self)
-#line 503 "xfce-mixer-control.c"
+#line 500 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::calc_num_value"
 #line 74 "mixer-control.gob"
 	g_return_val_if_fail (self != NULL, (gint )0);
 #line 74 "mixer-control.gob"
 	g_return_val_if_fail (XFCE_IS_MIXER_CONTROL (self), (gint )0);
-#line 510 "xfce-mixer-control.c"
+#line 507 "xfce-mixer-control.c"
 {
 #line 75 "mixer-control.gob"
 	
@@ -519,14 +516,14 @@
 
 		return v;
 	}}
-#line 523 "xfce-mixer-control.c"
+#line 520 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 
 #line 90 "mixer-control.gob"
 GtkWidget * 
 xfce_mixer_control_new (void)
-#line 530 "xfce-mixer-control.c"
+#line 527 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::new"
 {
@@ -534,109 +531,109 @@
 	
 		return (GtkWidget *)GET_NEW;
 	}}
-#line 538 "xfce-mixer-control.c"
+#line 535 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 #line 116 "mixer-control.gob"
 gint 
 xfce_mixer_control_get_orderno (XfceMixerControl * self)
-#line 544 "xfce-mixer-control.c"
+#line 541 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::get_orderno"
 {
 #line 106 "mixer-control.gob"
 		gint val; g_object_get (G_OBJECT (self), "orderno", &val, NULL); return val;
 }}
-#line 551 "xfce-mixer-control.c"
+#line 548 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 #line 112 "mixer-control.gob"
 void 
 xfce_mixer_control_set_orderno (XfceMixerControl * self, gint val)
-#line 557 "xfce-mixer-control.c"
+#line 554 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::set_orderno"
 {
 #line 106 "mixer-control.gob"
 		g_object_set (G_OBJECT (self), "orderno", val, NULL);
 }}
-#line 564 "xfce-mixer-control.c"
+#line 561 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 #line 132 "mixer-control.gob"
 gchar * 
 xfce_mixer_control_get_location (XfceMixerControl * self)
-#line 570 "xfce-mixer-control.c"
+#line 567 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::get_location"
 {
 #line 120 "mixer-control.gob"
 		gchar* val; g_object_get (G_OBJECT (self), "location", &val, NULL); return val;
 }}
-#line 577 "xfce-mixer-control.c"
+#line 574 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 #line 124 "mixer-control.gob"
 void 
 xfce_mixer_control_set_location (XfceMixerControl * self, gchar * val)
-#line 583 "xfce-mixer-control.c"
+#line 580 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::set_location"
 {
 #line 120 "mixer-control.gob"
 		g_object_set (G_OBJECT (self), "location", val, NULL);
 }}
-#line 590 "xfce-mixer-control.c"
+#line 587 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 #line 166 "mixer-control.gob"
 gchar * 
 xfce_mixer_control_get_value (XfceMixerControl * self)
-#line 596 "xfce-mixer-control.c"
+#line 593 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::get_value"
 {
 #line 152 "mixer-control.gob"
 		gchar* val; g_object_get (G_OBJECT (self), "value", &val, NULL); return val;
 }}
-#line 603 "xfce-mixer-control.c"
+#line 600 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 #line 157 "mixer-control.gob"
 void 
 xfce_mixer_control_set_value (XfceMixerControl * self, gchar * val)
-#line 609 "xfce-mixer-control.c"
+#line 606 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::set_value"
 {
 #line 152 "mixer-control.gob"
 		g_object_set (G_OBJECT (self), "value", val, NULL);
 }}
-#line 616 "xfce-mixer-control.c"
+#line 613 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 #line 182 "mixer-control.gob"
 gchar * 
 xfce_mixer_control_get_vcname (XfceMixerControl * self)
-#line 622 "xfce-mixer-control.c"
+#line 619 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::get_vcname"
 {
 #line 170 "mixer-control.gob"
 		gchar* val; g_object_get (G_OBJECT (self), "vcname", &val, NULL); return val;
 }}
-#line 629 "xfce-mixer-control.c"
+#line 626 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
 
 #line 174 "mixer-control.gob"
 void 
 xfce_mixer_control_set_vcname (XfceMixerControl * self, gchar * val)
-#line 635 "xfce-mixer-control.c"
+#line 632 "xfce-mixer-control.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Control::set_vcname"
 {
 #line 170 "mixer-control.gob"
 		g_object_set (G_OBJECT (self), "vcname", val, NULL);
 }}
-#line 642 "xfce-mixer-control.c"
+#line 639 "xfce-mixer-control.c"
 #undef __GOB_FUNCTION__
Index: xfce-mixer-prefbox.c
===================================================================
--- xfce-mixer-prefbox.c	(revision 25708)
+++ xfce-mixer-prefbox.c	(working copy)
@@ -8,9 +8,6 @@
 
 #define selfp (self->_priv)
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <string.h> /* memset() */
 
 #include "xfce-mixer-prefbox.h"
@@ -31,7 +28,7 @@
 #  include <config.h>
 #endif
 
-#line 35 "xfce-mixer-prefbox.c"
+#line 32 "xfce-mixer-prefbox.c"
 
 #line 6 "mixer-prefbox.gob"
 
@@ -47,7 +44,7 @@
 GtkWidget *gtk_list_item_new_with_label (const gchar *label);
 
 
-#line 51 "xfce-mixer-prefbox.c"
+#line 48 "xfce-mixer-prefbox.c"
 
 #line 23 "mixer-prefbox.gob"
 
@@ -59,7 +56,7 @@
 #include "stringlist.inc"
 
 
-#line 63 "xfce-mixer-prefbox.c"
+#line 60 "xfce-mixer-prefbox.c"
 /* self casting macros */
 #define SELF(x) XFCE_MIXER_PREFBOX(x)
 #define SELF_CONST(x) XFCE_MIXER_PREFBOX_CONST(x)
@@ -105,6 +102,7 @@
 #define self_add_command_box xfce_mixer_prefbox_add_command_box
 #define self_device_changed_delayed_cb xfce_mixer_prefbox_device_changed_delayed_cb
 #define self_device_changed_cb xfce_mixer_prefbox_device_changed_cb
+#define self_change_color_cb xfce_mixer_prefbox_change_color_cb
 #define self_new xfce_mixer_prefbox_new
 #define self_fill_preferences xfce_mixer_prefbox_fill_preferences
 #define self_save_preferences xfce_mixer_prefbox_save_preferences
@@ -167,16 +165,16 @@
 			stringlist_free(VAR);
 			VAR = NULL;
 		}
-#line 171 "xfce-mixer-prefbox.c"
+#line 169 "xfce-mixer-prefbox.c"
 	memset(&master_lst, 0, sizeof(master_lst));
 #undef VAR
 #undef master_lst
 #define device_entry_delayer (self->_priv->device_entry_delayer)
 #define VAR device_entry_delayer
 	{
-#line 47 "mixer-prefbox.gob"
+#line 51 "mixer-prefbox.gob"
 	 delayer_free (VAR); }
-#line 180 "xfce-mixer-prefbox.c"
+#line 178 "xfce-mixer-prefbox.c"
 	memset(&device_entry_delayer, 0, sizeof(device_entry_delayer));
 #undef VAR
 #undef device_entry_delayer
@@ -202,33 +200,33 @@
 			g_cclosure_marshal_VOID__VOID,
 			G_TYPE_NONE, 0);
 
-#line 135 "mixer-prefbox.gob"
+#line 144 "mixer-prefbox.gob"
 	c->device_changed = ___real_xfce_mixer_prefbox_device_changed;
-#line 208 "xfce-mixer-prefbox.c"
+#line 206 "xfce-mixer-prefbox.c"
 	g_object_class->finalize = ___finalize;
 }
 #undef __GOB_FUNCTION__
-#line 166 "mixer-prefbox.gob"
+#line 175 "mixer-prefbox.gob"
 static void 
 xfce_mixer_prefbox_init (XfceMixerPrefbox * self G_GNUC_UNUSED)
-#line 215 "xfce-mixer-prefbox.c"
+#line 213 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::init"
 	self->_priv = G_TYPE_INSTANCE_GET_PRIVATE(self,XFCE_TYPE_MIXER_PREFBOX,XfceMixerPrefboxPrivate);
 #line 23 "mixer-prefbox.gob"
 	self->master_lst = NULL;
-#line 221 "xfce-mixer-prefbox.c"
+#line 219 "xfce-mixer-prefbox.c"
 #line 37 "mixer-prefbox.gob"
 	self->_priv->device_entry_delayer = 0;
-#line 224 "xfce-mixer-prefbox.c"
-#line 47 "mixer-prefbox.gob"
+#line 222 "xfce-mixer-prefbox.c"
+#line 51 "mixer-prefbox.gob"
 	self->launcher_entry = NULL;
-#line 227 "xfce-mixer-prefbox.c"
-#line 47 "mixer-prefbox.gob"
+#line 225 "xfce-mixer-prefbox.c"
+#line 51 "mixer-prefbox.gob"
 	self->click_b = NULL;
-#line 230 "xfce-mixer-prefbox.c"
+#line 228 "xfce-mixer-prefbox.c"
  {
-#line 167 "mixer-prefbox.gob"
+#line 176 "mixer-prefbox.gob"
 
 		GtkWidget *dentry;
 		GtkWidget *item;
@@ -236,15 +234,26 @@
 		gtk_box_set_spacing (GTK_BOX (self), 5);
 		self->device_cb = GTK_COMBO (gtk_combo_new ());
 		self->master_om = GTK_OPTION_MENU (gtk_option_menu_new ());
+		self->launcher_show_c = GTK_CHECK_BUTTON (gtk_check_button_new ());
 
-
 		gtk_container_set_border_width (GTK_CONTAINER (self), 5);
 		gtk_box_pack_start (GTK_BOX (self), twocol_label (_("Device:"), GTK_WIDGET (self->device_cb)), FALSE, FALSE, 0);
 		gtk_box_pack_start (GTK_BOX (self), twocol_label (_("Wannabe Master:"), GTK_WIDGET (self->master_om)), FALSE, FALSE, 0);
+		gtk_box_pack_start (GTK_BOX (self), twocol_label (_("Show icon"), GTK_WIDGET (self->launcher_show_c)), FALSE, FALSE, 0);
 
 		gtk_box_pack_start (GTK_BOX (self), headline (_("When clicked"), &self->click_b), FALSE, FALSE, 0);
 
+		self->color_button = gtk_button_new ();
+		self->color_da = gtk_drawing_area_new ();
 
+		gtk_widget_set_size_request (self->color_da, 64, 12);
+		gtk_widget_show (GTK_WIDGET (self->color_da));
+		gtk_container_add(GTK_CONTAINER (self->color_button),
+			self->color_da);
+		/*gtk_widget_show (GTK_WIDGET (color_button));*/
+		gtk_box_pack_start (GTK_BOX (self), twocol_label (_("Bar color:"), GTK_WIDGET (self->color_button)), FALSE, FALSE, 0);
+
+
 		gtk_entry_set_max_length (GTK_ENTRY (self->device_cb->entry), 50);
 
 		gtk_combo_set_value_in_list (GTK_COMBO (self->device_cb), FALSE, TRUE);
@@ -258,6 +267,8 @@
 		dentry = GTK_WIDGET (self->device_cb->entry);
 		g_signal_connect_swapped (G_OBJECT (dentry), "changed", G_CALLBACK (self_device_changed_cb), self);
 
+		g_signal_connect_swapped (G_OBJECT (self->color_button), "clicked", G_CALLBACK (self_change_color_cb), self);
+
 		if (self->execu_cb && g_find_program_in_path ("xfce4-mixer")) {
 			item = gtk_list_item_new_with_label ("xfce4-mixer");
 			gtk_widget_show (item);
@@ -265,46 +276,51 @@
 			gtk_container_add (GTK_CONTAINER (GTK_COMBO (self->execu_cb)->list), item);
 		}
 	
-#line 269 "xfce-mixer-prefbox.c"
+#line 280 "xfce-mixer-prefbox.c"
  }
 }
 #undef __GOB_FUNCTION__
 
 
-#line 51 "mixer-prefbox.gob"
+#line 55 "mixer-prefbox.gob"
 void 
 xfce_mixer_prefbox_fill_defaults (XfceMixerPrefbox * self)
-#line 278 "xfce-mixer-prefbox.c"
+#line 289 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::fill_defaults"
-#line 51 "mixer-prefbox.gob"
+#line 55 "mixer-prefbox.gob"
 	g_return_if_fail (self != NULL);
-#line 51 "mixer-prefbox.gob"
+#line 55 "mixer-prefbox.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFBOX (self));
-#line 285 "xfce-mixer-prefbox.c"
+#line 296 "xfce-mixer-prefbox.c"
 {
-#line 52 "mixer-prefbox.gob"
+#line 56 "mixer-prefbox.gob"
 	
 		launcher_entry_set_command (self->launcher_entry, "xfce4-mixer", FALSE, TRUE);
 		gtk_entry_set_text (GTK_ENTRY (self->device_cb->entry), "");
+		if (self->bar_color == NULL) {
+			self->bar_color = g_new(GdkColor, 1);
+		}
+		gdk_color_parse("#00c000", self->bar_color);
+		gtk_widget_modify_bg(self->color_da, GTK_STATE_NORMAL, self->bar_color);
 		emit self_device_changed (self);
 	}}
-#line 293 "xfce-mixer-prefbox.c"
+#line 309 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 58 "mixer-prefbox.gob"
+#line 67 "mixer-prefbox.gob"
 void 
 xfce_mixer_prefbox_fill_device_list (XfceMixerPrefbox * self)
-#line 299 "xfce-mixer-prefbox.c"
+#line 315 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::fill_device_list"
-#line 58 "mixer-prefbox.gob"
+#line 67 "mixer-prefbox.gob"
 	g_return_if_fail (self != NULL);
-#line 58 "mixer-prefbox.gob"
+#line 67 "mixer-prefbox.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFBOX (self));
-#line 306 "xfce-mixer-prefbox.c"
+#line 322 "xfce-mixer-prefbox.c"
 {
-#line 59 "mixer-prefbox.gob"
+#line 68 "mixer-prefbox.gob"
 	
 		GList *gl;
 
@@ -317,22 +333,22 @@
 			/* gtk_combo_set_popdown_strings (, NUL); issues warning */
 		}
 	}}
-#line 321 "xfce-mixer-prefbox.c"
+#line 337 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 72 "mixer-prefbox.gob"
+#line 81 "mixer-prefbox.gob"
 void 
 xfce_mixer_prefbox_fill_master_list (XfceMixerPrefbox * self)
-#line 327 "xfce-mixer-prefbox.c"
+#line 343 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::fill_master_list"
-#line 72 "mixer-prefbox.gob"
+#line 81 "mixer-prefbox.gob"
 	g_return_if_fail (self != NULL);
-#line 72 "mixer-prefbox.gob"
+#line 81 "mixer-prefbox.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFBOX (self));
-#line 334 "xfce-mixer-prefbox.c"
+#line 350 "xfce-mixer-prefbox.c"
 {
-#line 73 "mixer-prefbox.gob"
+#line 82 "mixer-prefbox.gob"
 	
 		stringlist_free (self->master_lst);
 		self->master_lst = NULL;
@@ -340,22 +356,22 @@
 
 		fill_string_option_menu (self->master_om, self->master_lst);
 	}}
-#line 344 "xfce-mixer-prefbox.c"
+#line 360 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 81 "mixer-prefbox.gob"
+#line 90 "mixer-prefbox.gob"
 gchar * 
 xfce_mixer_prefbox_find_name_by_master_i (XfceMixerPrefbox * self, gint master_i)
-#line 350 "xfce-mixer-prefbox.c"
+#line 366 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::find_name_by_master_i"
-#line 81 "mixer-prefbox.gob"
+#line 90 "mixer-prefbox.gob"
 	g_return_val_if_fail (self != NULL, (gchar * )0);
-#line 81 "mixer-prefbox.gob"
+#line 90 "mixer-prefbox.gob"
 	g_return_val_if_fail (XFCE_IS_MIXER_PREFBOX (self), (gchar * )0);
-#line 357 "xfce-mixer-prefbox.c"
+#line 373 "xfce-mixer-prefbox.c"
 {
-#line 82 "mixer-prefbox.gob"
+#line 91 "mixer-prefbox.gob"
 	
 		gint i;
 		GList *g;
@@ -378,22 +394,22 @@
 		}
 		return NULL;
 	}}
-#line 382 "xfce-mixer-prefbox.c"
+#line 398 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 105 "mixer-prefbox.gob"
+#line 114 "mixer-prefbox.gob"
 gint 
 xfce_mixer_prefbox_find_master_by_name (XfceMixerPrefbox * self, gchar const * name)
-#line 388 "xfce-mixer-prefbox.c"
+#line 404 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::find_master_by_name"
-#line 105 "mixer-prefbox.gob"
+#line 114 "mixer-prefbox.gob"
 	g_return_val_if_fail (self != NULL, (gint )0);
-#line 105 "mixer-prefbox.gob"
+#line 114 "mixer-prefbox.gob"
 	g_return_val_if_fail (XFCE_IS_MIXER_PREFBOX (self), (gint )0);
-#line 395 "xfce-mixer-prefbox.c"
+#line 411 "xfce-mixer-prefbox.c"
 {
-#line 106 "mixer-prefbox.gob"
+#line 115 "mixer-prefbox.gob"
 	
 		gint i;
 		gint master_i;
@@ -421,13 +437,13 @@
 
 		return master_i;
 	}}
-#line 425 "xfce-mixer-prefbox.c"
+#line 441 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 135 "mixer-prefbox.gob"
+#line 144 "mixer-prefbox.gob"
 void 
 xfce_mixer_prefbox_device_changed (XfceMixerPrefbox * self)
-#line 431 "xfce-mixer-prefbox.c"
+#line 447 "xfce-mixer-prefbox.c"
 {
 	GValue ___param_values[1];
 	GValue ___return_val;
@@ -435,11 +451,11 @@
 memset (&___return_val, 0, sizeof (___return_val));
 memset (&___param_values, 0, sizeof (___param_values));
 
-#line 135 "mixer-prefbox.gob"
+#line 144 "mixer-prefbox.gob"
 	g_return_if_fail (self != NULL);
-#line 135 "mixer-prefbox.gob"
+#line 144 "mixer-prefbox.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFBOX (self));
-#line 443 "xfce-mixer-prefbox.c"
+#line 459 "xfce-mixer-prefbox.c"
 
 	___param_values[0].g_type = 0;
 	g_value_init (&___param_values[0], G_TYPE_FROM_INSTANCE (self));
@@ -452,14 +468,14 @@
 
 	g_value_unset (&___param_values[0]);
 }
-#line 135 "mixer-prefbox.gob"
+#line 144 "mixer-prefbox.gob"
 static void 
 ___real_xfce_mixer_prefbox_device_changed (XfceMixerPrefbox * self G_GNUC_UNUSED)
-#line 459 "xfce-mixer-prefbox.c"
+#line 475 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::device_changed"
 {
-#line 137 "mixer-prefbox.gob"
+#line 146 "mixer-prefbox.gob"
 	
 		gint omi;
 		gchar const *txt;
@@ -488,23 +504,23 @@
 		gtk_option_menu_set_history (self->master_om, omi);
 
 	}}
-#line 492 "xfce-mixer-prefbox.c"
+#line 508 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
 
-#line 204 "mixer-prefbox.gob"
+#line 226 "mixer-prefbox.gob"
 void 
 xfce_mixer_prefbox_add_command_box (XfceMixerPrefbox * self)
-#line 499 "xfce-mixer-prefbox.c"
+#line 515 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::add_command_box"
-#line 204 "mixer-prefbox.gob"
+#line 226 "mixer-prefbox.gob"
 	g_return_if_fail (self != NULL);
-#line 204 "mixer-prefbox.gob"
+#line 226 "mixer-prefbox.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFBOX (self));
-#line 506 "xfce-mixer-prefbox.c"
+#line 522 "xfce-mixer-prefbox.c"
 {
-#line 205 "mixer-prefbox.gob"
+#line 227 "mixer-prefbox.gob"
 	
 		self->launcher_entry = launcher_entry_new ();
 		self->execu_cb = NULL; /*self->ic->combo;*/
@@ -514,43 +530,43 @@
 		gtk_widget_show (GTK_WIDGET (launcher_entry_get_widget (self->launcher_entry)));
 		gtk_box_pack_start (GTK_BOX (self->click_b), GTK_WIDGET (launcher_entry_get_widget (self->launcher_entry)), FALSE, FALSE, 0);
 	}}
-#line 518 "xfce-mixer-prefbox.c"
+#line 534 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 215 "mixer-prefbox.gob"
+#line 237 "mixer-prefbox.gob"
 gboolean 
 xfce_mixer_prefbox_device_changed_delayed_cb (XfceMixerPrefbox * self)
-#line 524 "xfce-mixer-prefbox.c"
+#line 540 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::device_changed_delayed_cb"
-#line 215 "mixer-prefbox.gob"
+#line 237 "mixer-prefbox.gob"
 	g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 215 "mixer-prefbox.gob"
+#line 237 "mixer-prefbox.gob"
 	g_return_val_if_fail (XFCE_IS_MIXER_PREFBOX (self), (gboolean )0);
-#line 531 "xfce-mixer-prefbox.c"
+#line 547 "xfce-mixer-prefbox.c"
 {
-#line 216 "mixer-prefbox.gob"
+#line 238 "mixer-prefbox.gob"
 	
 		/*printf ("delayed\n");*/
 		emit self_device_changed (self);
 		return FALSE;
 	}}
-#line 539 "xfce-mixer-prefbox.c"
+#line 555 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 222 "mixer-prefbox.gob"
+#line 244 "mixer-prefbox.gob"
 void 
 xfce_mixer_prefbox_device_changed_cb (XfceMixerPrefbox * self, GtkEditable * e)
-#line 545 "xfce-mixer-prefbox.c"
+#line 561 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::device_changed_cb"
-#line 222 "mixer-prefbox.gob"
+#line 244 "mixer-prefbox.gob"
 	g_return_if_fail (self != NULL);
-#line 222 "mixer-prefbox.gob"
+#line 244 "mixer-prefbox.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFBOX (self));
-#line 552 "xfce-mixer-prefbox.c"
+#line 568 "xfce-mixer-prefbox.c"
 {
-#line 223 "mixer-prefbox.gob"
+#line 245 "mixer-prefbox.gob"
 	
 		delayer_restart (
 			&self->_priv->device_entry_delayer, 
@@ -558,45 +574,89 @@
 			self
 		);
 	}}
-#line 562 "xfce-mixer-prefbox.c"
+#line 578 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 231 "mixer-prefbox.gob"
+#line 253 "mixer-prefbox.gob"
+void 
+xfce_mixer_prefbox_change_color_cb (XfceMixerPrefbox * self)
+#line 584 "xfce-mixer-prefbox.c"
+{
+#define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::change_color_cb"
+#line 253 "mixer-prefbox.gob"
+	g_return_if_fail (self != NULL);
+#line 253 "mixer-prefbox.gob"
+	g_return_if_fail (XFCE_IS_MIXER_PREFBOX (self));
+#line 591 "xfce-mixer-prefbox.c"
+{
+#line 254 "mixer-prefbox.gob"
+	
+		GtkWidget *dialog;
+		GtkColorSelection *colorsel;
+		gint response;
+
+		dialog = gtk_color_selection_dialog_new(_("Select color"));
+		gtk_window_set_transient_for(GTK_WINDOW(dialog),
+		                             GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(self))));
+		colorsel = GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel);
+		gtk_color_selection_set_previous_color(colorsel,
+		                                       self->bar_color);
+		gtk_color_selection_set_current_color(colorsel,
+		                                      self->bar_color);
+		gtk_color_selection_set_has_palette(colorsel, TRUE);
+
+		response = gtk_dialog_run(GTK_DIALOG(dialog));
+		if (response == GTK_RESPONSE_OK)
+		{
+			gtk_color_selection_get_current_color(colorsel,
+			                                      self->bar_color);
+			gtk_widget_modify_bg(self->color_da,
+			                     GTK_STATE_NORMAL,
+			                     self->bar_color);
+		}
+
+		gtk_widget_destroy(dialog);
+	}}
+#line 621 "xfce-mixer-prefbox.c"
+#undef __GOB_FUNCTION__
+
+#line 282 "mixer-prefbox.gob"
 XfceMixerPrefbox * 
 xfce_mixer_prefbox_new (void)
-#line 568 "xfce-mixer-prefbox.c"
+#line 627 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::new"
 {
-#line 232 "mixer-prefbox.gob"
+#line 283 "mixer-prefbox.gob"
 	
 		XfceMixerPrefbox* w;
 		w = (XfceMixerPrefbox*) (GET_NEW);
 		xfce_mixer_prefbox_add_command_box (XFCE_MIXER_PREFBOX (w));
 		return w;
 	}}
-#line 579 "xfce-mixer-prefbox.c"
+#line 638 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 239 "mixer-prefbox.gob"
+#line 290 "mixer-prefbox.gob"
 void 
 xfce_mixer_prefbox_fill_preferences (XfceMixerPrefbox * self, XfceMixerPreferences * p)
-#line 585 "xfce-mixer-prefbox.c"
+#line 644 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::fill_preferences"
-#line 239 "mixer-prefbox.gob"
+#line 290 "mixer-prefbox.gob"
 	g_return_if_fail (self != NULL);
-#line 239 "mixer-prefbox.gob"
+#line 290 "mixer-prefbox.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFBOX (self));
-#line 592 "xfce-mixer-prefbox.c"
+#line 651 "xfce-mixer-prefbox.c"
 {
-#line 240 "mixer-prefbox.gob"
+#line 291 "mixer-prefbox.gob"
 	
 		gint omi;
 		gchar* launcher_command;
 		gboolean launcher_run_in_terminal;
 		gboolean launcher_use_startup_notification;
 		gchar* device;
+		gboolean launcher_show;
 		gchar* master_control;
 
 		launcher_command = NULL;
@@ -610,15 +670,27 @@
 			return;
 		}
 
+		if (self->bar_color) {
+			gdk_color_free (self->bar_color);
+		}
+
 		g_object_get (G_OBJECT (p),
 			"launcher_command", &launcher_command, 
 			"launcher_run_in_terminal", &launcher_run_in_terminal,
 			"launcher_use_startup_notification", &launcher_use_startup_notification,
+			"launcher_show", &launcher_show, 
+			"bar_color", &self->bar_color, 
 			"device", &device,
 			"master", &master_control,
 			NULL
 		);
 
+		if (!self->bar_color) {
+			self->bar_color = g_new(GdkColor, 1);
+			gdk_color_parse("#00c000", self->bar_color);
+		}
+		gtk_widget_modify_bg(self->color_da, GTK_STATE_NORMAL, self->bar_color);
+
 		launcher_entry_set_command (self->launcher_entry, 
 			nvl (launcher_command, "xfce4-mixer"),
 			launcher_run_in_terminal,
@@ -626,6 +698,7 @@
 		);
 
 		gtk_entry_set_text (GTK_ENTRY (self->device_cb->entry), nvl (device, ""));
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(self->launcher_show_c), launcher_show);
 
 		omi = self_find_master_by_name (self, master_control);
 
@@ -648,22 +721,22 @@
 
 		emit self_device_changed (self);
 	}}
-#line 652 "xfce-mixer-prefbox.c"
+#line 725 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
 
-#line 298 "mixer-prefbox.gob"
+#line 363 "mixer-prefbox.gob"
 void 
 xfce_mixer_prefbox_save_preferences (XfceMixerPrefbox * self, XfceMixerPreferences * p)
-#line 658 "xfce-mixer-prefbox.c"
+#line 731 "xfce-mixer-prefbox.c"
 {
 #define __GOB_FUNCTION__ "Xfce:Mixer:Prefbox::save_preferences"
-#line 298 "mixer-prefbox.gob"
+#line 363 "mixer-prefbox.gob"
 	g_return_if_fail (self != NULL);
-#line 298 "mixer-prefbox.gob"
+#line 363 "mixer-prefbox.gob"
 	g_return_if_fail (XFCE_IS_MIXER_PREFBOX (self));
-#line 665 "xfce-mixer-prefbox.c"
+#line 738 "xfce-mixer-prefbox.c"
 {
-#line 299 "mixer-prefbox.gob"
+#line 364 "mixer-prefbox.gob"
 	
 		gint omi;
 		gchar *execu;
@@ -671,6 +744,7 @@
 		gchar *master;
 		gboolean startup_nf;
 		gboolean in_terminal;
+		gboolean launcher_show;
 
 		if (!p)
 			return;
@@ -683,12 +757,16 @@
 
 		launcher_entry_get_command (self->launcher_entry, &execu, &in_terminal, &startup_nf);
 
+		launcher_show = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->launcher_show_c));
+
 		g_object_set (G_OBJECT (p),
 			"device", device,
 			"launcher_command", execu,
 			"master", master,
 			"launcher_use_startup_notification", startup_nf,
 			"launcher_run_in_terminal", in_terminal,
+			"launcher_show", launcher_show,
+			"bar_color", self->bar_color,
 			NULL
 		);
 
@@ -698,5 +776,5 @@
 		if (master)
 			g_free (master);
 	}}
-#line 702 "xfce-mixer-prefbox.c"
+#line 780 "xfce-mixer-prefbox.c"
 #undef __GOB_FUNCTION__
Index: xfce-mixer-prefbox.h
===================================================================
--- xfce-mixer-prefbox.h	(revision 25708)
+++ xfce-mixer-prefbox.h	(working copy)
@@ -56,6 +56,10 @@
 	GtkOptionMenu * master_om; /* protected */
 	GList * master_lst; /* protected */
 	GtkCombo * execu_cb; /* protected */
+	GtkCheckButton * launcher_show_c; /* protected */
+	GtkWidget * color_button; /* protected */
+	GtkWidget * color_da; /* protected */
+	GdkColor * bar_color; /* protected */
 	LauncherEntry * launcher_entry; /* protected */
 	GtkWidget * click_b; /* protected */
 	XfceMixerPrefboxPrivate *_priv;
Index: xfce-mixer-prefbox-private.h
===================================================================
--- xfce-mixer-prefbox-private.h	(revision 25708)
+++ xfce-mixer-prefbox-private.h	(working copy)
@@ -26,7 +26,7 @@
 #line 6 "mixer-prefbox.gob"
 #line 28 "xfce-mixer-prefbox-private.h"
 struct _XfceMixerPrefboxPrivate {
-#line 46 "mixer-prefbox.gob"
+#line 50 "mixer-prefbox.gob"
 	delayer_t device_entry_delayer;
 #line 32 "xfce-mixer-prefbox-private.h"
 };
@@ -37,6 +37,7 @@
 void 	xfce_mixer_prefbox_add_command_box	(XfceMixerPrefbox * self);
 gboolean 	xfce_mixer_prefbox_device_changed_delayed_cb	(XfceMixerPrefbox * self);
 void 	xfce_mixer_prefbox_device_changed_cb	(XfceMixerPrefbox * self, GtkEditable * e);
+void 	xfce_mixer_prefbox_change_color_cb	(XfceMixerPrefbox * self);
 
 #ifdef __cplusplus
 }