rpms/gnome-panel/devel gnome-panel.spec, 1.334, 1.335 redhat-panel-default-setup.entries, 1.16, 1.17

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3794

Modified Files:
	gnome-panel.spec redhat-panel-default-setup.entries 
Log Message:
Try again



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- gnome-panel.spec	18 Dec 2008 00:07:30 -0000	1.334
+++ gnome-panel.spec	18 Dec 2008 05:37:22 -0000	1.335
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.25.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar.bz2
 
@@ -373,8 +373,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
+* Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3
+- Drop mixer from default config
 
 * Thu Nov 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-6
 - Rebuild


Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/redhat-panel-default-setup.entries,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- redhat-panel-default-setup.entries	18 Apr 2008 14:30:37 -0000	1.16
+++ redhat-panel-default-setup.entries	18 Dec 2008 05:37:22 -0000	1.17
@@ -50,9 +50,6 @@
             <string>tomboy</string>
           </value>
           <value>
-            <string>mixer</string>
-          </value>
-          <value>
             <string>clock</string>
           </value>
           <value>
@@ -391,60 +388,6 @@
     <entry><key>applets/tomboy/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
     <entry><key>applets/tomboy/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>0</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>
-
   <!-- Fast User Switch Applet -->
 
     <entry>