Blob Blame History Raw
diff -Nur xfce4-panel-4.6.0.orig/config/Makefile.am xfce4-panel-4.6.0/config/Makefile.am
--- xfce4-panel-4.6.0.orig/config/Makefile.am	2009-01-12 14:35:34.000000000 -0700
+++ xfce4-panel-4.6.0/config/Makefile.am	2009-02-27 11:04:19.000000000 -0700
@@ -17,6 +17,7 @@
 	systray-4.rc							\
 	xfce4-menu-5.rc							\
 	clock-14.rc							\
+	xfce4-mixer-20.rc						\
 	$(conf_files)
 
 # copied from INTLTOOL_DESKTOP_RULE
@@ -27,6 +28,7 @@
 	systray-4.rc							\
 	xfce4-menu-5.rc							\
 	clock-14.rc							\
+	xfce4-mixer-20.rc						\
 	$(conf_in_files)
 
 distclean-local:
diff -Nur xfce4-panel-4.6.0.orig/config/Makefile.in xfce4-panel-4.6.0/config/Makefile.in
--- xfce4-panel-4.6.0.orig/config/Makefile.in	2009-02-24 14:39:18.000000000 -0700
+++ xfce4-panel-4.6.0/config/Makefile.in	2009-02-27 11:04:19.000000000 -0700
@@ -279,6 +279,7 @@
 	systray-4.rc							\
 	xfce4-menu-5.rc							\
 	clock-14.rc							\
+	xfce4-mixer-20.rc						\
 	$(conf_files)
 
 EXTRA_DIST = \
@@ -286,6 +287,7 @@
 	systray-4.rc							\
 	xfce4-menu-5.rc							\
 	clock-14.rc							\
+	xfce4-mixer-20.rc						\
 	$(conf_in_files)
 
 all: all-am
diff -Nur xfce4-panel-4.6.0.orig/config/panels.xml xfce4-panel-4.6.0/config/panels.xml
--- xfce4-panel-4.6.0.orig/config/panels.xml	2009-02-24 14:14:35.000000000 -0700
+++ xfce4-panel-4.6.0/config/panels.xml	2009-02-27 11:07:35.000000000 -0700
@@ -23,6 +23,8 @@
 			<item name="launcher" id="10"/>
 			<item name="tasklist" id="3"/>
 			<item name="systray" id="4"/>
+			<item name="xfce4-mixer" id="20"/>
+			<item name="thunar-tpa" id="21"/>
 			<item name="pager" id="2"/>
 			<item name="showdesktop" id="1"/>
 			<item name="separator" id="11"/>
diff -Nur xfce4-panel-4.6.0.orig/config/xfce4-mixer-20.rc xfce4-panel-4.6.0/config/xfce4-mixer-20.rc
--- xfce4-panel-4.6.0.orig/config/xfce4-mixer-20.rc	1969-12-31 17:00:00.000000000 -0700
+++ xfce4-panel-4.6.0/config/xfce4-mixer-20.rc	2009-02-27 11:04:19.000000000 -0700
@@ -0,0 +1,6 @@
+[mixer-plugin]
+LauncherRunInTerminal=false
+LauncherUseStartupNotification=false
+Device=default
+LauncherCommand=xfce4-mixer
+MasterControl=Master,0