From 8b79bfd877138495f4ef784d695629f0d0aaf977 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 21 Dec 2010 22:09:09 +0100
Subject: Switching from sourceforge to kde site.. probably fixing also some
 dbus handling.

---
 CMakeLists.txt                 | 2 +-
 docs/index.docbook             | 4 ++--
 src/data/defaultbookmarks.xbel | 2 +-
 src/data/rekonq.desktop        | 3 ++-
 src/rekonq.kcfg                | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b146a1e2..2d6129a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(REKONQ_VERSION "0.6.55" )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h )
 
-SET(REKONQ_SITE "http://rekonq.sourceforge.net")
+SET(REKONQ_SITE "http://rekonq.kde.org")
 
 # ==================================================================================
 # minimum cmake required
diff --git a/docs/index.docbook b/docs/index.docbook
index 7e8c132d..e26da902 100644
--- a/docs/index.docbook
+++ b/docs/index.docbook
@@ -942,7 +942,7 @@ As you can see the cookies can be configured in many ways.
 <!--A user-generated manual is also available <ulink url="http://userbase.kde.org/Special:myLanguage/Rekonq/Manual">here</ulink>.--> 
 <para><ulink url="http://forum.kde.org">&kde; Forums</ulink> is always a good place to ask user-specific questions.</para>
 
-<para>The <ulink url="http://rekonq.sourceforge.net/">&rekonq; website</ulink> has release announcements for the latest stable and unstable releases along with more helpful links. You can also contact the developers on the <ulink url="irc://freenode/#rekonq">#rekonq IRC channel</ulink> or the <ulink url="mailto:rekonq@kde.org">mailing list</ulink> with more questions.
+<para>The <ulink url="http://rekonq.kde.org/">&rekonq; website</ulink> has release announcements for the latest stable and unstable releases along with more helpful links. You can also contact the developers on the <ulink url="irc://freenode/#rekonq">#rekonq IRC channel</ulink> or the <ulink url="mailto:rekonq@kde.org">mailing list</ulink> with more questions.
 </para>
 </sect1>
 <sect1 id="how-do-i-contribute"><title>How do I contribute?</title> 
@@ -1079,4 +1079,4 @@ To compile the code type in the following
 
 </appendix>
 &documentation.index;
-</book>
\ No newline at end of file
+</book>
diff --git a/src/data/defaultbookmarks.xbel b/src/data/defaultbookmarks.xbel
index 66e7af94..505059df 100644
--- a/src/data/defaultbookmarks.xbel
+++ b/src/data/defaultbookmarks.xbel
@@ -7,7 +7,7 @@
     <bookmark href="http://webkit.org/">
         <title>WebKit.org</title>
     </bookmark>
-    <bookmark href="http://rekonq.sourceforge.net/">
+    <bookmark href="http://rekonq.kde.org/">
         <title>rekonq site</title>
     </bookmark>
     <bookmark href="http://labs.qt.nokia.com/">
diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index eb9a8f2d..ff89195e 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -77,4 +77,5 @@ Categories=Qt;KDE;Network;WebBrowser;
 Terminal=false
 MimeType=text/html;application/xhtml+xml;application/xml;
 X-DBUS-StartupType=Unique
-X-DBUS-ServiceName=net.sourceforge.rekonq
+X-DBUS-ServiceName=org.kde.rekonq
+
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 33a07751..b605e69e 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -39,7 +39,7 @@
         <default>KDE Homepage,UserBase,rekonq site</default>
     </entry>
     <entry name="previewUrls" type="StringList">
-        <default>http://www.kde.org,http://userbase.kde.org,http://rekonq.sourceforge.net</default>
+        <default>http://www.kde.org,http://userbase.kde.org,http://rekonq.kde.org</default>
     </entry>
 </group>
 
-- 
cgit v1.2.1