From c9ffc048a56e7fcfd1c07e55a023b68e3b53e6f0 Mon Sep 17 00:00:00 2001
From: Mageia SVN-Git Migration <svn-git-migration@mageia.org>
Date: Thu, 17 Feb 2011 20:36:31 +0000
Subject: Synthesized commit during git-svn import combining previous Mandriva
 history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r571 | ahmad | 2011-02-17 20:36:31 +0000 (Thu, 17 Feb 2011) | 1 line

- add cleaned mageia-xfce-config
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- clean mandriva occurences in files names (icons files)
- remove unsued themes and create Default one
---
 common/autostart/xfce4-firstrun.desktop                   |   4 ++--
 common/xfce4/panel/xfce4-menu-5.rc                        |   4 ++--
 common/xfce4/theme/gtkrc                                  |   6 +++---
 common/xfce4/theme/mandriva-xfce-panel.png                | Bin 887 -> 0 bytes
 common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml |   6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 common/xfce4/theme/mandriva-xfce-panel.png

(limited to 'common')

diff --git a/common/autostart/xfce4-firstrun.desktop b/common/autostart/xfce4-firstrun.desktop
index 56b5340..29790f5 100644
--- a/common/autostart/xfce4-firstrun.desktop
+++ b/common/autostart/xfce4-firstrun.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Mandriva xfce4 update tool
+Name=Mageia xfce4 update tool
 Comment=Update config and icons for Xfce
-Icon=mandriva
+Icon=mageia
 Exec=xfce4-firstrun
 StartupNotify=false
 Terminal=false
diff --git a/common/xfce4/panel/xfce4-menu-5.rc b/common/xfce4/panel/xfce4-menu-5.rc
index 4ca3c70..06aa933 100644
--- a/common/xfce4/panel/xfce4-menu-5.rc
+++ b/common/xfce4/panel/xfce4-menu-5.rc
@@ -1,7 +1,7 @@
 use_default_menu=true
 show_button_title=true
 menu_file=/etc/xdg/menus/xfce-applications.menu
-icon_file=/usr/share/icons/Tango/scalable/apps/mandriva.svg
+icon_file=/usr/share/icons/Tango/scalable/apps/mageia.svg
 show_menu_icons=true
-button_title=Mandriva
+button_title=Mageia
 
diff --git a/common/xfce4/theme/gtkrc b/common/xfce4/theme/gtkrc
index 7f1cf9f..d2b8827 100644
--- a/common/xfce4/theme/gtkrc
+++ b/common/xfce4/theme/gtkrc
@@ -3,9 +3,9 @@
 style "xfce-panel"
 {
 
-    # mandriva-xfce-panel.png is same as main panel height, which is 32 px
-    bg_pixmap[NORMAL] = "mandriva-xfce-panel.png"
-    bg_pixmap[SELECTED] = "mandriva-xfce-panel.png"
+    # mageia-xfce-panel.png is same as main panel height, which is 32 px
+    bg_pixmap[NORMAL] = "mageia-xfce-panel.png"
+    bg_pixmap[SELECTED] = "mageia-xfce-panel.png"
 }
 
 # make desktop's icons label transparent
diff --git a/common/xfce4/theme/mandriva-xfce-panel.png b/common/xfce4/theme/mandriva-xfce-panel.png
deleted file mode 100644
index 99a8d11..0000000
Binary files a/common/xfce4/theme/mandriva-xfce-panel.png and /dev/null differ
diff --git a/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index 8f9ce92..c467456 100644
--- a/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -4,9 +4,9 @@
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
       <property name="monitor0" type="empty">
-        <property name="image-path" type="string" value="/usr/share/mdk/backgrounds/default.jpg"/>
-        <property name="last-image" type="string" value="/usr/share/mdk/backgrounds/default.jpg"/>
-        <property name="last-single-image" type="string" value="/usr/share/mdk/backgrounds/default.jpg"/>
+        <property name="image-path" type="string" value="/usr/share/mga/backgrounds/default.jpg"/>
+        <property name="last-image" type="string" value="/usr/share/mga/backgrounds/default.jpg"/>
+        <property name="last-single-image" type="string" value="/usr/share/mga/backgrounds/default.jpg"/>
         <property name="image-show" type="empty"/>
         <property name="brightness" type="int" value="0"/>
         <property name="saturation" type="double" value="1.000000"/>
-- 
cgit v1.2.1