[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=51a5503

The following commit has been merged in the master branch:
commit 51a5503a2f8b670ce220a390ce350e95a25f8ea4
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Thu Dec 29 17:55:16 2011 +0200

    Rename some remaining stuff that were left to use the old names.
    
    CCMAIL: kde-i18n-doc at kde.org
---
 CMakeLists.txt | 2 +-
 Messages.sh    | 2 +-
 main.cpp       | 3 +--
 mainwindow.cpp | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81b193d..1bb21a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(telepathy-kde-send-file)
+project(ktp-send-file)
 
 set (CMAKE_MODULE_PATH
      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
diff --git a/Messages.sh b/Messages.sh
index 6d6bbee..a688a16 100755
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,4 +1,4 @@
 #! /usr/bin/env bash
 $EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/telepathy-kde-send-file.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/ktp-send-file.pot
 rm -f rc.cpp
diff --git a/main.cpp b/main.cpp
index 944cf90..ef07c24 100644
--- a/main.cpp
+++ b/main.cpp
@@ -32,8 +32,7 @@
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("telepathy-kde-send-file",
-                         "telepathy-send-file",
+    KAboutData aboutData("ktp-send-file", 0,
                          ki18n("Telepathy Send File"),
                          "0.2.60");
     aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Author"), "kde at davidedmundson.co.uk");
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e7c8c7d..3c022a6 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -51,7 +51,7 @@
 #include <KTp/Models/contact-model-item.h>
 
 //FIXME, copy and paste the approver code for loading this from a config file into this, the contact list and the chat handler.
-#define PREFERRED_FILETRANSFER_HANDLER "org.freedesktop.Telepathy.Client.KDE.FileTransfer"
+#define PREFERRED_FILETRANSFER_HANDLER "org.freedesktop.Telepathy.Client.KTp.FileTransfer"
 
 
 class ContactGridDelegate : public QAbstractItemDelegate {

-- 
ktp-send-file packaging