Blob Blame History Raw
diff -Nur xfce4-panel-4.4.2.orig/config/Makefile.am xfce4-panel-4.4.2/config/Makefile.am
--- xfce4-panel-4.4.2.orig/config/Makefile.am   2007-11-17 20:30:59.000000000 +0100
+++ xfce4-panel-4.4.2/config/Makefile.am        2008-02-19 23:45:57.000000000 +0100
@@ -7,12 +7,12 @@
 conf_files = $(conf_in_files:.rc.in=.rc)
 
 confdir = $(sysconfdir)/xdg/xfce4/panel
-conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_files)
+conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc $(conf_files)
 
 # copied from INTLTOOL_DESKTOP_RULE
 %.rc:   %.rc.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
-EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_in_files)
+EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc $(conf_in_files)
 
 distclean-local:	
 	rm -f $(conf_files)
diff -Nur xfce4-panel-4.4.2.orig/config/Makefile.in xfce4-panel-4.4.2/config/Makefile.in
--- xfce4-panel-4.4.2.orig/config/Makefile.in   2007-11-17 20:46:03.000000000 +0100
+++ xfce4-panel-4.4.2/config/Makefile.in        2008-02-19 23:53:10.000000000 +0100
@@ -255,8 +255,8 @@
 
 conf_files = $(conf_in_files:.rc.in=.rc)
 confdir = $(sysconfdir)/xdg/xfce4/panel
-conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_files)
-EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_in_files)
+conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc $(conf_files)
+EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc $(conf_in_files)
 all: all-am
 
 .SUFFIXES:
diff -Nur xfce4-panel-4.4.2.orig/config/panels.xml xfce4-panel-4.4.2/config/panels.xml
--- xfce4-panel-4.4.2.orig/config/panels.xml	2007-11-17 20:30:59.000000000 +0100
+++ xfce4-panel-4.4.2/config/panels.xml	2008-02-19 23:12:03.000000000 +0100
@@ -19,6 +19,8 @@
 			<item name="pager" id="2"/>
 			<item name="tasklist" id="3"/>
 			<item name="systray" id="4"/>
+			<item name="xfce4-mixer" id="20"/>
+			<item name="thunar-tpa" id="21"/>
 		</items>
 	</panel>
 	<panel>
diff -Nur xfce4-panel-4.4.2.orig/config/xfce4-mixer-20.rc xfce4-panel-4.4.2/config/xfce4-mixer-20.rc
--- xfce4-panel-4.4.2.orig/config/xfce4-mixer-20.rc	1970-01-01 01:00:00.000000000 +0100
+++ xfce4-panel-4.4.2/config/xfce4-mixer-20.rc	2008-02-19 23:04:21.000000000 +0100
@@ -0,0 +1,7 @@
+[mixer-plugin]
+LauncherRunInTerminal=false
+LauncherUseStartupNotification=false
+Device=default
+LauncherCommand=xfce4-mixer
+MasterControl=Master,0
+