Author: arekm Date: Thu May 28 19:43:31 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 4; branch diff update
---- Files affected: packages/kde4-kdenetwork: kde4-kdenetwork-branch.diff (1.2 -> 1.3) , kde4-kdenetwork.spec (1.71 -> 1.72) ---- Diffs: ================================================================ Index: packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff diff -u packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff:1.2 packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff:1.3 --- packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff:1.2 Sun Apr 19 18:52:37 2009 +++ packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff Thu May 28 21:43:25 2009 @@ -1,2128 +1,980 @@ -Index: cmake/modules/FindDecibel.cmake +Index: krfb/krfb.notifyrc =================================================================== ---- cmake/modules/FindDecibel.cmake (.../tags/KDE/4.2.2/kdenetwork) (wersja 956243) -+++ cmake/modules/FindDecibel.cmake (.../branches/KDE/4.2/kdenetwork) (wersja 956243) -@@ -1,45 +0,0 @@ --# - Try to find Decibel packages (QtTapioca, QtTelepathy) --# Once done this will define --# --# DECIBEL_FOUND - Test has found Decibel dependencies --# DECIBEL_INCLUDES - Include needed for Decibel --# DECIBEL_LIBRARIES - Libraries needed for Decibel --# DECIBEL_DEFINITIONS - Compiler swithces required for using Decibel --# --# QT_TELEPATHY_INCLUDE_DIR - Include needed for QtTelepathy --# QT_TELEPATHY_LIBRARY - Library for QtTelepathy --# QT_TAPIOCA_INCLUDE_DIR - Included need for QtTapioca --# QT_TAPIOCA_LIBRARY - Library for QtTapioca --# --# use pkg-config to get the directories and then use these values --# in the FIND_PATH() and FIND_LIBRARY() calls --# --# Copyright (c) 2006, Michaël Larouche, <[email protected]> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- -- --IF (NOT WIN32) --find_package(PkgConfig) --pkg_check_modules(QTTAPIOCA QtTapioca) -- --ENDIF(NOT WIN32) -- --set(QT_TAPIOCA_INCLUDE_DIR ${QTTAPIOCA_INCLUDE_DIRS}) -- --set(DECIBEL_DEFINITIONS ${QTTAPIOCA_CFLAGS}) --set(DECIBEL_INCLUDES ${QT_TAPIOCA_INCLUDE_DIR} ) -- --FIND_LIBRARY(QT_TAPIOCA_LIBRARY NAMES QtTapioca -- PATHS -- ${QTTAPIOCA_LIBRARY_DIRS} -- NO_DEFAULT_PATH --) -- --set(DECIBEL_LIBRARIES ${QT_TAPIOCA_LIBRARY}) -- --include(FindPackageHandleStandardArgs) --FIND_PACKAGE_HANDLE_STANDARD_ARGS(Decibel DEFAULT_MSG DECIBEL_INCLUDES DECIBEL_LIBRARIES ) -- --MARK_AS_ADVANCED(QT_TAPIOCA_INCLUDE_DIR QT_TAPIOCA_LIBRARY) -Index: krdc/mainwindow.cpp -=================================================================== ---- krdc/mainwindow.cpp (.../tags/KDE/4.2.2/kdenetwork) (wersja 956243) -+++ krdc/mainwindow.cpp (.../branches/KDE/4.2/kdenetwork) (wersja 956243) -@@ -365,6 +365,7 @@ - - connect(view, SIGNAL(framebufferSizeChanged(int, int)), this, SLOT(resizeTabWidget(int, int))); - connect(view, SIGNAL(statusChanged(RemoteView::RemoteStatus)), this, SLOT(statusChanged(RemoteView::RemoteStatus))); -+ connect(view, SIGNAL(disconnected()), this, SLOT(disconnect())); - - m_remoteViewList.append(view); - -Index: kopete/plugins/pipes/kopete_pipes.desktop +--- krfb/krfb.notifyrc (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ krfb/krfb.notifyrc (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -53,8 +53,8 @@ + Comment[tg]=Истифодаи Муштараки Мизи Корӣ + Comment[tr]=Masaüstü Paylaşımı + Comment[uk]=Спільні стільниці ++Comment[xh]=Ulwahlulelano lwe Desktop + Comment[x-test]=xxDesktop Sharingxx +-Comment[xh]=Ulwahlulelano lwe Desktop + Comment[zh_CN]=桌面共享 + Comment[zh_HK]=桌面分享 + Comment[zh_TW]=桌面分享 +@@ -156,8 +156,8 @@ + Comment[tg]=Корванд пайвастшавиро қабул мекунад + Comment[tr]=Kullanıcı bağlantıyı kabul etti + Comment[uk]=Користувач приймає з’єднання ++Comment[xh]=Umsebenzisi wamkela uxhulumaniso + Comment[x-test]=xxUser accepts connectionxx +-Comment[xh]=Umsebenzisi wamkela uxhulumaniso + Comment[zh_CN]=用户接受连接 + Comment[zh_HK]=用戶接受連線 + Comment[zh_TW]=使用者接受連線 +@@ -260,8 +260,8 @@ + Comment[tg]=Корванд пайвастшавиро рад мекунад + Comment[tr]=Kullanıcı bağlantıyı reddetti + Comment[uk]=Користувач не приймає з’єднання ++Comment[xh]=Umsebenzisi wala uxhulumaniso + Comment[x-test]=xxUser refuses connectionxx +-Comment[xh]=Umsebenzisi wala uxhulumaniso + Comment[zh_CN]=用户拒绝连接 + Comment[zh_HK]=用戶拒絕連線 + Comment[zh_TW]=使用者拒絕連線使用者 +@@ -292,6 +292,7 @@ + Name[ko]=연결이 닫힘 + Name[lt]=Ryšys baigtas + Name[lv]=Savienojums slēgts ++Name[mai]=संबंधन बन्न भ' गेल + Name[ml]=ബന്ധം അടച്ചു + Name[nb]=Forbindelsen lukket + Name[nds]=Afkoppelt +@@ -367,8 +368,8 @@ + Comment[uk]=З'єднання закрито + Comment[uz]=Aloqa uzildi + comment...@cyrillic]=Алоқа узилди ++Comment[xh]=Uxhulumaniso luvaliwe + Comment[x-test]=xxConnection closedxx +-Comment[xh]=Uxhulumaniso luvaliwe + Comment[zh_CN]=连接关闭 + Comment[zh_HK]=連線已關閉 + Comment[zh_TW]=連線已關閉 +@@ -450,6 +451,7 @@ + Comment[ko]=잘못된 암호 + Comment[lt]=Neteisingas slaptažodis + Comment[lv]=Parole nav derīga ++Comment[mai]=अवैध कूटशब्द + Comment[mk]=Невалидна лозинка + Comment[ml]=അസാധുവായ അടയാളവാക്ക് + Comment[ms]=Kata laluan tidak sah +@@ -476,8 +478,8 @@ + Comment[uz]=Maxfiy soʻz haqiqiy emas + comment...@cyrillic]=Махфий сўз ҳақиқий эмас + Comment[wa]=Sicret nén valide ++Comment[xh]=Igama lokugqitha elingasebenziyo + Comment[x-test]=xxInvalid passwordxx +-Comment[xh]=Igama lokugqitha elingasebenziyo + Comment[zh_CN]=无效密码 + Comment[zh_HK]=無效的密碼 + Comment[zh_TW]=不正確的密碼 +@@ -579,8 +581,8 @@ + Comment[tg]=Корванди дурдаст гузарвожаи нодурустро фиристод. Пайвастшавӣ манъ шудааст. + Comment[tr]=Davet edilenden gönderilmiş geçersiz parola. Bağlantı rededildi. + Comment[uk]=Запрошений учасник надіслав некоректний пароль. У з’єднанні відмовлено. ++Comment[xh]=Umhlangano omenyiweyo uthumele igama lokugqitha elisebenzayo. Uxhulumano lwa liwe. + Comment[x-test]=xxThe invited party sent an invalid password. Connection refused.xx +-Comment[xh]=Umhlangano omenyiweyo uthumele igama lokugqitha elisebenzayo. Uxhulumano lwa liwe. + Comment[zh_CN]=受邀请方发送的密码不对。连接被拒绝。 + Comment[zh_HK]=被邀請的一方送出無效的密碼。已拒絕連線。 + Comment[zh_TW]=邀請的人送出了不合法的密碼邀請。連線已拒絕。 +@@ -682,8 +684,8 @@ + Comment[tg]=Пайвастшавӣ дархоста шудааст, корванд бояд қабул кунад + Comment[tr]=Bağlantı isteği, kullanıcı kabul etmeli + Comment[uk]=Отримано запит на з’єднання, користувач має його прийняти ++Comment[xh]=Uxhulumaniso luceliwe, umsebenzisi kufanele amkele + Comment[x-test]=xxConnection requested, user must acceptxx +-Comment[xh]=Uxhulumaniso luceliwe, umsebenzisi kufanele amkele + Comment[zh_CN]=连接已请求，用户必须接受 + Comment[zh_HK]=已請求連線，用戶必須接受 + Comment[zh_TW]=連線已要求，必須等使用者接受 +@@ -786,8 +788,8 @@ + Comment[tg]=Пайвастшавии нав ба таври худкор барпо мегардад + Comment[tr]=Yeni bağlantı otomatik olarak kuruldu + Comment[uk]=Автоматично встановлено нове з’єднання ++Comment[xh]=Uxhulumaniso olutsha lufunyenwe ngokuzenzekelayo + Comment[x-test]=xxNew connection automatically establishedxx +-Comment[xh]=Uxhulumaniso olutsha lufunyenwe ngokuzenzekelayo + Comment[zh_CN]=自动建立新连接 + Comment[zh_HK]=已自動建立新連線 + Comment[zh_TW]=新連線自動建立 +@@ -893,8 +895,8 @@ + Comment[uk]=Зайнято, у з’єднанні відмовлено + Comment[uz]=Band, aloqa rad etildi + comment...@cyrillic]=Банд, алоқа рад этилди ++Comment[xh]=Uxhulumaniso, olu xakekileyo lwaliwe + Comment[x-test]=xxBusy, connection refusedxx +-Comment[xh]=Uxhulumaniso, olu xakekileyo lwaliwe + Comment[zh_CN]=对方处于忙碌状态，连接被拒绝 + Comment[zh_HK]=忙碌，已拒絕連線 + Comment[zh_TW]=忙碌，連線被拒 +@@ -997,8 +999,8 @@ + Comment[tg]=Пайвастшавии ғайричашмдош қабул гардид, кандашавӣ + Comment[tr]=Babul edilmiş beklenmedik bağlantı, durdur + Comment[uk]=Отримано з’єднання, яке не очікувалось, припиняється ++Comment[xh]=Ufumene uxhulumaniso olungalindelekanga, lahla + Comment[x-test]=xxReceived unexpected connection, abortxx +-Comment[xh]=Ufumene uxhulumaniso olungalindelekanga, lahla + Comment[zh_CN]=收到意外连接，已中止 + Comment[zh_HK]=接收到非預期的連線，中止 + Comment[zh_TW]=已接收到未知的連線，中止。 +Index: krfb/kcm_krfb/kcmkrfb.desktop +=================================================================== +--- krfb/kcm_krfb/kcmkrfb.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ krfb/kcm_krfb/kcmkrfb.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -69,8 +69,8 @@ + Name[tr]=Masaüstü Paylaşımı + Name[uk]=Спільні стільниці + Name[vi]=Chia sẻ màn hình nền ++Name[xh]=Ukwehlulelana kwe Desktop + Name[x-test]=xxDesktop Sharingxx +-Name[xh]=Ukwehlulelana kwe Desktop + Name[zh_CN]=桌面共享 + Name[zh_HK]=桌面分享 + Name[zh_TW]=桌面分享 +@@ -134,8 +134,8 @@ + Comment[tr]=Masaüstü Paylaşımını Yapılandır + Comment[uk]=Налаштувати спільні стільниці + Comment[vi]=Cấu hình chia sẻ màn hình nền ++Comment[xh]=Qwalasela Ukusebenzisa ngokuhlangeneyo kwe Desktop + Comment[x-test]=xxConfigure Desktop Sharingxx +-Comment[xh]=Qwalasela Ukusebenzisa ngokuhlangeneyo kwe Desktop + Comment[zh_CN]=配置桌面共享 + Comment[zh_HK]=設定桌面分享 + Comment[zh_TW]=設定桌面分享 +Index: krfb/kinetd/kinetd.desktop +=================================================================== +--- krfb/kinetd/kinetd.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ krfb/kinetd/kinetd.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -130,8 +130,8 @@ + Comment[uz]=Talab qilinganda tarmoq xizmatlarini ishga tushuruvchi Internet demoni + comment...@cyrillic]=Талаб қилинганда тармоқ хизматларини ишга тушурувчи Интернет демони + Comment[vi]=Một trình nền Mạng mà chạy các dịch vụ mạng theo nhu cầu ++Comment[xh]=Internet daemon eqala iinkonzo zomsebenzi wonatha xa zifunwa + Comment[x-test]=xxAn Internet daemon that starts network services on demandxx +-Comment[xh]=Internet daemon eqala iinkonzo zomsebenzi wonatha xa zifunwa + Comment[zh_CN]=按需启动网络服务的守护进程 + Comment[zh_HK]=自動依需求起動網絡服務的互聯網系統程式 + Comment[zh_TW]=依要求起動網路服務的 Internet 伺服程式 +Index: krfb/kinetd/kinetd.notifyrc +=================================================================== +--- krfb/kinetd/kinetd.notifyrc (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ krfb/kinetd/kinetd.notifyrc (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -58,8 +58,8 @@ + Name[ta]=உள்வரும் இணைப்புகள் + Name[tg]=Пайвастшавии Воридшаванда + Name[tr]=Gelen Bağlantı ++Name[xh]=Uxhumaniso Olungenayo + Name[x-test]=xxIncomingConnectionxx +-Name[xh]=Uxhumaniso Olungenayo + Name[zh_CN]=进入的连接 + Name[zh_HK]=進入連線 + Name[zh_TW]=進來的連線 +@@ -114,8 +114,8 @@ + Comment[tg]=Пайвастшавии воридшаванда қабул гардид + Comment[tr]=Gelen bağlantı alınıyor + Comment[uk]=Отримано вхідне з’єднання ++Comment[xh]=Uxhulumano olungenayo olufunyenweyo + Comment[x-test]=xxReceived incoming connectionxx +-Comment[xh]=Uxhulumano olungenayo olufunyenweyo + Comment[zh_CN]=收到进入的连接 + Comment[zh_HK]=已接收的進入連線 + Comment[zh_TW]=接收到進來的連線 +@@ -125,7 +125,7 @@ + Name=ProcessFailed + Name[ar]=فشلت العملية + Name[bn]=প্রসেস ব্যর্থ +-Name[ca]=Procés fallit ++Name[ca]=Procés erroni + Name[cs]=Proces selhal + Name[cy]=MethoddProses + Name[da]=ProcesMislykkedes +@@ -169,8 +169,8 @@ + Name[ta]=செயல் தோல்வியுற்றது + Name[tg]=Ҷараён бо Нокомӣ анҷомид + Name[tr]=Başarısız İşlemler ++Name[xh]=Inkqubo Yahlulekile + Name[x-test]=xxProcessFailedxx +-Name[xh]=Inkqubo Yahlulekile + Name[zh_CN]=处理失败 + Name[zh_HK]=程序失敗 + Name[zh_TW]=行程失敗 +@@ -225,8 +225,8 @@ + Comment[tg]=Барои даскории пайвастшавӣ ҷараён бозхонда нашуд + Comment[tr]=Elle bağlantıda başarısız çağrı işlemleri + Comment[uk]=Не вдалося викликати процес для з’єднання ++Comment[xh]=Ayikwazanga ukubiza inkqubo ezakuphatha uxhulumano + Comment[x-test]=xxCould not call process to handle connectionxx +-Comment[xh]=Ayikwazanga ukubiza inkqubo ezakuphatha uxhulumano + Comment[zh_CN]=无法调用进程处理连接 + Comment[zh_HK]=無法呼叫處理連線的程序 + Comment[zh_TW]=無法呼叫行程來處理此連線 +Index: krfb/kinetd/kinetdmodule.desktop +=================================================================== +--- krfb/kinetd/kinetdmodule.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ krfb/kinetd/kinetdmodule.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -60,8 +60,8 @@ + Name[tr]=KDED Modül Türü + Name[uk]=Тип модулю KinetD + Name[vi]=Kiểu môđun KInetD ++Name[xh]=Udidi Lomqongo womlinganiselo we KInetD + Name[x-test]=xxKInetD Module Typexx +-Name[xh]=Udidi Lomqongo womlinganiselo we KInetD + Name[zh_CN]=KInetD 模块类型 + Name[zh_HK]=KInetD 模組類型 + Name[zh_TW]=KInetD 模組類型 +Index: kopete/plugins/nowlistening/kopete_nowlistening_config.desktop +=================================================================== +--- kopete/plugins/nowlistening/kopete_nowlistening_config.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ kopete/plugins/nowlistening/kopete_nowlistening_config.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -40,6 +40,7 @@ + Name[ko]=지금 재생 중 + Name[lt]=Dabar klausau + Name[lv]=Šobrīd atskaņo ++Name[mai]=आबि सुनि रहल अछि + Name[mk]=Сега слуша + Name[ml]=ഇപ്പോള് ശ്രദ്ധിക്കുന്നു + Name[nb]=Hører nå på +Index: kopete/plugins/nowlistening/kopete_nowlistening.desktop =================================================================== ---- kopete/plugins/pipes/kopete_pipes.desktop (.../tags/KDE/4.2.2/kdenetwork) (wersja 956243) -+++ kopete/plugins/pipes/kopete_pipes.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 956243) -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Service - X-Kopete-Version=1000900 --Icon=pipe -+Icon=mail-message - X-KDE-Library=kopete_pipes - X-KDE-ServiceTypes=Kopete/Plugin - X-KDE-PluginInfo-Author=Charles Connell -Index: kopete/plugins/pipes/kopete_pipes_config.desktop -=================================================================== ---- kopete/plugins/pipes/kopete_pipes_config.desktop (.../tags/KDE/4.2.2/kdenetwork) (wersja 956243) -+++ kopete/plugins/pipes/kopete_pipes_config.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 956243) -@@ -1,5 +1,5 @@ - [Desktop Entry] --Icon=pipe -+Icon=mail-message - Type=Service - X-KDE-ServiceTypes=KCModule - -Index: kopete/plugins/webpresence/kopete_webpresence.desktop -=================================================================== ---- kopete/plugins/webpresence/kopete_webpresence.desktop (.../tags/KDE/4.2.2/kdenetwork) (wersja 956243) -+++ kopete/plugins/webpresence/kopete_webpresence.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 956243) -@@ -123,7 +123,7 @@ - Name[ta]=இணைய இருப்பு - Name[tg]=Мавҷудияти Web - Name[tr]=Web Hazır Bulunması --Name[uk]=Присутність у Тенет -+Name[uk]=Присутність у Тенетах - Name[vi]=Vẻ ngoài của Mạng - Name[x-test]=xxWeb Presencexx - Name[zh_CN]=Web 状态 -Index: kopete/plugins/webpresence/kopete_webpresence_config.desktop -=================================================================== ---- kopete/plugins/webpresence/kopete_webpresence_config.desktop (.../tags/KDE/4.2.2/kdenetwork) (wersja 956243) -+++ kopete/plugins/webpresence/kopete_webpresence_config.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 956243) -@@ -117,7 +117,7 @@ - Name[ta]=இணைய இருப்பு - Name[tg]=Мавҷудияти Web - Name[tr]=Web Hazır Bulunması --Name[uk]=Присутність у Тенет -+Name[uk]=Присутність у Тенетах - Name[vi]=Vẻ ngoài của Mạng - Name[x-test]=xxWeb Presencexx - Name[zh_CN]=Web 状态 -Index: kopete/protocols/wlm/wlmaccount.cpp -=================================================================== ---- kopete/protocols/wlm/wlmaccount.cpp (.../tags/KDE/4.2.2/kdenetwork) (wersja 956243) -+++ kopete/protocols/wlm/wlmaccount.cpp (.../branches/KDE/4.2/kdenetwork) (wersja 956243) -@@ -65,12 +65,6 @@ - Kopete::ContactList::self ()->myself ())); - myself ()->setOnlineStatus (WlmProtocol::protocol ()->wlmOffline); - clientid += MSN::MSNC7; -- clientid += MSN::MSNC6; -- clientid += MSN::MSNC5; -- clientid += MSN::MSNC4; -- clientid += MSN::MSNC3; -- clientid += MSN::MSNC2; -- clientid += MSN::MSNC1; - clientid += MSN::SupportWinks; - clientid += MSN::VoiceClips; - clientid += MSN::InkGifSupport; -Index: kopete/protocols/jabber/jabbergroupcontact.cpp +--- kopete/plugins/nowlistening/kopete_nowlistening.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ kopete/plugins/nowlistening/kopete_nowlistening.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -45,6 +45,7 @@ + Name[ko]=지금 재생 중 + Name[lt]=Dabar klausau + Name[lv]=Šobrīd atskaņo ++Name[mai]=आबि सुनि रहल अछि + Name[mk]=Сега слуша + Name[ml]=ഇപ്പോള് ശ്രദ്ധിക്കുന്നു + Name[nb]=Hører nå på +Index: kopete/plugins/alias/kopete_alias.desktop +=================================================================== +--- kopete/plugins/alias/kopete_alias.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ kopete/plugins/alias/kopete_alias.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -37,6 +37,7 @@ + Name[ko]=별명 + Name[lt]=Kitas vardas + Name[lv]=Īsceļi ++Name[mai]=उपनाम + Name[mk]=Други имиња + Name[ml]=ചെല്ലപ്പേര് + Name[ne]=उपनाम +Index: kopete/plugins/alias/kopete_alias_config.desktop =================================================================== ---- kopete/protocols/jabber/jabbergroupcontact.cpp (.../tags/KDE/4.2.2/kdenetwork) (wersja 956243) -+++ kopete/protocols/jabber/jabbergroupcontact.cpp (.../branches/KDE/4.2/kdenetwork) (wersja 956243) +--- kopete/plugins/alias/kopete_alias_config.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ kopete/plugins/alias/kopete_alias_config.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) @@ -32,6 +32,7 @@ - #include "jabbergroupmembercontact.h" - #include "jabbercontactpool.h" - #include "kopetemetacontact.h" -+#include "kopetepluginmanager.h" - #include "xmpp_tasks.h" - - /** -@@ -181,7 +182,11 @@ - - if( !message.xencrypted().isEmpty () ) - { -- body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n"); -+ if (Kopete::PluginManager::self()->plugin("kopete_cryptography")) -+ { -+ kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded"; -+ body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n"); -+ } - } - - // locate the originating contact -Index: kopete/protocols/jabber/jabbercontact.cpp + Name[ko]=별명 + Name[lt]=Kitas vardas + Name[lv]=Īsceļi ++Name[mai]=उपनाम + Name[mk]=Други имиња + Name[ml]=ചെല്ലപ്പേര് + Name[ne]=उपनाम +Index: kopete/plugins/translator/kopete_translator.desktop +=================================================================== +--- kopete/plugins/translator/kopete_translator.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ kopete/plugins/translator/kopete_translator.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -46,6 +46,7 @@ + Name[ku]=Wergêr + Name[lt]=Vertėjas + Name[lv]=Tulkotājs ++Name[mai]=अनुवादक + Name[mk]=Преведувач + Name[ml]=പരിഭാഷകന് + Name[nb]=Oversetter +Index: kopete/plugins/translator/kopete_translator_config.desktop +=================================================================== +--- kopete/plugins/translator/kopete_translator_config.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ kopete/plugins/translator/kopete_translator_config.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -41,6 +41,7 @@ + Name[ku]=Wergêr + Name[lt]=Vertėjas + Name[lv]=Tulkotājs ++Name[mai]=अनुवादक + Name[mk]=Преведувач + Name[ml]=പരിഭാഷകന് + Name[nb]=Oversetter +Index: kopete/plugins/statistics/kopete_statistics.desktop +=================================================================== +--- kopete/plugins/statistics/kopete_statistics.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ kopete/plugins/statistics/kopete_statistics.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -46,6 +46,7 @@ + Name[ku]=Statistîk + Name[lt]=Statistika + Name[lv]=Statistika ++Name[mai]=सांख्यिकी + Name[ml]=സ്ഥിതിവിവരം + Name[nb]=Statistikk + Name[nds]=Statistik +Index: kopete/plugins/addbookmarks/kopete_addbookmarks.desktop +=================================================================== +--- kopete/plugins/addbookmarks/kopete_addbookmarks.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ kopete/plugins/addbookmarks/kopete_addbookmarks.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -33,6 +33,7 @@ + Name[ko]=책갈피 + Name[lt]=Žymelės + Name[lv]=Grāmatzīmes ++Name[mai]=पुस्तकचिह्न + Name[mk]=Обележувачи + Name[ml]=ഓര്മ്മക്കുറിപ്പുകള് + Name[nb]=Bokmerker +@@ -58,8 +59,8 @@ + Name[uz]=Xatchoʻplar + name...@cyrillic]=Хатчўплар + Name[vi]=Dấu hiệu ++Name[xh]=Amanqaku encwadi + Name[x-test]=xxBookmarksxx +-Name[xh]=Amanqaku encwadi + Name[zh_CN]=书签 + Name[zh_HK]=書籤 + Name[zh_TW]=書籤 +Index: kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop +=================================================================== +--- kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop (.../tags/KDE/4.2.3/kdenetwork) (wersja 974232) ++++ kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop (.../branches/KDE/4.2/kdenetwork) (wersja 974232) +@@ -33,6 +33,7 @@ + Name[ko]=책갈피 + Name[lt]=Žymelės + Name[lv]=Grāmatzīmes ++Name[mai]=पुस्तकचिह्न + Name[mk]=Обележувачи + Name[ml]=ഓര്മ്മക്കുറിപ്പുകള് + Name[nb]=Bokmerker +@@ -58,8 +59,8 @@ + Name[uz]=Xatchoʻplar + name...@cyrillic]=Хатчўплар + Name[vi]=Dấu hiệu ++Name[xh]=Amanqaku encwadi + Name[x-test]=xxBookmarksxx +-Name[xh]=Amanqaku encwadi + Name[zh_CN]=书签 + Name[zh_HK]=書籤 + Name[zh_TW]=書籤 +Index: kopete/plugins/history/kopete_history.desktop =================================================================== ---- kopete/protocols/jabber/jabbercontact.cpp (.../tags/KDE/4.2.2/kdenetwork) (wersja 956243) -+++ kopete/protocols/jabber/jabbercontact.cpp (.../branches/KDE/4.2/kdenetwork) (wersja 956243) -@@ -51,6 +51,7 @@ - #include "kopetechatsessionmanager.h" - #include "kopeteaccountmanager.h" - #include "kopetemetacontact.h" -+#include "kopetepluginmanager.h" - #include "jabberprotocol.h" - #include "jabberaccount.h" - #include "jabberclient.h" -@@ -392,9 +393,15 @@ - QString body = message.body (); - if( !message.xencrypted().isEmpty() ) - { -- body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n"); -+ kDebug ( JABBER_DEBUG_GLOBAL ) << "Received encrypted message"; -+ if (Kopete::PluginManager::self()->plugin("kopete_cryptography")) -+ { -+ kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded"; -+ body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n"); -+ } - } -- else if( message.containsHTML() ) -+ -+ if( message.containsHTML() ) - { - kDebug ( JABBER_DEBUG_GLOBAL ) << "Received a xHTML message"; - newMessage = new Kopete::Message ( this, contactList ); -Index: kopete/protocols/oscar/liboscar/chatroomhandler.h -=================================================================== ---- kopete/protocols/oscar/liboscar/chatroomhandler.h (.../tags/KDE/4.2.2/kdenetwork) (wersja 0) -+++ kopete/protocols/oscar/liboscar/chatroomhandler.h (.../branches/KDE/4.2/kdenetwork) (wersja 956243) -@@ -0,0 +1,55 @@ -+/* -+ Kopete Oscar Protocol -+ Chat Room Handler -+ -+ Copyright 2009 Benson Tsai <[email protected]> -+ -+ Kopete ( c ) 2002-2009 by the Kopete developers <[email protected]> -+ -+ based on filetransferhandler.h and filetransferhandler.cpp -+ -+ ************************************************************************* -+ * * -+ * 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 of the License, or ( at your option ) any later version. * -+ * * -+ ************************************************************************* -+*/ -+#ifndef CHATROOMHANDLER_H -+#define CHATROOMHANDLER_H -+ -+#include <QtCore/QObject> -+#include "oscartypes.h" -+ -+#include "liboscar_export.h" -+ -+class ChatRoomTask; -+ -+class LIBOSCAR_EXPORT ChatRoomHandler : public QObject -+{ -+ Q_OBJECT -+public: -+ ChatRoomHandler( ChatRoomTask* chatRoomTask ); -+ -+ void send(); -+ -+ QString internalId() const; -+ QString contact() const; -+ QString invite() const; -+ Oscar::WORD exchange() const; -+ QString room() const; -+ -+public Q_SLOTS: -+ void reject(); -+ void accept(); -+ -+signals: -+ void joinChatRoom( const QString& roomName, int exchange ); -+ -+private: -+ ChatRoomTask* m_chatRoomTask; <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdenetwork/kde4-kdenetwork.spec?r1=1.71&r2=1.72&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
