Merge branch 'master' of git.calculate.ru:calculate2/calculate-client

client-profiles/30-gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory

@@ -0,0 +1,2 @@
+# Calculate cl_remote_host!=
+

client-profiles/30-gnome-2.6/.gconf/apps/gnome-power-manager/general/%gconf.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="can_suspend" type="bool" value="false"/>
+	<entry name="can_hibernate" type="bool" value="false"/>
+</gconf>

client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml

@@ -2,6 +2,6 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="command" type="string">
-		<stringvalue>/usr/lib/mozilla-firefox/firefox &quot;%s&quot;</stringvalue>
+		<stringvalue>firefox %s</stringvalue>
 	</entry>
 </gconf>

client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml

@@ -4,6 +4,6 @@
 	<entry name="needs_terminal" type="bool" value="false"/>
 	<entry name="enabled" type="bool" value="true"/>
 	<entry name="command" type="string">
-		<stringvalue>/usr/lib/mozilla-firefox/firefox &quot;%s&quot;</stringvalue>
+		<stringvalue>firefox %s</stringvalue>
 	</entry>
 </gconf>

client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml

@@ -4,6 +4,6 @@
 	<entry name="needs_terminal" type="bool" value="false"/>
 	<entry name="enabled" type="bool" value="true"/>
 	<entry name="command" type="string">
-		<stringvalue>/usr/lib/mozilla-firefox/firefox &quot;%s&quot;</stringvalue>
+		<stringvalue>firefox %s</stringvalue>
 	</entry>
 </gconf>

client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml

@@ -2,6 +2,6 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="command" type="string">
-		<stringvalue>/usr/lib/mozilla-firefox/firefox &quot;%s&quot;</stringvalue>
+		<stringvalue>firefox %s</stringvalue>
 	</entry>
 </gconf>

client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml

@@ -2,6 +2,6 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="command" type="string">
-		<stringvalue>/usr/lib/mozilla-firefox/firefox &quot;%s&quot;</stringvalue>
+		<stringvalue>firefox %s</stringvalue>
 	</entry>
 </gconf>

client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml

@@ -2,6 +2,6 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="command" type="string">
-		<stringvalue>/usr/lib/mozilla-firefox/firefox &quot;%s&quot;</stringvalue>
+		<stringvalue>firefox %s</stringvalue>
 	</entry>
 </gconf>

client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js

@@ -2,6 +2,8 @@
 user_pref("browser.cache.disk.capacity", 5000);
 #сохранять файлы без запроса на выбор пути
 user_pref("browser.download.useDownloadDir", false);
+#отключить проверку браузера по умолчанию
+user_pref("browser.shell.checkDefaultBrowser", false);
 #домашняя страница
 user_pref("browser.startup.homepage", "http://www.calculate-linux.org");
 #?os_locale_language==ru#