Hello community, here is the log from the commit of package ktp-accounts-kcm for openSUSE:Factory checked in at 2015-10-03 20:24:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktp-accounts-kcm (Old) and /work/SRC/openSUSE:Factory/.ktp-accounts-kcm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktp-accounts-kcm" Changes: -------- --- /work/SRC/openSUSE:Factory/ktp-accounts-kcm/ktp-accounts-kcm.changes 2015-07-14 17:41:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktp-accounts-kcm.new/ktp-accounts-kcm.changes 2015-10-03 20:24:19.000000000 +0200 @@ -1,0 +2,23 @@ +Sun Sep 13 19:30:37 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + + +------------------------------------------------------------------- +Wed Aug 19 19:44:01 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.0 + * KDE Applications 15.08.0 + * https://www.kde.org/announcements/announce-applications-15.08.0.php + +------------------------------------------------------------------- +Fri Aug 7 07:09:53 UTC 2015 - [email protected] + +- Update to KDE Applications 15.07.90 + * KDE Applications 15.08.0 RC1 + * https://www.kde.org/announcements/announce-applications-15.07.90.php + + +------------------------------------------------------------------- Old: ---- ktp-accounts-kcm-15.04.3.tar.xz New: ---- ktp-accounts-kcm-15.08.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktp-accounts-kcm.spec ++++++ --- /var/tmp/diff_new_pack.E1OVuj/_old 2015-10-03 20:24:20.000000000 +0200 +++ /var/tmp/diff_new_pack.E1OVuj/_new 2015-10-03 20:24:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: ktp-accounts-kcm -Version: 15.04.3 +Version: 15.08.1 Release: 0 Summary: KCM Module for configuring Telepathy Instant Messaging Accounts License: LGPL-2.1+ @@ -46,6 +46,7 @@ BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Widgets) Requires: telepathy-mission-control +Requires: telepathy-accounts-signon Recommends: telepathy-gabble Recommends: telepathy-haze Recommends: telepathy-idle ++++++ ktp-accounts-kcm-15.04.3.tar.xz -> ktp-accounts-kcm-15.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/CMakeLists.txt new/ktp-accounts-kcm-15.08.1/CMakeLists.txt --- old/ktp-accounts-kcm-15.04.3/CMakeLists.txt 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/CMakeLists.txt 2015-09-10 00:56:31.000000000 +0200 @@ -7,20 +7,24 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) find_package(Qt5 5.2.0 CONFIG REQUIRED Core Widgets DBus) -find_package(KF5 5.0.0 REQUIRED KCMUtils KIO I18n WidgetsAddons Codecs CoreAddons ConfigWidgets IconThemes ItemViews) +find_package(KF5 5.11 REQUIRED KCMUtils KIO I18n WidgetsAddons Codecs CoreAddons ConfigWidgets IconThemes ItemViews) + +# KDE Application Version, managed by release script +set (KDE_APPLICATIONS_VERSION_MAJOR "15") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set(KTP_ACCOUNTS_KCM_SONUMBER "9") -set(KTP_ACCOUNTS_KCM_VERSION "15.04.2") +set(KTP_ACCOUNTS_KCM_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(IS_KTP_INTERNAL_MODULE TRUE) find_package (TelepathyQt5 REQUIRED) find_package (KAccounts REQUIRED) -find_package (AccountsFileDir REQUIRED) -find_package (AccountsQt5 1.10 REQUIRED CONFIG) -find_package (SignOnQt5 8.55 REQUIRED CONFIG) find_package (Intltool REQUIRED) #needed to generate service and provider files +set(CMAKE_MODULE_PATH ${KACCOUNTS_MACROS_PATH} ${CMAKE_MODULE_PATH}) #for KAccountsMacros + # make some more macros available # include (MacroLibrary) @@ -30,6 +34,7 @@ include(KDECompilerSettings) include(ECMInstallIcons) include(FeatureSummary) +include(KAccountsMacros) add_definitions ( # -DQT_NO_CAST_FROM_ASCII diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/cmake/modules/FindAccountsFileDir.cmake new/ktp-accounts-kcm-15.08.1/cmake/modules/FindAccountsFileDir.cmake --- old/ktp-accounts-kcm-15.04.3/cmake/modules/FindAccountsFileDir.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/cmake/modules/FindAccountsFileDir.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -find_package(PkgConfig REQUIRED) - -execute_process( - COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=prefix libaccounts-glib - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - -if (_pkgconfig_failed) - message(FAILED "Couldn't find the prefix for libaccounts-glib") -else() - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - set(ACCOUNTS_PREFIX_DIR ${_pkgconfig_invoke_result}) -endif() - -execute_process( - COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=providerfilesdir libaccounts-glib - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - -if (_pkgconfig_failed) - message(FAILED "Couldn't find the providerfilesdir for libaccounts-glib") -else() - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - string(REPLACE ${ACCOUNTS_PREFIX_DIR} ${CMAKE_INSTALL_PREFIX} _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif() - set(ACCOUNTS_PROVIDERS_DIR ${_pkgconfig_invoke_result}) -endif() - -execute_process( - COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=servicefilesdir libaccounts-glib - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - -if (_pkgconfig_failed) - message(FAILED "Couldn't find the servicefilesdir for libaccounts-glib") -else() - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - string(REPLACE ${ACCOUNTS_PREFIX_DIR} ${CMAKE_INSTALL_PREFIX} _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif() - set(ACCOUNTS_SERVICES_DIR ${_pkgconfig_invoke_result}) -endif() - -find_package_handle_standard_args(AccountsFileDir DEFAULT_MSG - ACCOUNTS_SERVICES_DIR ACCOUNTS_PROVIDERS_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/CMakeLists.txt new/ktp-accounts-kcm-15.08.1/data/kaccounts/CMakeLists.txt --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/CMakeLists.txt 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/CMakeLists.txt 2015-09-10 00:56:31.000000000 +0200 @@ -1,15 +1,9 @@ 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}) + kaccounts_add_service(${service_file_in}) 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 + kaccounts_add_provider(${provider_in_file}) +endforeach() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/disabled/ktp-haze-steam-mobile-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/disabled/ktp-haze-steam-mobile-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/disabled/ktp-haze-steam-mobile-im.service.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/disabled/ktp-haze-steam-mobile-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -6,4 +6,14 @@ <icon>input-gaming</icon> <provider>ktp-haze-steam-mobile</provider> <translations>kaccounts-providers</translations> + <template> + <group name="telepathy"> + <setting name="manager">haze</setting> + <setting name="protocol">steam-mobile</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -5,11 +5,5 @@ <!-- Tooltip text appearing over the button to create this type of account --> <_description>Steam Chat account</_description> <translations>kaccounts-providers</translations> - - <template> - <group name="auth"> - <setting name="method">password</setting> - <setting name="mechanism">password</setting> - </group> - </template> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> </provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-gadugadu.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-gadugadu.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-gadugadu.provider.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-gadugadu.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -5,12 +5,6 @@ <!-- Tooltip text appearing over the button to create this type of account --> <_description>Gadu-Gadu (GG) chat account</_description> <translations>kaccounts-providers</translations> - - <template> - <group name="auth"> - <setting name="method">password</setting> - <setting name="mechanism">password</setting> - </group> - </template> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> </provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-aim-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-aim-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-aim-im.service.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-aim-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<service id="ktp-haze-aim-im"> + <type>IM</type> + <!-- AIM Chat - Service name being displayed as a checkbox label to enable/disable this service --> + <_name>Chat</_name> + <icon>im-aim</icon> + <provider>ktp-haze-aim</provider> + <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">haze</setting> + <setting name="protocol">aim</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> +</service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-aim.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-aim.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-aim.provider.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-aim.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<provider id="ktp-haze-aim"> + <_name>AIM</_name> + <icon>im-aim</icon> + <!-- Tooltip text appearing over the button to create this type of account --> + <_description>Chat account in the AIM network</_description> + <translations>kaccounts-providers</translations> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> +</provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-gadugadu-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-gadugadu-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-gadugadu-im.service.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-gadugadu-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -6,5 +6,16 @@ <icon>im-gadugadu</icon> <provider>ktp-gadugadu</provider> <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">haze</setting> + <setting name="protocol">gadugadu</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-icq-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-icq-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-icq-im.service.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-icq-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -6,4 +6,15 @@ <icon>im-icq</icon> <provider>ktp-haze-icq</provider> <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">haze</setting> + <setting name="protocol">icq</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-icq.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-icq.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-icq.provider.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-icq.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -5,11 +5,5 @@ <!-- 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> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> </provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-sametime-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-sametime-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-sametime-im.service.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-sametime-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -6,4 +6,15 @@ <icon>im-user</icon> <provider>ktp-haze-sametime</provider> <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">haze</setting> + <setting name="protocol">sametime</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-sametime.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-sametime.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-sametime.provider.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-sametime.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -5,11 +5,5 @@ <!-- Tooltip text appearing over the button to create this type of account --> <_description>Chat account in an IBM Sametime network</_description> <translations>kaccounts-providers</translations> - - <template> - <group name="auth"> - <setting name="method">password</setting> - <setting name="mechanism">password</setting> - </group> - </template> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> </provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-yahoo-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-yahoo-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-yahoo-im.service.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-yahoo-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -6,5 +6,16 @@ <icon>im-yahoo</icon> <provider>ktp-haze-yahoo</provider> <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">haze</setting> + <setting name="protocol">yahoo</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-yahoo.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-yahoo.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-haze-yahoo.provider.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-haze-yahoo.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -5,12 +5,6 @@ <!-- Tooltip text appearing over the button to create this type of account --> <_description>Yahoo! Messenger chat account</_description> <translations>kaccounts-providers</translations> - - <template> - <group name="auth"> - <setting name="method">password</setting> - <setting name="mechanism">password</setting> - </group> - </template> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> </provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-jabber-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-jabber-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-jabber-im.service.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-jabber-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -6,4 +6,15 @@ <icon>im-jabber-talk</icon> <provider>ktp-jabber</provider> <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">gabble</setting> + <setting name="protocol">jabber</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-jabber.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-jabber.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-jabber.provider.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-jabber.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -5,11 +5,5 @@ <!-- 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> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> </provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-kde-talk-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-kde-talk-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-kde-talk-im.service.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-kde-talk-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -6,4 +6,15 @@ <icon>kde</icon> <provider>ktp-kde-talk</provider> <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">gabble</setting> + <setting name="protocol">jabber</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-kde-talk.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-kde-talk.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-kde-talk.provider.in 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-kde-talk.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -6,11 +6,5 @@ <!-- 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> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> </provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-morse-telegram-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-morse-telegram-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-morse-telegram-im.service.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-morse-telegram-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<service id="ktp-telegram-im"> + <type>IM</type> + + <_name>Chat</_name> + <icon>telepathy-kde</icon> + <provider>ktp-morse-telegram</provider> + <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">morse</setting> + <setting name="protocol">telegram</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> +</service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-morse-telegram.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-morse-telegram.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-morse-telegram.provider.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-morse-telegram.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<provider id="ktp-morse-telegram"> + <_name>Telegram</_name> + <icon>telepathy-kde</icon> + <!-- Tooltip text appearing over the button to create this type of account --> + <_description>Telegram account</_description> + <translations>kaccounts-providers</translations> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> +</provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-sipe-haze-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-sipe-haze-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-sipe-haze-im.service.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-sipe-haze-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<service id="ktp-sipe-haze-im"> + <type>IM</type> + <!-- SIPE Chat - Service name being displayed as a checkbox label to enable/disable this service --> + <_name>Chat</_name> + <icon>telepathy-kde</icon> + <provider>ktp-sipe-haze</provider> + <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">haze</setting> + <setting name="protocol">sipe</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> +</service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-sipe-haze.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-sipe-haze.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-sipe-haze.provider.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-sipe-haze.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<provider id="ktp-sipe-haze"> + <_name>Office 365/Lync (via libpurple)</_name> + <icon>telepathy-kde</icon> + <!-- Tooltip text appearing over the button to create this type of account --> + <_description>Chat account in the Office 365/Lync network</_description> + <translations>kaccounts-providers</translations> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> +</provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-sipe-im.service.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-sipe-im.service.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-sipe-im.service.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-sipe-im.service.in 2015-09-10 00:56:31.000000000 +0200 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<service id="ktp-sipe-im"> + <type>IM</type> + <!-- SIPE Chat - Service name being displayed as a checkbox label to enable/disable this service --> + <_name>Chat</_name> + <icon>telepathy-kde</icon> + <provider>ktp-sipe</provider> + <translations>kaccounts-providers</translations> + + <template> + <group name="telepathy"> + <setting name="manager">sipe</setting> + <setting name="protocol">sipe</setting> + </group> + <group name="auth"> + <setting name="method">password</setting> + <setting name="mechanism">password</setting> + </group> + </template> +</service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-sipe.provider.in new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-sipe.provider.in --- old/ktp-accounts-kcm-15.04.3/data/kaccounts/ktp-sipe.provider.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ktp-accounts-kcm-15.08.1/data/kaccounts/ktp-sipe.provider.in 2015-09-10 00:56:31.000000000 +0200 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<provider id="ktp-sipe"> + <_name>Office 365/Lync</_name> + <icon>telepathy-kde</icon> + <!-- Tooltip text appearing over the button to create this type of account --> + <_description>Chat account in the Office 365/Lync network</_description> + <translations>kaccounts-providers</translations> + <plugin>ktpaccountskcm_plugin_kaccounts</plugin> +</provider> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/CMakeLists.txt new/ktp-accounts-kcm-15.08.1/plugins/CMakeLists.txt --- old/ktp-accounts-kcm-15.04.3/plugins/CMakeLists.txt 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/CMakeLists.txt 2015-09-10 00:56:31.000000000 +0200 @@ -4,8 +4,8 @@ # macro_optional_add_subdirectory (butterfly) # macro_optional_add_subdirectory (rakia) # macro_optional_add_subdirectory (salut) -# macro_optional_add_subdirectory (sunshine) +add_subdirectory (sunshine) # macro_optional_add_subdirectory (pintxo) -# macro_optional_add_subdirectory (sipe) -# macro_optional_add_subdirectory (morse) -add_subdirectory(kaccounts) +add_subdirectory (morse) +add_subdirectory (sipe) +add_subdirectory (kaccounts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -27,7 +27,7 @@ Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Butterfly verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń Butterfly. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Butterfly. -Comment[pt_BR]=Interface de usuário de configuração de contas personalizadas usando o gerenciador de conexões Butterfly. +Comment[pt_BR]=Interface de configuração de contas usando o gerenciador de conexões Butterfly. Comment[ro]=Interfață personalizată de configurare a conturilor folosind gestionarul de conexiuni Butterfly. Comment[ru]=Пользовательский интерфейс для настройки учётной записи с помощью менеджера соединений Butterfly. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre účty používajúce správcu pripojení Butterfly. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/gabble/ktpaccountskcm_plugin_gabble.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/gabble/ktpaccountskcm_plugin_gabble.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/gabble/ktpaccountskcm_plugin_gabble.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/gabble/ktpaccountskcm_plugin_gabble.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -27,7 +27,7 @@ Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Gabble verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń Gabble. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Gabble. -Comment[pt_BR]=Interface de configuração de contas personalizadas usando o gerenciador de conexões Gabble. +Comment[pt_BR]=Interface de configuração de contas usando o gerenciador de conexões Gabble. Comment[ro]=Interfață personalizată de configurare a conturilor folosind gestionarul de conexiuni Gabble. Comment[ru]=Пользовательский интерфейс для настройки учётной записи с помощью менеджера соединений Gabble. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre účty používajúce správcu pripojení Gabble. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/haze/ktpaccountskcm_plugin_haze.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/haze/ktpaccountskcm_plugin_haze.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/haze/ktpaccountskcm_plugin_haze.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/haze/ktpaccountskcm_plugin_haze.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -27,7 +27,7 @@ Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Haze verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń Haze. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Haze. -Comment[pt_BR]=Interface de configuração de contas personalizadas usando o gerenciador de conexões Haze. +Comment[pt_BR]=Interface de configuração de contas usando o gerenciador de conexões Haze. Comment[ro]=Interfață personalizată de configurare a conturilor folosind gestionarul de conexiuni Haze. Comment[ru]=Пользовательский интерфейс для настройки учётной записи с помощью менеджера соединений Haze. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre účty používajúce správcu pripojení Haze. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/idle/ktpaccountskcm_plugin_idle.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/idle/ktpaccountskcm_plugin_idle.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/idle/ktpaccountskcm_plugin_idle.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/idle/ktpaccountskcm_plugin_idle.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -27,7 +27,7 @@ Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Idle verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń Idle. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Idle. -Comment[pt_BR]=Interface de configuração de contas personalizadas usando o gerenciador de conexões Idle. +Comment[pt_BR]=Interface de configuração de contas usando o gerenciador de conexões Idle. Comment[ro]=Interfață personalizată de configurare a conturilor folosind gestionarul de conexiuni Idle. Comment[ru]=Пользовательский интерфейс для настройки учётной записи с помощью менеджера соединений Idle. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre účty používajúce správcu pripojení Idle. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/kaccounts/kaccounts-ui-provider.cpp new/ktp-accounts-kcm-15.08.1/plugins/kaccounts/kaccounts-ui-provider.cpp --- old/ktp-accounts-kcm-15.04.3/plugins/kaccounts/kaccounts-ui-provider.cpp 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/kaccounts/kaccounts-ui-provider.cpp 2015-09-10 00:56:31.000000000 +0200 @@ -40,6 +40,7 @@ #include <TelepathyQt/PendingAccount> #include <TelepathyQt/ProfileManager> #include <TelepathyQt/PendingStringList> +#include <TelepathyQt/AccountSet> #include <KLocalizedString> #include <KSharedConfig> @@ -62,10 +63,12 @@ Tp::ProfileManagerPtr profileManager; QDialog *dialog; bool thingsReady; - QString profileName; + QString providerName; KAccountsUiPlugin::UiType type; Tp::AccountPtr account; bool reconnectRequired; + QString manager; + QString protocol; }; KAccountsUiProvider::KAccountsUiProvider(QObject *parent) @@ -77,13 +80,11 @@ Tp::registerTypes(); - // Start setting up the Telepathy AccountManager. Tp::AccountFactoryPtr accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(), Tp::Features() << Tp::Account::FeatureCore << Tp::Account::FeatureCapabilities << Tp::Account::FeatureProtocolInfo << Tp::Account::FeatureProfile); - d->accountManager = Tp::AccountManager::create(accountFactory); d->accountManager->becomeReady(); } @@ -103,11 +104,7 @@ { d->type = type; - if (d->type == KAccountsUiPlugin::NewAccountDialog) { - d->profileManager = Tp::ProfileManager::create(QDBusConnection::sessionBus()); - Tp::PendingOperation *op = d->profileManager->becomeReady(Tp::Features() << Tp::ProfileManager::FeatureFakeProfiles); - connect(op, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onProfileManagerReady(Tp::PendingOperation*))); - } else { + if (d->type == KAccountsUiPlugin::ConfigureAccountDialog) { if (d->accountManager->isReady()) { Q_EMIT uiReady(); } else { @@ -117,6 +114,58 @@ } } +void KAccountsUiProvider::setProviderName(const QString &providerName) +{ + d->providerName = providerName; + + Accounts::ServiceList list = KAccounts::accountsManager()->serviceList(QStringLiteral("IM")); + Accounts::Service neededService; + Q_FOREACH (const Accounts::Service &service, list) { + if (service.provider() == providerName) { + neededService = service; + break; + } + } + + if (!neededService.isValid()) { + Q_EMIT error(i18n("Cannot find the needed service file for %1. Please check your installation.", providerName)); + return; + } + + auto nodeList = neededService.domDocument().elementsByTagName(QStringLiteral("group")); + + for (int i = 0; i < nodeList.size(); i++) { + auto attrsMap = nodeList.at(i).attributes(); + if (attrsMap.contains(QStringLiteral("name")) && attrsMap.namedItem(QStringLiteral("name")).nodeValue() == QLatin1String("telepathy")) { + QDomElement settingNode = nodeList.at(i).firstChildElement(QStringLiteral("setting")); + + while (!settingNode.isNull()) { + if (settingNode.attribute(QStringLiteral("name")) == QLatin1String("manager")) { + d->manager = settingNode.text(); + } + if (settingNode.attribute(QStringLiteral("name")) == QLatin1String("protocol")) { + d->protocol = settingNode.text(); + } + + settingNode = settingNode.nextSiblingElement(QStringLiteral("setting")); + } + + if (!d->manager.isEmpty() && !d->protocol.isEmpty()) { + break; + } + } + } + + qDebug() << "Requested UI for manager" << d->manager << "and protocol" << d->protocol; + + if (d->profileManager.isNull()) { + d->profileManager = Tp::ProfileManager::create(QDBusConnection::sessionBus()); + } + + Tp::PendingOperation *op = d->profileManager->becomeReady(Tp::Features() << Tp::ProfileManager::FeatureFakeProfiles); + connect(op, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onProfileManagerReady(Tp::PendingOperation*))); +} + void KAccountsUiProvider::onProfileManagerReady(Tp::PendingOperation *op) { if (op && op->isError()) { @@ -128,29 +177,32 @@ // OR if profile name was set and profile manager is not yet ready, return. // If profile name is set and this returns, it will get through this again when profile manager // becomes ready and vice-versa. - if (d->profileName.isEmpty() || (d->profileManager && !d->profileManager->isReady(Tp::Features() << Tp::ProfileManager::FeatureFakeProfiles))) { + if (d->profileManager && !d->profileManager->isReady(Tp::Features() << Tp::ProfileManager::FeatureFakeProfiles)) { return; } - qDebug() << "Creating service for" << d->profileName; + qDebug() << "Creating service for" << d->providerName; - d->profile = d->profileManager->profileForService(d->profileName); + // KDE Talk is a bit special case so special handling needs to be added + QString profileService = d->providerName.mid(4); - if (d->profile.isNull()) { - Q_EMIT error(i18n("To connect to this IM network, you need to install additional plugins. Please install the telepathy-haze and telepathy-gabble packages using your package manager.")); - return; + auto profiles = d->profileManager->profilesForProtocol(d->protocol); + Q_FOREACH (const Tp::ProfilePtr &profile, profiles) { + if (profile->cmName() == d->manager && profile->protocolName() == d->protocol && profileService == profile->serviceName()) { + d->profile = profile; + break; + } } - d->connectionManager = Tp::ConnectionManager::create(d->profile->cmName()); - connect(d->connectionManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), - this, SLOT(onConnectionManagerReady(Tp::PendingOperation*))); -} - -void KAccountsUiProvider::setProviderName(const QString &providerName) -{ - d->profileName = providerName; + if (d->profile.isNull() || profiles.isEmpty()) { + Q_EMIT error(i18n("This IM Account cannot be created - a Telepathy Connection Manager named '%1' is missing or it cannot handle protocol '%2'. " \ + "Please try installing %1 with your package manager.", d->manager, d->protocol)); + return; + } - onProfileManagerReady(0); + d->connectionManager = Tp::ConnectionManager::create(d->manager); + Tp::PendingOperation *cmReady = d->connectionManager->becomeReady(Tp::Features() << Tp::ConnectionManager::FeatureCore); + connect(cmReady, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onConnectionManagerReady(Tp::PendingOperation*))); } void KAccountsUiProvider::onConnectionManagerReady(Tp::PendingOperation*) @@ -158,17 +210,11 @@ Tp::ProtocolInfo protocolInfo = d->connectionManager->protocol(d->profile->protocolName()); Tp::ProtocolParameterList parameters = protocolInfo.parameters(); + d->dialog = new QDialog(); // Add the parameters to the model. - ParameterEditModel *parameterModel = new ParameterEditModel(this); + ParameterEditModel *parameterModel = new ParameterEditModel(d->dialog); parameterModel->addItems(parameters, d->profile->parameters()); - // Delete account previous widget if it already existed. - if (d->accountEditWidget) { - d->accountEditWidget->deleteLater(); - d->accountEditWidget = 0; - } - - d->dialog = new QDialog(); d->dialog->setAttribute(Qt::WA_DeleteOnClose); QVBoxLayout *mainLayout = new QVBoxLayout(d->dialog); d->dialog->setLayout(mainLayout); @@ -203,17 +249,17 @@ void KAccountsUiProvider::showConfigureAccountDialog(const quint32 accountId) { - KSharedConfigPtr kaccountsConfig = KSharedConfig::openConfig(QStringLiteral("kaccounts-ktprc")); - KConfigGroup ktpKaccountsGroup = kaccountsConfig->group(QStringLiteral("kaccounts-ktp")); - QString accountUid = ktpKaccountsGroup.readEntry(QString::number(accountId)); + Q_FOREACH (const Tp::AccountPtr &account, d->accountManager->validAccounts()->accounts()) { + if (account->uniqueIdentifier().endsWith(QString::number(accountId))) { + d->account = account; + } + } - if (accountUid.isEmpty()) { - qWarning() << "Empty accountUid, returning..."; + if (!d->account) { + qWarning() << "Couldn't find account for" << accountId; return; } - d->account = d->accountManager->accountForObjectPath(accountUid); - // Get the protocol's parameters and values. Tp::ProtocolInfo protocolInfo = d->account->protocolInfo(); Tp::ProtocolParameterList parameters = protocolInfo.parameters(); @@ -300,16 +346,10 @@ values.remove(QLatin1String("password")); } - d->accountEditWidget->updateDisplayName(); - Tp::PendingAccount *pa = d->accountManager->createAccount(d->profile->cmName(), - d->profile->protocolName(), - d->accountEditWidget->displayName(), - values, - properties); - - connect(pa, - SIGNAL(finished(Tp::PendingOperation*)), - SLOT(onAccountCreated(Tp::PendingOperation*))); + //TODO: prefix all the values with telepathy or some mc-key + Q_EMIT success(values[QStringLiteral("account")].toString(), values[QStringLiteral("password")].toString(), values); + + d->dialog->accept(); } void KAccountsUiProvider::onCreateAccountDialogRejected() @@ -317,45 +357,6 @@ Q_EMIT error(QString()); } -void KAccountsUiProvider::onAccountCreated(Tp::PendingOperation *op) -{ - if (op->isError()) { - Q_EMIT feedbackMessage(i18n("Failed to create account"), - i18n("Possibly not all required fields are valid"), - KMessageWidget::Error); - qWarning() << "Adding Account failed:" << op->errorName() << op->errorMessage(); - Q_EMIT error(op->errorMessage()); - return; - } - - // Get the PendingAccount. - Tp::PendingAccount *pendingAccount = qobject_cast<Tp::PendingAccount*>(op); - if (!pendingAccount) { - Q_EMIT feedbackMessage(i18n("Something went wrong with Telepathy"), - QString(), - KMessageWidget::Error); - qWarning() << "Method called with wrong type."; - Q_EMIT error(QStringLiteral("Something went wrong with Telepathy")); - return; - } - - Tp::AccountPtr account = pendingAccount->account(); - account->setServiceName(d->profile->serviceName()); - if (d->accountEditWidget->connectOnAdd()) { - account->setRequestedPresence(Tp::Presence::available()); - } - - QVariantMap values = d->accountEditWidget->parametersSet(); - - QVariantMap additionalData; - - additionalData.insert(QStringLiteral("uid"), account->objectPath()); - - Q_EMIT success(values[QStringLiteral("account")].toString(), values[QStringLiteral("password")].toString(), additionalData); - - d->dialog->accept(); -} - void KAccountsUiProvider::onConfigureAccountDialogAccepted() { QVariantMap setParameters = d->accountEditWidget->parametersSet(); @@ -384,7 +385,7 @@ Q_ASSERT(psl); if (!psl) { - qWarning() << "Something weird happened"; + qWarning() << "Something weird happened; couldn't update the parameters"; } if (psl->result().size() > 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/kaccounts/kaccounts-ui-provider.h new/ktp-accounts-kcm-15.08.1/plugins/kaccounts/kaccounts-ui-provider.h --- old/ktp-accounts-kcm-15.04.3/plugins/kaccounts/kaccounts-ui-provider.h 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/kaccounts/kaccounts-ui-provider.h 2015-09-10 00:56:31.000000000 +0200 @@ -52,7 +52,6 @@ private Q_SLOTS: void onProfileManagerReady(Tp::PendingOperation*); void onConnectionManagerReady(Tp::PendingOperation*); - void onAccountCreated(Tp::PendingOperation*); void onCreateAccountDialogAccepted(); void onCreateAccountDialogRejected(); void onConfigureAccountDialogAccepted(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/morse/CMakeLists.txt new/ktp-accounts-kcm-15.08.1/plugins/morse/CMakeLists.txt --- old/ktp-accounts-kcm-15.04.3/plugins/morse/CMakeLists.txt 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/morse/CMakeLists.txt 2015-09-10 00:56:31.000000000 +0200 @@ -4,25 +4,27 @@ ${CMAKE_CURRENT_SOURCE_DIR} ) +add_definitions(-DTRANSLATION_DOMAIN=\"kcmtelepathyaccounts_plugin_morse\") + set (ktpaccountskcm_plugin_morse_SRCS morse-account-ui-plugin.cpp telegram-account-ui.cpp main-options-widget.cpp ) -kde4_add_ui_files (ktpaccountskcm_plugin_morse_SRCS +ki18n_wrap_ui (ktpaccountskcm_plugin_morse_SRCS main-options-widget.ui ) -kde4_add_plugin (ktpaccountskcm_plugin_morse +add_library (ktpaccountskcm_plugin_morse MODULE ${ktpaccountskcm_plugin_morse_SRCS} ) target_link_libraries (ktpaccountskcm_plugin_morse ktpaccountskcminternal - ${QT_LIBRARIES} - ${KDE4_KDEUI_LIBS} - ${TELEPATHY_QT4_LIBRARIES} + Qt5::Core + Qt5::Widgets + ${TELEPATHY_QT5_LIBRARIES} ) # Install: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/morse/Messages.sh new/ktp-accounts-kcm-15.08.1/plugins/morse/Messages.sh --- old/ktp-accounts-kcm-15.04.3/plugins/morse/Messages.sh 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/morse/Messages.sh 2015-09-10 00:56:31.000000000 +0200 @@ -1,4 +1,4 @@ #! /usr/bin/env bash $EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11 -$XGETTEXT `find . -name "*.cpp"` -o $podir/kcmtelepathyaccounts_plugin_butterfly.pot +$XGETTEXT `find . -name "*.cpp"` -o $podir/kcmtelepathyaccounts_plugin_morse.pot rm -f rc.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -13,13 +13,15 @@ Comment[et]=Morse ühendusehaldurit kasutavate kontode kohandatud konto seadistamise kasutajaliides Comment[fi]=Morse-yhteyshallintaa käyttävien tilien mukautettu hallintakäyttöliittymä. Comment[fr]=Interface utilisateur personnalisée pour la configuration de comptes en utilisant le gestionnaire de connexions « Morse ». +Comment[gl]=Interface de usuario de configuración personalizada da conta para contas que empreguen o xestor de conexións Morse. Comment[hu]=Egyedi beállítófelület a Morse kapcsolatkezelőt használó azonosítókhoz. Comment[it]=Interfaccia utente personalizzata di configurazione account per account che usano il gestore di connessioni Morse. +Comment[ko]=Morse 연결 관리자를 사용하는 계정 설정 사용자 인터페이스입니다. Comment[nb]=Brukerflate for å sette opp egendefinerte kontoer ved bruk av Morse tilkoblingsbehandler. Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Morse verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń Morse. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Morse. -Comment[pt_BR]=Interface de configuração de contas personalizadas usando o gerenciador de conexões Morse. +Comment[pt_BR]=Interface de configuração de contas usando o gerenciador de conexões Morse. Comment[ro]=Interfață personalizată de configurare a conturilor folosind gestionarul de conexiuni Morse. Comment[ru]=Пользовательский интерфейс для настройки учётной записи с помощью диспетчера соединений Morse. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre účty používajúce správcu pripojení Morse. @@ -29,6 +31,7 @@ Comment[sr@ijekavianlatin]=Korisničko sučelje za podešavanje posebnih naloga pod menadžerom veze Morse. Comment[sr@latin]=Korisničko sučelje za podešavanje posebnih naloga pod menadžerom veze Morse. Comment[sv]=Användargränssnitt för anpassad kontoinställning av konton som använder anslutningshanteraren Morse. +Comment[tr]=Morse bağlantı yöneticisi kullanan hesaplar için özel hesap yapılandırma kullanıcı arayüzü. Comment[uk]=Інтерфейс користувача для нетипового налаштовування облікового запису за допомогою керування з’єднаннями Morse. Comment[x-test]=xxCustom account configuration user interface for accounts using the Morse connection manager.xx Comment[zh_CN]=通过 Morse 连接管理器自定义账户的配置界面 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/morse/main-options-widget.ui new/ktp-accounts-kcm-15.08.1/plugins/morse/main-options-widget.ui --- old/ktp-accounts-kcm-15.04.3/plugins/morse/main-options-widget.ui 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/morse/main-options-widget.ui 2015-09-10 00:56:31.000000000 +0200 @@ -34,10 +34,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="KLineEdit" name="accountLineEdit"> - <property name="showClearButton" stdset="0"> - <bool>false</bool> - </property> + <widget class="QLineEdit" name="accountLineEdit"> </widget> </item> <item row="2" column="0"> @@ -52,13 +49,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/morse/morse-account-ui-plugin.cpp new/ktp-accounts-kcm-15.08.1/plugins/morse/morse-account-ui-plugin.cpp --- old/ktp-accounts-kcm-15.04.3/plugins/morse/morse-account-ui-plugin.cpp 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/morse/morse-account-ui-plugin.cpp 2015-09-10 00:56:31.000000000 +0200 @@ -50,6 +50,5 @@ } K_PLUGIN_FACTORY(factory, registerPlugin<MorseAccountUiPlugin>();) -K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_morse")) #include "morse-account-ui-plugin.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -26,7 +26,7 @@ Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Pintxo verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń Pintxo. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Pintxo. -Comment[pt_BR]=Interface de configuração de contas personalizadas usando o gerenciador de conexões Pintxo. +Comment[pt_BR]=Interface de configuração de contas usando o gerenciador de conexões Pintxo. Comment[ro]=Interfață personalizată de configurare a conturilor folosind gestionarul de conexiuni Pintxo. Comment[ru]=Пользовательский интерфейс для настройки учётной записи с помощью менеджера соединений Pintxo. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre účty používajúce správcu pripojení Pintxo. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/rakia/ktpaccountskcm_plugin_rakia.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/rakia/ktpaccountskcm_plugin_rakia.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/rakia/ktpaccountskcm_plugin_rakia.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/rakia/ktpaccountskcm_plugin_rakia.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -27,7 +27,7 @@ Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Rakia/SofiaSIP verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń Rakia/SofiaSIP. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Rakia/SofiaSIP. -Comment[pt_BR]=Interface de configuração de contas personalizadas usando o gerenciador de conexões Rakia/SofiaSIP. +Comment[pt_BR]=Interface de configuração de contas usando o gerenciador de conexões Rakia/SofiaSIP. Comment[ro]=Interfață personalizată de configurare a conturilor folosind gestionarul de conexiuni Rakia/SofiaSIP. Comment[ru]=Пользовательский интерфейс для настройки учётной записи с помощью менеджера соединений Rakia/SofiaSIP. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre účty používajúce správcu pripojení Rakia/SofiaSIP. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/salut/ktpaccountskcm_plugin_salut.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/salut/ktpaccountskcm_plugin_salut.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/salut/ktpaccountskcm_plugin_salut.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/salut/ktpaccountskcm_plugin_salut.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -27,7 +27,7 @@ Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Salut verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń Salut. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Salut. -Comment[pt_BR]=Interface de configuração de contas personalizadas usando o gerenciador de conexões Salut. +Comment[pt_BR]=Interface de configuração de contas usando o gerenciador de conexões Salut. Comment[ro]=Interfață personalizată de configurare a conturilor folosind gestionarul de conexiuni Salut. Comment[ru]=Пользовательский интерфейс для настройки учётной записи с помощью менеджера соединений Salut. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre účty používajúce správcu pripojení Salut. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sipe/CMakeLists.txt new/ktp-accounts-kcm-15.08.1/plugins/sipe/CMakeLists.txt --- old/ktp-accounts-kcm-15.04.3/plugins/sipe/CMakeLists.txt 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sipe/CMakeLists.txt 2015-09-10 00:56:31.000000000 +0200 @@ -4,6 +4,8 @@ ${CMAKE_CURRENT_SOURCE_DIR} ) +add_definitions(-DTRANSLATION_DOMAIN=\"kcmtelepathyaccounts_plugin_sipe\") + set (ktpaccountskcm_plugin_sipe_SRCS sipe-account-ui-plugin.cpp sipe-account-ui.cpp @@ -11,20 +13,20 @@ sipe-advanced-options-widget.cpp ) -kde4_add_ui_files (ktpaccountskcm_plugin_sipe_SRCS - sipe-main-options-widget.ui - sipe-advanced-options-widget.ui +ki18n_wrap_ui (ktpaccountskcm_plugin_sipe_SRCS + sipe-main-options-widget.ui + sipe-advanced-options-widget.ui ) -kde4_add_plugin (ktpaccountskcm_plugin_sipe - ${ktpaccountskcm_plugin_sipe_SRCS} +add_library (ktpaccountskcm_plugin_sipe MODULE + ${ktpaccountskcm_plugin_sipe_SRCS} ) target_link_libraries (ktpaccountskcm_plugin_sipe ktpaccountskcminternal - ${QT_LIBRARIES} - ${KDE4_KDEUI_LIBS} - ${TELEPATHY_QT4_LIBRARIES} + Qt5::Core + Qt5::Widgets + ${TELEPATHY_QT5_LIBRARIES} ) # Install: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -14,6 +14,7 @@ Comment[et]=Sipe ühendusehaldurit kasutavate kontode kohandatud konto seadistamise kasutajaliides Comment[fi]=Sipe-yhteyshallintaa käyttävien tilien mukautettu hallintakäyttöliittymä. Comment[fr]=Interface utilisateur personnalisée pour la configuration de comptes en utilisant le gestionnaire de connexions « sipe ». +Comment[gl]=Interface de usuario de configuración personalizada da conta para contas que empreguen o xestor de conexións Sipe. Comment[hu]=Egyedi beállítófelület a sipe kapcsolatkezelőt használó azonosítókhoz. Comment[ia]=Interfacie de usator pro configuration de conto personalisate pro contos usante le gerente de connexion Sipe. Comment[it]=Interfaccia utente personalizzata di configurazione account per account che usano il gestore di connessioni Sipe. @@ -24,7 +25,7 @@ Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Sipe verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń sipe. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Sipe. -Comment[pt_BR]=Interface de configuração de contas personalizadas usando o gerenciador de conexões Sipe. +Comment[pt_BR]=Interface de configuração de contas usando o gerenciador de conexões Sipe. Comment[ro]=Interfață personalizată de configurare a conturilor folosind gestionarul de conexiuni Sipe. Comment[ru]=Пользовательский интерфейс для настройки учётной записи с помощью диспетчера соединений Sipe. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre účty používajúce správcu pripojení Sipe. @@ -54,6 +55,7 @@ Name[et]=Sipe konto seadistamise kasutajaliides Name[fi]=Sipe-tilinmäärityksen käyttöliittymä Name[fr]=Interface utilisateur pour la configuration de comptes « sipe ». +Name[gl]=Interface de usuario para a configuración de contas de Sipe Name[hu]=Sipe azonosítóbeállító felület Name[ia]=Interfacie de usator de configuration de conto de Sipe Name[it]=Interfaccia utente di configurazione account Sipe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sipe/sipe-account-ui-plugin.cpp new/ktp-accounts-kcm-15.08.1/plugins/sipe/sipe-account-ui-plugin.cpp --- old/ktp-accounts-kcm-15.04.3/plugins/sipe/sipe-account-ui-plugin.cpp 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sipe/sipe-account-ui-plugin.cpp 2015-09-10 00:56:31.000000000 +0200 @@ -50,6 +50,5 @@ } K_PLUGIN_FACTORY(factory, registerPlugin<SipeAccountUiPlugin>();) -K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_sipe")) #include "sipe-account-ui-plugin.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sipe/sipe-advanced-options-widget.ui new/ktp-accounts-kcm-15.08.1/plugins/sipe/sipe-advanced-options-widget.ui --- old/ktp-accounts-kcm-15.04.3/plugins/sipe/sipe-advanced-options-widget.ui 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sipe/sipe-advanced-options-widget.ui 2015-09-10 00:56:31.000000000 +0200 @@ -33,7 +33,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="KLineEdit" name="loginLineEdit"/> + <widget class="QLineEdit" name="loginLineEdit"/> </item> <item row="1" column="0"> <widget class="QLabel" name="serverLabel"> @@ -43,7 +43,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="KLineEdit" name="serverLineEdit"/> + <widget class="QLineEdit" name="serverLineEdit"/> </item> <item row="2" column="0"> <widget class="QLabel" name="portLabel"> @@ -53,7 +53,17 @@ </widget> </item> <item row="2" column="1"> - <widget class="KIntSpinBox" name="portSpinBox"/> + <widget class="QSpinBox" name="portSpinBox"> + <property name="minimum"> + <number>0</number> + </property> + <property name="maximum"> + <number>65535</number> + </property> + <property name="value"> + <number>5060</number> + </property> + </widget> </item> <item row="3" column="0"> <widget class="QLabel" name="transportLabel"> @@ -63,7 +73,7 @@ </widget> </item> <item row="3" column="1"> - <widget class="KComboBox" name="transportComboBox"> + <widget class="QComboBox" name="transportComboBox"> <item> <property name="text"> <string>auto</string> @@ -89,7 +99,7 @@ </widget> </item> <item row="4" column="1"> - <widget class="KLineEdit" name="useragentLineEdit"/> + <widget class="QLineEdit" name="useragentLineEdit"/> </item> <item row="5" column="0"> <widget class="QLabel" name="authenticationLabel"> @@ -99,7 +109,7 @@ </widget> </item> <item row="5" column="1"> - <widget class="KComboBox" name="authenticationComboBox"> + <widget class="QComboBox" name="authenticationComboBox"> <item> <property name="text"> <string>ntlm</string> @@ -135,23 +145,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>KComboBox</class> - <extends>QComboBox</extends> - <header>kcombobox.h</header> - </customwidget> - <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> - </customwidget> - <customwidget> - <class>KIntSpinBox</class> - <extends>QSpinBox</extends> - <header>knuminput.h</header> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sipe/sipe-main-options-widget.ui new/ktp-accounts-kcm-15.08.1/plugins/sipe/sipe-main-options-widget.ui --- old/ktp-accounts-kcm-15.04.3/plugins/sipe/sipe-main-options-widget.ui 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sipe/sipe-main-options-widget.ui 2015-09-10 00:56:31.000000000 +0200 @@ -36,14 +36,14 @@ </widget> </item> <item row="0" column="1"> - <widget class="KLineEdit" name="accountLineEdit"> + <widget class="QLineEdit" name="accountLineEdit"> <property name="toolTip"> <string>The Sipe username is your email address.</string> </property> <property name="text"> <string/> </property> - <property name="clickMessage"> + <property name="placeholderText"> <string>[email protected]</string> </property> </widget> @@ -56,9 +56,9 @@ </widget> </item> <item row="1" column="1"> - <widget class="KLineEdit" name="passwordLineEdit"> - <property name="passwordMode"> - <bool>true</bool> + <widget class="QLineEdit" name="passwordLineEdit"> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> </property> </widget> </item> @@ -66,13 +66,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sunshine/CMakeLists.txt new/ktp-accounts-kcm-15.08.1/plugins/sunshine/CMakeLists.txt --- old/ktp-accounts-kcm-15.04.3/plugins/sunshine/CMakeLists.txt 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sunshine/CMakeLists.txt 2015-09-10 00:56:31.000000000 +0200 @@ -4,6 +4,8 @@ ${CMAKE_CURRENT_SOURCE_DIR} ) +add_definitions(-DTRANSLATION_DOMAIN=\"ktpaccountskcm_plugin_sunshine\") + set (ktpaccountskcm_plugin_sunshine_SRCS sunshine-account-ui-plugin.cpp sunshine-account-ui.cpp @@ -11,12 +13,12 @@ sunshine-advanced-options-widget.cpp ) -kde4_add_ui_files (ktpaccountskcm_plugin_sunshine_SRCS +ki18n_wrap_ui (ktpaccountskcm_plugin_sunshine_SRCS sunshine-main-options-widget.ui sunshine-advanced-options-widget.ui ) -kde4_add_plugin (ktpaccountskcm_plugin_sunshine +add_library (ktpaccountskcm_plugin_sunshine MODULE ${ktpaccountskcm_plugin_sunshine_SRCS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake new/ktp-accounts-kcm-15.08.1/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake --- old/ktp-accounts-kcm-15.04.3/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake 2015-09-10 00:56:31.000000000 +0200 @@ -27,7 +27,7 @@ Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor Gadu-Gadu accounts die de Sunshine verbindingenbeheerder gebruiken. Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont Gadu-Gadu wykorzystujących usługę połączeń Sunshine. Comment[pt]=Interface de utilizador de configuração de contas personalizadas com o gestor de ligações Sunshine. -Comment[pt_BR]=Interface de configuração de contas personalizadas usando o gerenciador de conexões Gadu-Gadu. +Comment[pt_BR]=Interface de configuração de contas do Gadu-Gadu usando o gerenciador de conexões Sunshine. Comment[ro]=Interfață personalizată de configurare a conturilor Gadu-Gadu folosind gestionarul de conexiuni Sunshine. Comment[ru]=Пользовательский интерфейс для настройки учётной записи Gadu-Gadu с помощью менеджера соединений Sunshine. Comment[sk]=Vlastné používateľské rozhranie konfigurácie účtu pre Gadu-Gadu účty používajúce správcu pripojení Sunshine. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sunshine/sunshine-account-ui-plugin.cpp new/ktp-accounts-kcm-15.08.1/plugins/sunshine/sunshine-account-ui-plugin.cpp --- old/ktp-accounts-kcm-15.04.3/plugins/sunshine/sunshine-account-ui-plugin.cpp 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sunshine/sunshine-account-ui-plugin.cpp 2015-09-10 00:56:31.000000000 +0200 @@ -21,8 +21,6 @@ #include "sunshine-account-ui-plugin.h" #include "sunshine-account-ui.h" -#include <KCMTelepathyAccounts/PluginMacros> - #include <KPluginFactory> #include <QtCore/QVariantList> @@ -54,6 +52,5 @@ } K_PLUGIN_FACTORY(factory, registerPlugin<SunshineAccountUiPlugin>();) -K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_sunshine")) #include "sunshine-account-ui-plugin.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sunshine/sunshine-advanced-options-widget.ui new/ktp-accounts-kcm-15.08.1/plugins/sunshine/sunshine-advanced-options-widget.ui --- old/ktp-accounts-kcm-15.04.3/plugins/sunshine/sunshine-advanced-options-widget.ui 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sunshine/sunshine-advanced-options-widget.ui 2015-09-10 00:56:31.000000000 +0200 @@ -34,7 +34,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="KLineEdit" name="serverLineEdit"> + <widget class="QLineEdit" name="serverLineEdit"> <property name="toolTip"> <string>STUN server address (FQDN or IP address)</string> </property> @@ -48,7 +48,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="KIntSpinBox" name="portSpinBox"> + <widget class="QSpinBox" name="portSpinBox"> <property name="maximum"> <number>65535</number> </property> @@ -99,18 +99,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>KIntSpinBox</class> - <extends>QSpinBox</extends> - <header>knuminput.h</header> - </customwidget> - <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> - </customwidget> - </customwidgets> <tabstops> <tabstop>serverGroupBox</tabstop> <tabstop>serverLineEdit</tabstop> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/plugins/sunshine/sunshine-main-options-widget.ui new/ktp-accounts-kcm-15.08.1/plugins/sunshine/sunshine-main-options-widget.ui --- old/ktp-accounts-kcm-15.04.3/plugins/sunshine/sunshine-main-options-widget.ui 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/plugins/sunshine/sunshine-main-options-widget.ui 2015-09-10 00:56:31.000000000 +0200 @@ -30,7 +30,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="KLineEdit" name="accountLineEdit"/> + <widget class="QLineEdit" name="accountLineEdit"/> </item> <item row="1" column="0"> <widget class="QLabel" name="passwordLabel"> @@ -43,26 +43,16 @@ </widget> </item> <item row="1" column="1"> - <widget class="KLineEdit" name="passwordLineEdit"> + <widget class="QLineEdit" name="passwordLineEdit"> <property name="echoMode"> <enum>QLineEdit::Password</enum> </property> - <property name="passwordMode"> - <bool>true</bool> - </property> </widget> </item> </layout> </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/src/KCMTelepathyAccounts/CMakeLists.txt new/ktp-accounts-kcm-15.08.1/src/KCMTelepathyAccounts/CMakeLists.txt --- old/ktp-accounts-kcm-15.04.3/src/KCMTelepathyAccounts/CMakeLists.txt 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/src/KCMTelepathyAccounts/CMakeLists.txt 2015-09-10 00:56:31.000000000 +0200 @@ -32,7 +32,6 @@ abstract-account-parameters-widget.h generic-advanced-options-widget.h account-edit-widget.h - plugin-macros.h plugin-manager.h profile-list-model.h profile-select-widget.h @@ -49,7 +48,6 @@ AbstractAccountParametersWidget GenericAdvancedOptionsWidget AccountEditWidget - PluginMacros ConnectionManagerItem PluginManager ProtocolSelectWidget diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/src/KCMTelepathyAccounts/PluginMacros new/ktp-accounts-kcm-15.08.1/src/KCMTelepathyAccounts/PluginMacros --- old/ktp-accounts-kcm-15.04.3/src/KCMTelepathyAccounts/PluginMacros 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/src/KCMTelepathyAccounts/PluginMacros 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MACROS_PRETTY_H -#define LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MACROS_PRETTY_H - -#include <KCMTelepathyAccounts/plugin-macros.h> - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop new/ktp-accounts-kcm-15.08.1/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop --- old/ktp-accounts-kcm-15.04.3/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop 2015-09-10 00:56:31.000000000 +0200 @@ -31,7 +31,7 @@ Comment[pa]=ਟੈਲੀਪੈਥੀ ਖਾਤਾ KCM ਮੋਡੀਊਲ ਖਾਤਾ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਪਲੱਗਇਨ Comment[pl]=Wtyczki interfejsu użytkownika modułu kont Telepathy Comment[pt]='Plugins' de Interfaces de Contas do Módulo KCM para o Telepathy -Comment[pt_BR]=Plugins de interface do módulo de configuração KCM das contas do Telepathy +Comment[pt_BR]=Plugins de interface do módulo de configuração KCM de contas do Telepathy Comment[ro]=Modul KCM cu interfețe grafice pentru configurarea conturilor Telepathy Comment[ru]=Модуль настройки учётных записей Telepathy Comment[sk]=Pluginy používateľského rozhrania účtu modulu KCM účtov Telepathy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/src/KCMTelepathyAccounts/plugin-macros.h new/ktp-accounts-kcm-15.08.1/src/KCMTelepathyAccounts/plugin-macros.h --- old/ktp-accounts-kcm-15.04.3/src/KCMTelepathyAccounts/plugin-macros.h 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/src/KCMTelepathyAccounts/plugin-macros.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -/* - * This file is part of telepathy-accounts-kcm - * - * Copyright (C) 2009 Collabora Ltd. <[email protected]> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MACROS_H -#define LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MACROS_H - -#include <kdemacros.h> -#include <KPluginFactory> - -#define KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT(libname,classname) \ - K_PLUGIN_FACTORY(factory,registerPlugin<classname>();) \ - K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_"#libname)) - -#endif // Header guard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-accounts-kcm-15.04.3/src/settings-im-and-voip.desktop new/ktp-accounts-kcm-15.08.1/src/settings-im-and-voip.desktop --- old/ktp-accounts-kcm-15.04.3/src/settings-im-and-voip.desktop 2015-06-01 13:57:21.000000000 +0200 +++ new/ktp-accounts-kcm-15.08.1/src/settings-im-and-voip.desktop 2015-09-10 00:56:31.000000000 +0200 @@ -78,7 +78,7 @@ X-KDE-Keywords[pa]=KTp,Chat, Telepathy, IM X-KDE-Keywords[pl]=KTp,Chat, Telepathy, IM X-KDE-Keywords[pt]=KTp, Conversa, Telepathy, MI -X-KDE-Keywords[pt_BR]=KTp, Chat, Conversa, Bate-Papo, Telepathy, IM, MI, mensageiro instantâneo +X-KDE-Keywords[pt_BR]=KTp, Chat, Conversa, Bate-Papo, Telepathy, IM, MI, Mensageiro Instantâneo, Mensagens Instantâneas X-KDE-Keywords[ro]=KTp,Chat, Telepathy, IM, MI, discuții, Discuție X-KDE-Keywords[ru]=KTp,Chat,Telepathy,IM,общение,чат X-KDE-Keywords[sk]=KTp,Chat, Telepathy, IM
