SVN commit 1173833 by rahn:

Backport of r1183831

- Really, really fix the proxy issue once and for all.



 M  +1 -1      lib/QtMarbleConfigDialog.cpp  
 M  +1 -1      marble.kcfg  


--- branches/KDE/4.5/kdeedu/marble/src/lib/QtMarbleConfigDialog.cpp #1173832:1173833
@@ -521,7 +521,7 @@
 
 QString QtMarbleConfigDialog::proxyUrl() const
 {
-    return d->m_settings->value( "Cache/proxyUrl", "http://" ).toString();
+    return d->m_settings->value( "Cache/proxyUrl", "" ).toString();
 }
 
 int QtMarbleConfigDialog::proxyPort() const
--- branches/KDE/4.5/kdeedu/marble/src/marble.kcfg #1173832:1173833
@@ -161,7 +161,7 @@
   </entry>
   <entry name="proxyUrl" type="String">
    <label>URL for the proxy server.</label>
-   <default>http://</default>
+   <default></default>
   </entry>
   <entry key="proxyPort" type="Int" >
    <label>Port for the proxy server.</label>