[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=f7bd418

The following commit has been merged in the master branch:
commit f7bd4188bb0b8877f77b303d9e8931885c42536d
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Apr 11 15:37:01 2013 +0200

    Use KWebView instead of QWebView for AdiumThemeView
    
    This should make sure that network requests like downloading image
    preview go through KDE's configured proxy.
    
    Reviewed-by: David Edmundson
    BUG: 311299
    FIXED-IN: 0.6.1
---
 lib/CMakeLists.txt       | 2 +-
 lib/adium-theme-view.cpp | 2 +-
 lib/adium-theme-view.h   | 4 ++--
 logviewer/CMakeLists.txt | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 3df62af..80a3eff 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -57,7 +57,7 @@ target_link_libraries(ktpchat
     ${KDE4_KIO_LIBS}
     ${KDE4_KDEUI_LIBS}
     ${TELEPATHY_QT4_LIBRARIES}
-    ${QT_QTWEBKIT_LIBRARY}
+    ${KDE4_KDEWEBKIT_LIBRARY}
     ${KDE4_KEMOTICONS_LIBS}
     ${KTP_LIBRARIES}
     ${TELEPATHY_LOGGER_QT4_LIBRARIES}
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 361cd6d..db688a5 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -51,7 +51,7 @@
 #include <KProtocolInfo>
 
 AdiumThemeView::AdiumThemeView(QWidget *parent)
-        : QWebView(parent),
+        : KWebView(parent),
         // check iconPath docs for minus sign in -KIconLoader::SizeLarge
         m_defaultAvatar(KIconLoader::global()->iconPath(QLatin1String("im-user"),-KIconLoader::SizeLarge)),
         m_displayHeader(true)
diff --git a/lib/adium-theme-view.h b/lib/adium-theme-view.h
index 70618f6..a3e5db2 100644
--- a/lib/adium-theme-view.h
+++ b/lib/adium-theme-view.h
@@ -20,7 +20,7 @@
 #ifndef ADIUMTHEMEVIEW_H
 #define ADIUMTHEMEVIEW_H
 
-#include <QtWebKit/QWebView>
+#include <KWebView>
 
 #include "adium-theme-header-info.h"
 #include "adium-theme-content-info.h"
@@ -38,7 +38,7 @@ class QContextMenuEvent;
 
 class KAction;
 
-class KDE_TELEPATHY_CHAT_EXPORT AdiumThemeView : public QWebView
+class KDE_TELEPATHY_CHAT_EXPORT AdiumThemeView : public KWebView
 {
     Q_OBJECT
 public:
diff --git a/logviewer/CMakeLists.txt b/logviewer/CMakeLists.txt
index 425fb84..d01d7e1 100644
--- a/logviewer/CMakeLists.txt
+++ b/logviewer/CMakeLists.txt
@@ -24,10 +24,10 @@ target_link_libraries(ktp-log-viewer
             ${KDE4_KEMOTICONS_LIBS}
             ${KDE4_KCMUTILS_LIBS}
             ${TELEPATHY_LOGGER_QT4_LIBRARIES}
-            ${QT_QTWEBKIT_LIBRARY}
+            ${KDE4_KDEWEBKIT_LIBRARY}
             ${KTP_LIBRARIES}
             ktpchat)
 
 install(TARGETS ktp-log-viewer DESTINATION ${BIN_INSTALL_DIR})
 install(FILES ktp-log-viewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install(FILES log-viewer.rc DESTINATION  ${DATA_INSTALL_DIR}/ktp-log-viewer/)
\ No newline at end of file
+install(FILES log-viewer.rc DESTINATION  ${DATA_INSTALL_DIR}/ktp-log-viewer/)

-- 
ktp-text-ui packaging