--- gnome-panel-2.17.91/gnome-panel/panel-default-setup.entries.mdkcustomizations 2007-02-12 23:50:42.000000000 +0100
+++ gnome-panel-2.17.91/gnome-panel/panel-default-setup.entries 2007-02-20 10:31:18.000000000 +0100
@@ -30,9 +30,15 @@
<string>menu_bar</string>
</value>
<value>
+ <string>help_launcher</string>
+ </value>
+ <value>
<string>browser_launcher</string>
</value>
<value>
+ <string>mcc_launcher</string>
+ </value>
+ <value>
<string>email_launcher</string>
</value>
</list>
@@ -94,6 +100,27 @@
<int>24</int>
</value>
</entry>
+ <entry>
+ <key>toplevels/top_panel/background/type</key>
+ <schema_key>/schemas/apps/panel/toplevels/background/type</schema_key>
+ <value>
+ <string>image</string>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/top_panel/background/image</key>
+ <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
+ <value>
+ <string>/usr/share/gnome/panel/pixmaps/mandriva-panel.png</string>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/top_panel/background/stretch</key>
+ <schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
<entry><key>toplevels/top_panel/name</key><schema_key>/schemas/apps/panel/toplevels/name</schema_key></entry>
<entry><key>toplevels/top_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
@@ -109,12 +136,9 @@
<entry><key>toplevels/top_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
<entry><key>toplevels/top_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
<entry><key>toplevels/top_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
- <entry><key>toplevels/top_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
<entry><key>toplevels/top_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
<entry><key>toplevels/top_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
- <entry><key>toplevels/top_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
<entry><key>toplevels/top_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
- <entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
<entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
<!-- Bottom Panel -->
@@ -140,6 +164,27 @@
<int>24</int>
</value>
</entry>
+ <entry>
+ <key>toplevels/bottom_panel/background/type</key>
+ <schema_key>/schemas/apps/panel/toplevels/background/type</schema_key>
+ <value>
+ <string>image</string>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/bottom_panel/background/image</key>
+ <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
+ <value>
+ <string>/usr/share/gnome/panel/pixmaps/mandriva-panel.png</string>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/bottom_panel/background/stretch</key>
+ <schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
<entry><key>toplevels/bottom_panel/name</key><schema_key>/schemas/apps/panel/toplevels/name</schema_key></entry>
<entry><key>toplevels/bottom_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
@@ -155,12 +200,9 @@
<entry><key>toplevels/bottom_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
<entry><key>toplevels/bottom_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
<entry><key>toplevels/bottom_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
- <entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
<entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
<entry><key>toplevels/bottom_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
- <entry><key>toplevels/bottom_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
<entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
- <entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
<entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
<!-- Menu Bar -->
@@ -211,6 +253,61 @@
<entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
<entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+ <!-- Help Launcher -->
+
+ <entry>
+ <key>objects/help_launcher/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>launcher-object</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/help_launcher/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>top_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/help_launcher/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>1</int>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/help_launcher/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/help_launcher/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/help_launcher/launcher_location</key>
+ <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+ <value>
+ <string>yelp.desktop</string>
+ </value>
+ </entry>
+
+ <entry><key>objects/help_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+ <entry><key>objects/help_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+ <entry><key>objects/help_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+ <entry><key>objects/help_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+ <entry><key>objects/help_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+ <entry><key>objects/help_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+ <entry><key>objects/help_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+ <entry><key>objects/help_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+
<!-- Browser Launcher -->
<entry>
@@ -231,7 +328,7 @@
<key>objects/browser_launcher/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
- <int>1</int>
+ <int>2</int>
</value>
</entry>
<entry>
@@ -252,7 +349,7 @@
<key>objects/browser_launcher/launcher_location</key>
<schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
<value>
- <string>epiphany.desktop</string>
+ <string>mandriva-mozilla-firefox.desktop</string>
</value>
</entry>
@@ -285,7 +382,7 @@
<key>objects/email_launcher/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
- <int>2</int>
+ <int>4</int>
</value>
</entry>
<entry>
@@ -319,6 +416,60 @@
<entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
<entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+<!-- MCC Launcher -->
+
+ <entry>
+ <key>objects/mcc_launcher/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>launcher-object</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/mcc_launcher/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>top_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/mcc_launcher/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>3</int>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/mcc_launcher/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/mcc_launcher/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/mcc_launcher/launcher_location</key>
+ <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+ <value>
+ <string>mandriva-drakconf.desktop</string>
+ </value>
+ </entry>
+
+ <entry><key>objects/mcc_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+ <entry><key>objects/mcc_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+ <entry><key>objects/mcc_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+ <entry><key>objects/mcc_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+ <entry><key>objects/mcc_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+ <entry><key>objects/mcc_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+ <entry><key>objects/mcc_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+ <entry><key>objects/mcc_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
<!-- Window Menu Applet -->
<entry>
@@ -393,7 +544,7 @@
<key>applets/mixer/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
- <int>1</int>
+ <int>2</int>
</value>
</entry>
<entry>
@@ -562,7 +713,7 @@
<key>applets/show_desktop_button/panel_right_stick</key>
<schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
<value>
- <bool>false</bool>
+ <bool>true</bool>
</value>
</entry>
<entry>
@@ -663,7 +814,7 @@
<key>applets/workspace_switcher/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
- <int>0</int>
+ <int>4</int>
</value>
</entry>
<entry>
--- gnome-panel-2.17.91/gnome-panel/panel-config-global.h.mdkcustomizations 2007-02-12 23:50:42.000000000 +0100
+++ gnome-panel-2.17.91/gnome-panel/panel-config-global.h 2007-02-20 10:19:09.000000000 +0100
@@ -37,6 +37,9 @@
gboolean panel_global_config_get_drawer_auto_close (void);
gboolean panel_global_config_get_tooltips_enabled (void);
gboolean panel_global_config_get_confirm_panel_remove (void);
+gboolean panel_global_config_get_mdv_customization (void);
+void panel_global_config_init_mdv_customization (void);
+
G_END_DECLS
--- gnome-panel-2.17.91/gnome-panel/panel-compatibility.schemas.mdkcustomizations 2007-02-12 23:50:42.000000000 +0100
+++ gnome-panel-2.17.91/gnome-panel/panel-compatibility.schemas 2007-02-20 10:19:09.000000000 +0100
@@ -23,7 +23,7 @@
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
- <default>[00000001,00000002]</default>
+ <default>[bottom_panel]</default>
<locale name="C"/>
</schema>
@@ -32,7 +32,7 @@
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
- <default>[00000001,00000002,00000003,00000004,show_desktop_button]</default>
+ <default>[tasklist_applet,pager_applet,clock_applet,show_desktop_button,tray_applet]</default>
<locale name="C"/>
</schema>
@@ -41,504 +41,814 @@
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
- <default>[00000001,00000002]</default>
+ <default>[main_menu,help,webbrowser,mcc,terminal,evolution]</default>
<locale name="C"/>
</schema>
-
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_type</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_type</key>
<owner>panel</owner>
<type>string</type>
<default>edge-panel</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_size</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_size</key>
<owner>panel</owner>
<type>string</type>
<default>panel-size-x-small</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_hide_mode</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_mode</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_hide_state</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_state</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/screen</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/monitor</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/monitor</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/screen_edge</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen_edge</key>
<owner>panel</owner>
<type>string</type>
<default>panel-edge-bottom</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/hide_buttons_enabled</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_buttons_enabled</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/hide_button_pixmaps_enabled</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_button_pixmaps_enabled</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_type</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_type</key>
<owner>panel</owner>
<type>string</type>
<default>no-background</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_pixmap</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap</key>
<owner>panel</owner>
<type>string</type>
<default></default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_pixmap_fit</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_fit</key>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_pixmap_stretch</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_stretch</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_pixmap_rotate</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_rotate</key>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_color</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_color</key>
<owner>panel</owner>
<type>string</type>
<default>#ffffff</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_color_alpha</key>
+ <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_color_alpha</key>
<owner>panel</owner>
<type>int</type>
<default>65535</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+</schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>menu-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/path</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>applications:///</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/global-menu</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
+ <!-- The person who made this a bitfield stored as an int needs some buttkicking -->
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/object_type</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu-flags</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>24592</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- Launchers -->
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/help/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>launcher-object</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/launcher_location</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/help/launcher_location</key>
<owner>panel</owner>
<type>string</type>
- <default>applications:///nautilus.desktop</default>
- <locale name="C"/>
+ <default>file:///var/lib/gnome/Mandrake/Documentation/Help.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/panel_id</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/help/panel_id</key>
<owner>panel</owner>
<type>string</type>
- <default>00000002</default>
- <locale name="C"/>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/position</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/help/position</key>
<owner>panel</owner>
<type>int</type>
- <default>20</default>
- <locale name="C"/>
+ <default>40</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/panel_right_stick</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/help/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/object_type</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/webbrowser/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>launcher-object</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/launcher_location</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/webbrowser/launcher_location</key>
<owner>panel</owner>
<type>string</type>
- <default>applications:///System/gnome-terminal.desktop</default>
- <locale name="C"/>
+ <default>file:///var/lib/gnome/Mandrake/Networking/WWW/Galeon.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/panel_id</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/webbrowser/panel_id</key>
<owner>panel</owner>
<type>string</type>
- <default>00000002</default>
- <locale name="C"/>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/position</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/webbrowser/position</key>
<owner>panel</owner>
<type>int</type>
- <default>25</default>
- <locale name="C"/>
+ <default>60</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/panel_stick</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/webbrowser/panel_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
- <schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/object_type</key>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/evolution/object_type</key>
<owner>panel</owner>
<type>string</type>
- <default>bonobo-applet</default>
- <locale name="C"/>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/panel_id</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/evolution/launcher_location</key>
<owner>panel</owner>
<type>string</type>
- <default>00000001</default>
- <locale name="C"/>
+ <default>file:///var/lib/gnome/Mandrake/Networking/Mail/Evolution.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/position</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/evolution/panel_id</key>
<owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C"/>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/bonobo_iid</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/evolution/position</key>
<owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_ShowDesktopApplet</default>
- <locale name="C"/>
+ <type>int</type>
+ <default>80</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/panel_right_stick</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/evolution/panel_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/terminal/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000001/object_type</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/terminal/launcher_location</key>
<owner>panel</owner>
<type>string</type>
- <default>bonobo-applet</default>
- <locale name="C"/>
+ <default>file:///var/lib/gnome/Mandrake/Terminals/GNOME%20Terminal.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000001/panel_id</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/terminal/panel_id</key>
<owner>panel</owner>
<type>string</type>
- <default>00000001</default>
- <locale name="C"/>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000001/position</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/terminal/position</key>
<owner>panel</owner>
<type>int</type>
- <default>1</default>
- <locale name="C"/>
+ <default>100</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000001/bonobo_iid</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/terminal/panel_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/mcc/object_type</key>
<owner>panel</owner>
<type>string</type>
- <default>OAFIID:GNOME_TasklistApplet</default>
- <locale name="C"/>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000001/panel_right_stick</key>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/mcc/launcher_location</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>file:///var/lib/gnome/Mandrake/System/Configuration/Configure%20Your%20Computer.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/mcc/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/mcc/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>120</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/objects/mcc/panel_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
- <schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000002/object_type</key>
+ <schema>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>bonobo-applet</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000002/panel_id</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/panel_id</key>
<owner>panel</owner>
<type>string</type>
- <default>00000001</default>
- <locale name="C"/>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000002/position</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/position</key>
<owner>panel</owner>
<type>int</type>
- <default>0</default>
- <locale name="C"/>
+ <default>1</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000002/bonobo_iid</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/bonobo_iid</key>
<owner>panel</owner>
<type>string</type>
- <default>OAFIID:GNOME_PagerApplet</default>
- <locale name="C"/>
+ <default>OAFIID:GNOME_ShowDesktopApplet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000002/panel_right_stick</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000003/object_type</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>bonobo-applet</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000003/panel_id</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_id</key>
<owner>panel</owner>
<type>string</type>
- <default>00000002</default>
- <locale name="C"/>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000003/position</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/position</key>
<owner>panel</owner>
<type>int</type>
- <default>-1</default>
- <locale name="C"/>
+ <default>150</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000003/bonobo_iid</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/bonobo_iid</key>
<owner>panel</owner>
<type>string</type>
- <default>OAFIID:GNOME_MixerApplet</default>
- <locale name="C"/>
+ <default>OAFIID:GNOME_TasklistApplet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000003/panel_right_stick</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
- <default>true</default>
- <locale name="C"/>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000004/object_type</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>bonobo-applet</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000004/panel_id</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_id</key>
<owner>panel</owner>
<type>string</type>
- <default>00000002</default>
- <locale name="C"/>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000004/position</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/position</key>
<owner>panel</owner>
<type>int</type>
- <default>-1</default>
- <locale name="C"/>
+ <default>2</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000004/bonobo_iid</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/bonobo_iid</key>
<owner>panel</owner>
<type>string</type>
- <default>OAFIID:GNOME_ClockApplet</default>
- <locale name="C"/>
+ <default>OAFIID:GNOME_PagerApplet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/applets/00000004/panel_right_stick</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
- <locale name="C"/>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_type</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/object_type</key>
<owner>panel</owner>
<type>string</type>
- <default>menu-panel</default>
- <locale name="C"/>
+ <default>bonobo-applet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_size</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_id</key>
<owner>panel</owner>
<type>string</type>
- <default>panel-size-x-small</default>
- <locale name="C"/>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/screen</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/position</key>
<owner>panel</owner>
<type>int</type>
- <default>0</default>
- <locale name="C"/>
+ <default>-1</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/monitor</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/bonobo_iid</key>
<owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C"/>
+ <type>string</type>
+ <default>OAFIID:GNOME_ClockApplet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_type</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_right_stick</key>
<owner>panel</owner>
- <type>string</type>
- <default>no-background</default>
- <locale name="C"/>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_pixmap</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/object_type</key>
<owner>panel</owner>
<type>string</type>
- <default> </default>
- <locale name="C"/>
+ <default>bonobo-applet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_pixmap_fit</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_id</key>
<owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C"/>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
-
+
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_pixmap_stretch</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/position</key>
<owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C"/>
+ <type>int</type>
+ <default>3</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_pixmap_rotate</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C"/>
- </schema>
-
- <schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_color</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/bonobo_iid</key>
<owner>panel</owner>
<type>string</type>
- <default>#000000</default>
- <locale name="C"/>
+ <default>OAFIID:GNOME_NotificationAreaApplet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
<schema>
- <key>/schemas/apps/panel/default_profiles/medium/panels/00000002/clock_format</key>
+ <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_right_stick</key>
<owner>panel</owner>
- <type>string</type>
- <default>%I:%M %p</default>
- <locale name="C"/>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
</schema>
</schemalist>
--- gnome-panel-2.17.91/gnome-panel/panel-addto.c.mdkcustomizations 2007-02-12 23:50:42.000000000 +0100
+++ gnome-panel-2.17.91/gnome-panel/panel-addto.c 2007-02-20 10:19:09.000000000 +0100
@@ -42,6 +42,7 @@
#include "panel-lockdown.h"
#include "panel-util.h"
#include "panel-profile.h"
+#include "panel-config-global.h"
#include "panel-addto.h"
typedef struct {
@@ -225,6 +226,10 @@
internal_addto_items [i].description = _(internal_addto_items [i].description);
}
+ if (panel_global_config_get_mdv_customization () && internal_addto_items [i].icon && (strcmp(internal_addto_items [i].icon,PANEL_MAIN_MENU_ICON) == 0 || strcmp(internal_addto_items [i].icon,PANEL_GNOME_LOGO_ICON) == 0 )) {
+ internal_addto_items [i].icon = "mandriva";
+ }
+
list = g_slist_prepend (list, &internal_addto_items [i]);
}
--- gnome-panel-2.17.91/gnome-panel/panel-config-global.c.mdkcustomizations 2007-02-12 23:50:42.000000000 +0100
+++ gnome-panel-2.17.91/gnome-panel/panel-config-global.c 2007-02-20 10:19:09.000000000 +0100
@@ -27,11 +27,14 @@
#include "panel-config-global.h"
+#include <unistd.h>
#include <string.h>
#include <gconf/gconf.h>
+#include <glib/gstdio.h>
#include "panel-globals.h"
#include "panel-gconf.h"
+#include "panel-util.h"
typedef struct {
guint tooltips_enabled : 1;
@@ -39,6 +42,7 @@
guint drawer_auto_close : 1;
guint confirm_panel_remove : 1;
guint highlight_when_over : 1;
+ guint mdv_customization : 1;
} GlobalConfig;
static GlobalConfig global_config = { 0, };
@@ -84,6 +88,39 @@
return global_config.confirm_panel_remove;
}
+gboolean
+panel_global_config_get_mdv_customization (void)
+{
+ return global_config.mdv_customization;
+}
+
+void
+panel_global_config_init_mdv_customization (void)
+{
+ const char *mdv_menu_style;
+ char *file;
+
+ /* check if we disable mdv_customization */
+ mdv_menu_style = g_getenv("MDV_MENU_STYLE");
+
+ if (mdv_menu_style && g_ascii_strcasecmp (mdv_menu_style,"upstream") == 0)
+ global_config.mdv_customization = FALSE;
+ else
+ global_config.mdv_customization = TRUE;
+
+ file = g_build_filename (g_get_home_dir (), ".mdk-no-desktop-launch", NULL);
+ if (!g_file_test (file, G_FILE_TEST_EXISTS)) {
+ g_free (file);
+ file = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), "Desktop", NULL);
+ g_chdir (file);
+ }
+ else {
+ g_chdir (g_get_home_dir ());
+ }
+ g_free (file);
+}
+
+
static void
panel_global_config_set_entry (GConfEntry *entry)
{
--- gnome-panel-2.17.91/gnome-panel/panel-menu-button.c.mdkcustomizations 2007-02-12 23:50:42.000000000 +0100
+++ gnome-panel-2.17.91/gnome-panel/panel-menu-button.c 2007-02-20 10:19:09.000000000 +0100
@@ -34,6 +34,7 @@
#include "panel-util.h"
#include "panel-profile.h"
#include "panel-globals.h"
+#include "panel-config-global.h"
#include "menu.h"
#include "panel-lockdown.h"
#include "panel-a11y.h"
@@ -736,7 +737,7 @@
}
if (!retval)
- retval = g_strdup (PANEL_MAIN_MENU_ICON);
+ retval = g_strdup (panel_global_config_get_mdv_customization () ? "mandriva" : PANEL_MAIN_MENU_ICON);
return retval;
}
--- gnome-panel-2.17.91/gnome-panel/panel-menu-bar.c.mdkcustomizations 2007-02-12 23:50:42.000000000 +0100
+++ gnome-panel-2.17.91/gnome-panel/panel-menu-bar.c 2007-02-20 10:19:09.000000000 +0100
@@ -38,6 +38,7 @@
#include "menu.h"
#include "panel-menu-items.h"
#include "panel-globals.h"
+#include "panel-config-global.h"
#include "panel-profile.h"
#include "panel-lockdown.h"
#include "panel-stock-icons.h"
@@ -181,7 +182,7 @@
menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL);
menubar->priv->applications_item = gtk_image_menu_item_new_with_label (_("Applications"));
- image = gtk_image_new_from_icon_name (PANEL_GNOME_LOGO_ICON,
+ image = gtk_image_new_from_icon_name (panel_global_config_get_mdv_customization () ? "mandriva" : PANEL_GNOME_LOGO_ICON,
panel_menu_bar_icon_get_size ());
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menubar->priv->applications_item),
image);
--- gnome-panel-2.17.91/gnome-panel/main.c.mdkcustomizations 2007-02-20 10:19:09.000000000 +0100
+++ gnome-panel-2.17.91/gnome-panel/main.c 2007-02-20 10:19:09.000000000 +0100
@@ -74,6 +74,8 @@
panel_tooltips = gtk_tooltips_new ();
+ panel_global_config_init_mdv_customization ();
+
panel_action_protocol_init ();
panel_multiscreen_init ();
panel_init_stock_icons_and_items ();
--- gnome-panel-2.17.91/gnome-panel/panel-util.c.mdkcustomizations 2007-02-20 10:19:09.000000000 +0100
+++ gnome-panel-2.17.91/gnome-panel/panel-util.c 2007-02-20 10:19:09.000000000 +0100
@@ -48,7 +48,7 @@
gnome_desktop_item_set_launch_time (item,
gtk_get_current_event_time ());
- return gnome_desktop_item_launch_on_screen (item, file_list, 0,
+ return gnome_desktop_item_launch_on_screen (item, file_list, GNOME_DESKTOP_ITEM_LAUNCH_USE_CURRENT_DIR,
screen, workspace, error);
}
--- gnome-panel-2.17.91/applets/clock/clock.schemas.in.mdkcustomizations 2007-02-12 23:50:44.000000000 +0100
+++ gnome-panel-2.17.91/applets/clock/clock.schemas.in 2007-02-20 10:19:09.000000000 +0100
@@ -106,7 +106,7 @@
<key>/schemas/apps/clock_applet/prefs/config_tool</key>
<owner>clock-applet</owner>
<type>string</type>
- <default> </default>
+ <default>/usr/sbin/clock.pl</default>
<locale name="C">
<short>Time configuration tool</short>
<long>
