From a3aa33acac22e59d0c8c9d13baf65e56e3bcddea Mon Sep 17 00:00:00 2001
From: fake <fake@rapidnetworks.de>
Date: Wed, 26 Jul 2006 15:41:33 +0000
Subject: [PATCH] fake: 	gnome-panel: disable the mixer applet, it's broken 
 right now, add a postinstall script to at least get 	a basic default
 panel/menu setup

[2006072402080325210] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7765 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 .../disable-mixer-applet-default.patch        | 73 +++++++++++++++++++
 package/gnome2/gnome-panel/postinstall.sh     | 15 ++++
 2 files changed, 88 insertions(+)
 create mode 100644 package/gnome2/gnome-panel/disable-mixer-applet-default.patch
 create mode 100644 package/gnome2/gnome-panel/postinstall.sh

diff --git a/package/gnome2/gnome-panel/disable-mixer-applet-default.patch b/package/gnome2/gnome-panel/disable-mixer-applet-default.patch
new file mode 100644
index 000000000..10c493c3e
--- /dev/null
+++ b/package/gnome2/gnome-panel/disable-mixer-applet-default.patch
@@ -0,0 +1,73 @@
+--- ./gnome-panel/panel-default-setup.entries.in.orig	2006-07-24 01:41:02.000000000 +0200
++++ ./gnome-panel/panel-default-setup.entries.in	2006-07-24 01:43:12.000000000 +0200
+@@ -50,9 +50,6 @@
+             <string>window_menu</string>
+           </value>
+           <value>
+-            <string>mixer</string>
+-          </value>
+-          <value>
+             <string>clock</string>
+           </value>
+           <value>
+@@ -373,60 +370,6 @@
+     <entry><key>applets/window_menu/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+     <entry><key>applets/window_menu/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+ 
+-  <!-- Mixer Applet -->
+-
+-    <entry>
+-      <key>applets/mixer/object_type</key>
+-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+-      <value>
+-        <string>bonobo-applet</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>applets/mixer/toplevel_id</key>
+-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+-      <value>
+-        <string>top_panel</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>applets/mixer/position</key>
+-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
+-      <value>
+-        <int>1</int>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>applets/mixer/panel_right_stick</key>
+-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+-      <value>
+-        <bool>true</bool>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>applets/mixer/locked</key>
+-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+-      <value>
+-        <bool>true</bool>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>applets/mixer/bonobo_iid</key>
+-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+-      <value>
+-        <string>OAFIID:GNOME_MixerApplet</string>
+-      </value>
+-    </entry>
+-
+-    <entry><key>applets/mixer/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+-    <entry><key>applets/mixer/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+-    <entry><key>applets/mixer/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+-    <entry><key>applets/mixer/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+-    <entry><key>applets/mixer/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+-    <entry><key>applets/mixer/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+-    <entry><key>applets/mixer/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+-    <entry><key>applets/mixer/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-
+   <!-- Clock Applet -->
+ 
+     <entry>
diff --git a/package/gnome2/gnome-panel/postinstall.sh b/package/gnome2/gnome-panel/postinstall.sh
new file mode 100644
index 000000000..a71a97efb
--- /dev/null
+++ b/package/gnome2/gnome-panel/postinstall.sh
@@ -0,0 +1,15 @@
+
+# merge default panel entries into the default panel gconf 
+# xml-storage-cache-whatever-whocares once installed
+
+if any_installed "gconf/schemas/panel-default-setup.entries" ; then
+	GCONFDIR="`find /etc -type d -name gconf 2>/dev/null | head -n 1`"
+	
+	if [ -e "${GCONFDIR}/schemas/panel-default-setup.entries" ]; then
+		echo "Gnome2: merging gnome-panel default entries..."
+                gconftool-2 --direct \
+			--config-source `gconftool-2 --get-default-source` \
+			--load=${GCONFDIR}/schemas/panel-default-setup.entries
+        fi
+fi
+