[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:06:11 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=b4d6304

The following commit has been merged in the master branch:
commit b4d63046fc4a737b3ff23fd607ecf6018434bb03
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Nov 11 23:00:49 2014 +0100

    Add the provider and service files for KAccounts
---
 CMakeLists.txt                            |  2 ++
 data/CMakeLists.txt                       |  2 ++
 data/kaccounts/CMakeLists.txt             | 15 +++++++++++++++
 data/kaccounts/facebook-im.service.in     | 25 +++++++++++++++++++++++++
 data/kaccounts/google-im.service.in       | 30 ++++++++++++++++++++++++++++++
 data/kaccounts/ktp-haze-icq-im.service.in |  9 +++++++++
 data/kaccounts/ktp-haze-icq.provider.in   | 15 +++++++++++++++
 data/kaccounts/ktp-jabber-im.service.in   |  9 +++++++++
 data/kaccounts/ktp-jabber.provider.in     | 15 +++++++++++++++
 data/kaccounts/ktp-kde-talk-im.service.in |  9 +++++++++
 data/kaccounts/ktp-kde-talk.provider.in   | 16 ++++++++++++++++
 11 files changed, 147 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1a43fd..d2f53f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ set(IS_KTP_INTERNAL_MODULE TRUE)
 find_package (TelepathyQt5 REQUIRED)
 find_package (KTp REQUIRED)
 find_package (KAccounts REQUIRED)
+find_package (AccountsFileDir REQUIRED)
+find_package (Intltool REQUIRED) #needed to generate service and provider files
 
 # make some more macros available
 # include (MacroLibrary)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 6eb2a6d..4ea1337 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,2 +1,4 @@
 install (DIRECTORY profiles
          DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy)
+
+add_subdirectory (kaccounts)
diff --git a/data/kaccounts/CMakeLists.txt b/data/kaccounts/CMakeLists.txt
new file mode 100644
index 0000000..f5178c8
--- /dev/null
+++ b/data/kaccounts/CMakeLists.txt
@@ -0,0 +1,15 @@
+file(GLOB service_files_in *.service.in)
+foreach(service_file_in ${service_files_in})
+    get_filename_component(service_filename ${service_file_in} NAME_WE)
+    set(service_file ${CMAKE_CURRENT_BINARY_DIR}/${service_filename}.service)
+    execute_process(COMMAND intltool-merge -x -u --no-translations ${service_file_in} ${service_file})
+    install(FILES ${service_file} DESTINATION ${ACCOUNTS_SERVICES_DIR})
+endforeach()
+
+file(GLOB provider_in_files *.provider.in)
+foreach(provider_in_file ${provider_in_files})
+    get_filename_component(provider_filename ${provider_in_file} NAME_WE)
+    set(provider_file ${CMAKE_CURRENT_BINARY_DIR}/${provider_filename}.provider)
+    execute_process(COMMAND intltool-merge -x -u --no-translations ${provider_in_file} ${provider_file})
+    install(FILES ${provider_file} DESTINATION ${ACCOUNTS_PROVIDERS_DIR})
+endforeach()
\ No newline at end of file
diff --git a/data/kaccounts/facebook-im.service.in b/data/kaccounts/facebook-im.service.in
new file mode 100644
index 0000000..0d35251
--- /dev/null
+++ b/data/kaccounts/facebook-im.service.in
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="facebook-im">
+  <type>IM</type>
+  <!-- "Chat" on Facebook - Service name being displayed as a checkbox label to enable/disable this service
+       Would be nice to use the localized name of this service if it exists/makes sense -->
+  <_name>Chat</_name>
+  <icon>facebook-im</icon>
+  <provider>facebook</provider>
+  <translations>kaccounts-providers</translations>
+
+    <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="telepathy">
+      <setting name="mc-readonly-params" type="b">true</setting>
+      <setting name="manager">gabble</setting>
+      <setting name="protocol">jabber</setting>
+
+      <setting name="param-account">chat.facebook.com</setting>
+      <setting name="param-server">chat.facebook.com</setting>
+      <setting name="param-fallback-servers">chat.facebook.com:443</setting>
+    </group>
+  </template>
+
+
+</service>
diff --git a/data/kaccounts/google-im.service.in b/data/kaccounts/google-im.service.in
new file mode 100644
index 0000000..1b4c790
--- /dev/null
+++ b/data/kaccounts/google-im.service.in
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="google-im">
+  <type>IM</type>
+  <!-- Google Hangouts - Service name being displayed as a checkbox label to enable/disable this service
+       Would be nice to use the localized name of this service if it exists/makes sense -->
+  <_name>Google Hangouts</_name>
+  <icon>im-google-talk</icon>
+  <provider>google</provider>
+  <translations>kaccounts-providers</translations>
+
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="telepathy">
+      <setting name="mc-readonly-params" type="b">true</setting>
+      <setting name="manager">gabble</setting>
+      <setting name="protocol">jabber</setting>
+
+      <setting name="param-account">google.com</setting>
+      <setting name="param-server">talk.google.com</setting>
+      <setting name="param-fallback-servers">
+        talkx.l.google.com;
+        talkx.l.google.com:443,oldssl;
+        talkx.l.google.com:80
+      </setting>
+      <setting name="param-extra-certificate-identities">talk.google.com</setting>
+      <setting name="param-require-encryption">true</setting>
+    </group>
+  </template>
+
+</service>
diff --git a/data/kaccounts/ktp-haze-icq-im.service.in b/data/kaccounts/ktp-haze-icq-im.service.in
new file mode 100644
index 0000000..5f81790
--- /dev/null
+++ b/data/kaccounts/ktp-haze-icq-im.service.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="ktp-haze-icq-im">
+  <type>IM</type>
+  <!-- ICQ Chat - Service name being displayed as a checkbox label to enable/disable this service -->
+  <_name>Chat</_name>
+  <icon>im-icq</icon>
+  <provider>ktp-haze-icq</provider>
+  <translations>kaccounts-providers</translations>
+</service>
diff --git a/data/kaccounts/ktp-haze-icq.provider.in b/data/kaccounts/ktp-haze-icq.provider.in
new file mode 100644
index 0000000..559c0aa
--- /dev/null
+++ b/data/kaccounts/ktp-haze-icq.provider.in
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="ktp-haze-icq">
+    <_name>ICQ</_name>
+    <icon>im-icq</icon>
+    <!-- Tooltip text appearing over the button to create this type of account -->
+    <_description>Chat account in the ICQ network</_description>
+    <translations>kaccounts-providers</translations>
+
+    <template>
+        <group name="auth">
+            <setting name="method">password</setting>
+            <setting name="mechanism">password</setting>
+        </group>
+    </template>
+</provider>
diff --git a/data/kaccounts/ktp-jabber-im.service.in b/data/kaccounts/ktp-jabber-im.service.in
new file mode 100644
index 0000000..19c9b8c
--- /dev/null
+++ b/data/kaccounts/ktp-jabber-im.service.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="ktp-jabber-im">
+  <type>IM</type>
+  <!-- Jabber/XMPP - Service name being displayed as a checkbox label to enable/disable this service -->
+  <_name>Chat</_name>
+  <icon>im-jabber-talk</icon>
+  <provider>ktp-jabber</provider>
+  <translations>kaccounts-providers</translations>
+</service>
diff --git a/data/kaccounts/ktp-jabber.provider.in b/data/kaccounts/ktp-jabber.provider.in
new file mode 100644
index 0000000..f1cae56
--- /dev/null
+++ b/data/kaccounts/ktp-jabber.provider.in
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="ktp-jabber">
+    <_name>Jabber</_name>
+    <icon>im-jabber</icon>
+    <!-- Tooltip text appearing over the button to create this type of account -->
+    <_description>Jabber chat account</_description>
+    <translations>kaccounts-providers</translations>
+
+    <template>
+        <group name="auth">
+            <setting name="method">password</setting>
+            <setting name="mechanism">password</setting>
+        </group>
+    </template>
+</provider>
diff --git a/data/kaccounts/ktp-kde-talk-im.service.in b/data/kaccounts/ktp-kde-talk-im.service.in
new file mode 100644
index 0000000..42f358a
--- /dev/null
+++ b/data/kaccounts/ktp-kde-talk-im.service.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="ktp-kde-talk-im">
+  <type>IM</type>
+  <!-- KDE Talk Chat - Service name being displayed as a checkbox label to enable/disable this service -->
+  <_name>Chat</_name>
+  <icon>kde</icon>
+  <provider>ktp-kde-talk</provider>
+  <translations>kaccounts-providers</translations>
+</service>
diff --git a/data/kaccounts/ktp-kde-talk.provider.in b/data/kaccounts/ktp-kde-talk.provider.in
new file mode 100644
index 0000000..6fe4dc6
--- /dev/null
+++ b/data/kaccounts/ktp-kde-talk.provider.in
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="ktp-kde-talk">
+    <!-- This is KDE's own IM network based on jabber, it's an estabilished name and probably shouldn't be translated -->
+    <_name>KDE Talk</_name>
+    <icon>kde</icon>
+    <!-- Tooltip text appearing over the button to create this type of account -->
+    <_description>KDE Talk chat account</_description>
+    <translations>kaccounts-providers</translations>
+
+    <template>
+        <group name="auth">
+            <setting name="method">password</setting>
+            <setting name="mechanism">password</setting>
+        </group>
+    </template>
+</provider>

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list