From f2be41c92fa6dea20058b96452fac45859983889 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Thu, 25 Feb 2010 17:32:12 +0300
Subject: [PATCH] Modify client profile for GNOME

---
 .../apps/panel/objects/00_object_firefox/%gconf.xml    | 10 ++++------
 .../.gconf/apps/panel/objects/object_logout/%gconf.xml |  4 +---
 .../apps/panel/objects/object_mainmenu/%gconf.xml      |  4 +---
 .../default/launchers/mozilla-firefox-3.5.desktop      |  4 ++++
 .../.local/applications/mozilla-firefox-3.5.desktop    |  5 +++++
 5 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100755 client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/mozilla-firefox-3.5.desktop
 create mode 100644 client-profiles/50-default-CLDG/.local/applications/mozilla-firefox-3.5.desktop

diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/00_object_firefox/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/00_object_firefox/%gconf.xml
index b1f2fe5..7cd1530 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/00_object_firefox/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/00_object_firefox/%gconf.xml
@@ -9,22 +9,20 @@
 		<stringvalue>bottom_panel_screen0</stringvalue>
 	</entry>
 	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
-	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon" type="bool"/>
+	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
 	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
 		<stringvalue>launcher-object</stringvalue>
 	</entry>
 	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
 	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
-	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon" type="string">
-		<stringvalue>/usr/share/icons/gnome/scalable/apps/web-browser.svg</stringvalue>
-	</entry>
+	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
 	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
 	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location" type="string">
 #?pkg(mozilla-firefox)>=3.5&pkg(mozilla-firefox)<3.6#
-		<stringvalue>/usr/share/applications/mozilla-firefox-3.5.desktop</stringvalue>
+		<stringvalue>mozilla-firefox-3.5.desktop</stringvalue>
 #pkg#
 #?pkg(mozilla-firefox)>=3.6#
-		<stringvalue>/usr/share/applications/mozilla-firefox-3.6.desktop</stringvalue>
+		<stringvalue>mozilla-firefox-3.6.desktop</stringvalue>
 #pkg#
 	</entry>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/object_logout/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/object_logout/%gconf.xml
index a914e64..6eeb890 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/object_logout/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/object_logout/%gconf.xml
@@ -1,8 +1,7 @@
-#-pop(offsetx)-#
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+48)-#"/>
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="0"/>
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type" type="string">
 		<stringvalue>logout</stringvalue>
@@ -22,4 +21,3 @@
 	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
-#-push(offsetx)-#
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/object_mainmenu/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/object_mainmenu/%gconf.xml
index 8416ac0..3cdfd12 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/object_mainmenu/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/objects/object_mainmenu/%gconf.xml
@@ -1,8 +1,7 @@
-#-pop(offsetx)-#
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+48)-#"/>
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="0"/>
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path" type="bool" value="false"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
 	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
@@ -24,4 +23,3 @@
 	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
-#-push(offsetx)-#
diff --git a/client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/mozilla-firefox-3.5.desktop b/client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/mozilla-firefox-3.5.desktop
new file mode 100755
index 0000000..d3cd258
--- /dev/null
+++ b/client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/mozilla-firefox-3.5.desktop
@@ -0,0 +1,4 @@
+# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.5.desktop mirror
+
+[Desktop Entry]
+Icon=/usr/share/icons/gnome/scalable/apps/web-browser.svg
diff --git a/client-profiles/50-default-CLDG/.local/applications/mozilla-firefox-3.5.desktop b/client-profiles/50-default-CLDG/.local/applications/mozilla-firefox-3.5.desktop
new file mode 100644
index 0000000..aa31384
--- /dev/null
+++ b/client-profiles/50-default-CLDG/.local/applications/mozilla-firefox-3.5.desktop
@@ -0,0 +1,5 @@
+# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.6.desktop mirror
+[Desktop Entry]
+Name=Internet Browser
+Icon=applications-internet
+StartupNotify=false