[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=9fe647d

The following commit has been merged in the master branch:
commit 9fe647d1dd68b6fbf7f585c39482f6a51b0c10ba
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Mar 21 02:25:31 2012 +0100

    Rename simkete install directory and Template.html
---
 data/CMakeLists.txt                                                   | 2 +-
 data/{template.html => Template.html}                                 | 0
 .../styles/{simkete => SimKete.AdiumMessageStyle}/Contents/Info.plist | 0
 data/styles/{simkete => SimKete.AdiumMessageStyle}/Contents/README    | 0
 .../Contents/Resources/Footer.html                                    | 0
 .../Contents/Resources/Header.html                                    | 0
 .../Contents/Resources/Incoming/Content.html                          | 0
 .../Contents/Resources/Incoming/NextContent.html                      | 0
 .../Contents/Resources/Incoming/SenderColors.txt                      | 0
 .../Contents/Resources/Outgoing/Content.html                          | 0
 .../Contents/Resources/Outgoing/NextContent.html                      | 0
 .../Contents/Resources/Status.html                                    | 0
 .../Contents/Resources/main.css                                       | 0
 lib/adium-theme-view.cpp                                              | 4 ++--
 lib/chat-window-style.cpp                                             | 2 +-
 15 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 6187d40..1e22909 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,4 +1,4 @@
-install(FILES template.html
+install(FILES Template.html
         DESTINATION ${DATA_INSTALL_DIR}/ktelepathy)
 
 install(DIRECTORY styles
diff --git a/data/template.html b/data/Template.html
similarity index 100%
rename from data/template.html
rename to data/Template.html
diff --git a/data/styles/simkete/Contents/Info.plist b/data/styles/SimKete.AdiumMessageStyle/Contents/Info.plist
similarity index 100%
rename from data/styles/simkete/Contents/Info.plist
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Info.plist
diff --git a/data/styles/simkete/Contents/README b/data/styles/SimKete.AdiumMessageStyle/Contents/README
similarity index 100%
rename from data/styles/simkete/Contents/README
rename to data/styles/SimKete.AdiumMessageStyle/Contents/README
diff --git a/data/styles/simkete/Contents/Resources/Footer.html b/data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Footer.html
similarity index 100%
rename from data/styles/simkete/Contents/Resources/Footer.html
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Footer.html
diff --git a/data/styles/simkete/Contents/Resources/Header.html b/data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Header.html
similarity index 100%
rename from data/styles/simkete/Contents/Resources/Header.html
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Header.html
diff --git a/data/styles/simkete/Contents/Resources/Incoming/Content.html b/data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
similarity index 100%
rename from data/styles/simkete/Contents/Resources/Incoming/Content.html
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
diff --git a/data/styles/simkete/Contents/Resources/Incoming/NextContent.html b/data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
similarity index 100%
rename from data/styles/simkete/Contents/Resources/Incoming/NextContent.html
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
diff --git a/data/styles/simkete/Contents/Resources/Incoming/SenderColors.txt b/data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Incoming/SenderColors.txt
similarity index 100%
rename from data/styles/simkete/Contents/Resources/Incoming/SenderColors.txt
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Incoming/SenderColors.txt
diff --git a/data/styles/simkete/Contents/Resources/Outgoing/Content.html b/data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html
similarity index 100%
rename from data/styles/simkete/Contents/Resources/Outgoing/Content.html
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html
diff --git a/data/styles/simkete/Contents/Resources/Outgoing/NextContent.html b/data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html
similarity index 100%
rename from data/styles/simkete/Contents/Resources/Outgoing/NextContent.html
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html
diff --git a/data/styles/simkete/Contents/Resources/Status.html b/data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Status.html
similarity index 100%
rename from data/styles/simkete/Contents/Resources/Status.html
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Resources/Status.html
diff --git a/data/styles/simkete/Contents/Resources/main.css b/data/styles/SimKete.AdiumMessageStyle/Contents/Resources/main.css
similarity index 100%
rename from data/styles/simkete/Contents/Resources/main.css
rename to data/styles/SimKete.AdiumMessageStyle/Contents/Resources/main.css
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 6766cb6..9de4970 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -142,7 +142,7 @@ void AdiumThemeView::initialise(const AdiumThemeHeaderInfo &chatInfo)
 
     if (templateHtml.isEmpty()) {
         // if templateHtml is empty, we failed to load the fallback template file
-        KMessageBox::error(this, i18n("Missing required file template.html - check your installation."));
+        KMessageBox::error(this, i18n("Missing required file Template.html - check your installation."));
     }
 
     if (m_displayHeader) {
@@ -452,7 +452,7 @@ AdiumThemeView::AppendMode AdiumThemeView::appendMode(const AdiumThemeMessageInf
         mode = (consecutive ? AppendNextMessage : AppendMessage);
     } else if (m_chatStyle->hasCustomTemplateHtml() && (message.type() == AdiumThemeContentInfo::Status ||
                                                         message.type() == AdiumThemeContentInfo::HistoryStatus)) {
-        // Old styles with a custom template.html had Status.html files without 'insert' divs coupled
+        // Old styles with a custom Template.html had Status.html files without 'insert' divs coupled
         // with a APPEND_NEXT_MESSAGE_WITH_SCROLL script which assumes one exists.
         mode = AppendMessageWithScroll;
     } else {
diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 086ee04..9a75237 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -441,7 +441,7 @@ void ChatWindowStyle::readStyleFiles()
     if (content(Template).isEmpty())
     {
         d->hasCustomTemplateHtml = false;
-        QString templateFileName(KGlobal::dirs()->findResource("data", QLatin1String("ktelepathy/template.html")));
+        QString templateFileName(KGlobal::dirs()->findResource("data", QLatin1String("ktelepathy/Template.html")));
 
         if (!templateFileName.isEmpty() && QFile::exists(templateFileName)) {
             fileAccess.setFileName(templateFileName);

-- 
ktp-text-ui packaging