packages: kde4-kdenetwork/kde4-kdenetwork-branch.diff, kde4-kdenetwork/kde4...

Wed Nov 25 11:04:50 CET 2009

Author: arekm                        Date: Wed Nov 25 10:04:50 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; updated branch diff

---- Files affected:
packages/kde4-kdenetwork:
   kde4-kdenetwork-branch.diff (1.4 -> 1.5) , kde4-kdenetwork.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff
diff -u packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff:1.4 packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff:1.5

--- packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff:1.4	Wed Aug 19 22:10:36 2009
+++ packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff	Wed Nov 25 11:04:44 2009
@@ -1,1708 +1,1454 @@
-Index: krdc/test/krdc_test.desktop
-===================================================================
---- krdc/test/krdc_test.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ krdc/test/krdc_test.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -28,6 +28,7 @@
- Name[zh_TW]=測試
- Comment=Testplugin for KRDC development
- Comment[ca]=Connector de prova del desenvolupament del KRDC
-+Comment[cs]=Demonstrační modul pro vývoj KRDC
- Comment[da]=Test-plugin til KRDC-udvikling
- Comment[de]=Testmodul für die KRDC-Entwicklung
- Comment[el]=Πρόσθετο δοκιμής για την ανάπτυξη του KRDC
-@@ -47,8 +48,10 @@
- Comment[nds]=Testmoduul för't Utwickeln vun KRDC
- Comment[nl]=Testplugin voor KRDC-ontwikkeling
- Comment[nn]=Programtillegg for demonstrasjon og opplæring i KRDC-utvikling
-+Comment[pl]=Wtyczka demonstracyjna do nauki programowania KRDC
- Comment[pt]='Plugin' de demonstração para o desenvolvimento com o KRDC
- Comment[pt_BR]=Plug-in de teste para o desenvolvimento no KRDC
-+Comment[ro]=Modul de testare pentru dezvoltarea KRDC
- Comment[ru]=Демонстрационный модуль для изучения программирования модулей KRDC
- Comment[sl]=Poskusni vstavek za razvoj KRDC
- Comment[sr]=Пробни прикључак за развој КРДЦ‑а
-Index: krdc/krdcui.rc
-===================================================================
---- krdc/krdcui.rc	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ krdc/krdcui.rc	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
--<gui name="krdc" version="6">
-+<gui name="krdc" version="7">
- <MenuBar>
-     <Menu name="file">
-         <Action name="new_vnc_connection" />
-@@ -9,7 +9,7 @@
-         <Action name="zeroconf_page" />
-     </Menu>
-     <Menu noMerge="1" name="session"><text>&amp;Session</text>
--        <Action name="fullscreen" />
-+        <Action name="switch_fullscreen" />
-         <Action name="take_screenshot" />
-         <Action name="view_only" />
-         <Action name="show_local_cursor" />
-@@ -23,7 +23,7 @@
-     </Menu>
- </MenuBar>
- <ToolBar fullWidth="false" name="krdc_remote_view_toolbar" iconText="icononly" newline="false"><text>Remote View Toolbar</text>
--    <Action name="fullscreen" />
-+    <Action name="switch_fullscreen" />
-     <Action name="take_screenshot" />
-     <Action name="view_only" />
-     <Action name="show_local_cursor" />
-Index: krdc/rdp/krdc_rdp.desktop
-===================================================================
---- krdc/rdp/krdc_rdp.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ krdc/rdp/krdc_rdp.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -27,6 +27,7 @@
- Comment[nds]=RDP-Törns över KRDC plegen
- Comment[nl]=Staat het beheer van RDP-sessies toe via KRDC
- Comment[nn]=Lèt deg handtera RDP-økter gjennom KRDC
-+Comment[pl]=Pozwala na zarządzanie sesjami RDP przez KRDC
- Comment[pt]=Permite a gestão de sessões RDP através do KRDC
- Comment[pt_BR]=Permite o gerenciamento de sessões RDP através do KRDC
- Comment[ro]=Permite gestiunea sesiunilor RDP prin KRDC
-Index: krdc/nx/krdc_nx.desktop
-===================================================================
---- krdc/nx/krdc_nx.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ krdc/nx/krdc_nx.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -26,6 +26,7 @@
- Comment[nds]=NX-Törns över KRDC plegen
- Comment[nl]=Staat het beheren van NX-sessies toe via KRDC
- Comment[nn]=Lèt deg handtera NX-økter gjennom KRDC
-+Comment[pl]=Pozwala na zarządzanie sesjami NX przez KRDC
- Comment[pt]=Permite a gestão de sessões NX através do KRDC
- Comment[pt_BR]=Permite o gerenciamento de sessões NX através do KRDC
- Comment[ro]=Permite gestiunea sesiunilor NX prin KRDC
-Index: krdc/vnc/krdc_vnc.desktop
-===================================================================
---- krdc/vnc/krdc_vnc.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ krdc/vnc/krdc_vnc.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -26,6 +26,7 @@
- Comment[nds]=VNC-Törns över KRDC plegen
- Comment[nl]=Staat het beheer van VNC-sessies toe via KRDC
- Comment[nn]=Lèt deg handtera VNC-økter gjennom KRDC
-+Comment[pl]=Pozwala na zarządzanie sesjami VNC przez KRDC
- Comment[pt]=Permite a gestão de sessões VNC através do KRDC
- Comment[pt_BR]=Permite o gerenciamento de sessões VNC através do KRDC
- Comment[ro]=Permite gestiunea sesiunilor VNC prin KRDC
-Index: krdc/core/krdc_plugin.desktop
-===================================================================
---- krdc/core/krdc_plugin.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ krdc/core/krdc_plugin.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -24,6 +24,7 @@
- Name[nl]=KRDC-plugin
- Name[nn]=KRDC-programtillegg
- Name[pa]=KRDC ਪਲੱਗਇਨ
-+Name[pl]=Wtyczka KRDC
- Name[pt]='Plugin' do KRDC 
- Name[pt_BR]=Plug-in KRDC
- Name[ro]=Modul KRDC
 Index: krdc/mainwindow.cpp
 ===================================================================
---- krdc/mainwindow.cpp	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ krdc/mainwindow.cpp	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -185,6 +185,12 @@
-     screenshotAction->setIcon(KIcon("ksnapshot"));
-     connect(screenshotAction, SIGNAL(triggered()), SLOT(takeScreenshot()));
- 
-+    KAction *fullscreenAction = actionCollection()->addAction("switch_fullscreen"); // note: please do not switch to KStandardShortcut unless you know what you are doing (see history of this file)
-+    fullscreenAction->setText(i18n("Switch to Full Screen Mode"));
-+    fullscreenAction->setIcon(KIcon("view-fullscreen"));
-+    fullscreenAction->setShortcut(KStandardShortcut::fullScreen());
-+    connect(fullscreenAction, SIGNAL(triggered()), SLOT(switchFullscreen()));
-+
-     QAction *viewOnlyAction = actionCollection()->addAction("view_only");
-     viewOnlyAction->setCheckable(true);
-     viewOnlyAction->setText(i18n("View Only"));
-@@ -215,7 +221,6 @@
-     scaleAction->setText(i18n("Scale Remote Screen to Fit Window Size"));
-     connect(scaleAction, SIGNAL(triggered(bool)), SLOT(scale(bool)));
- 
--    KStandardAction::fullScreen(this, SLOT(switchFullscreen()), 0, actionCollection());
-     KStandardAction::quit(this, SLOT(quit()), actionCollection());
-     KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
-     KStandardAction::configureToolbars(this, SLOT(configureToolbars()), actionCollection());
-@@ -517,7 +522,7 @@
-     RemoteView* view = m_remoteViewList.at(m_currentRemoteView);
- 
-     if (m_fullscreenWindow) {
--        // Leaving fullscreen mode
-+        // Leaving full screen mode
-         view->enableScaling(view->hostPreferences()->windowedScale());
-         show();
-         restoreGeometry(m_mainWindowGeometry);
-@@ -538,14 +543,17 @@
-             m_toolBar = 0;
-         }
- 
-+        actionCollection()->action("switch_fullscreen")->setIcon(KIcon("view-fullscreen"));
-+        actionCollection()->action("switch_fullscreen")->setText(i18n("Switch to Full Screen Mode"));
-+
-         m_fullscreenWindow->deleteLater();
- 
-         m_fullscreenWindow = 0;
-     } else {
--        // Entering fullscreen mode
-+        // Entering full screen mode
-         m_fullscreenWindow = new QWidget(this, Qt::Window);
--        m_fullscreenWindow->setWindowTitle(i18nc("window title when in fullscreen mode (for example displayed in tasklist)",
--                                                 "KDE Remote Desktop Client (Fullscreen)"));
-+        m_fullscreenWindow->setWindowTitle(i18nc("window title when in full screen mode (for example displayed in tasklist)",
-+                                                 "KDE Remote Desktop Client (Full Screen)"));
- 
-         QScrollArea *scrollArea = createScrollArea(m_fullscreenWindow, view);
-         scrollArea->setFrameShape(QFrame::NoFrame);
-@@ -602,7 +610,7 @@
- 
-         saveHostPrefs(view);
-     } else {
--        if (m_fullscreenWindow) { // first close fullscreen view
-+        if (m_fullscreenWindow) { // first close full screen view
-             switchFullscreen();
-         }
- 
-@@ -693,7 +701,7 @@
-     RemoteView *view = qobject_cast<RemoteView*>(scrollArea->widget());
-     if (!view) return;
- 
--    const QString url = view->url().url();
-+    const QString url = view->url().prettyUrl(KUrl::RemoveTrailingSlash);
-     kDebug(5010) << url;
- 
-     KMenu *menu = new KMenu(this);
-@@ -760,6 +768,9 @@
-     kDebug(5010);
- 
-     if (!m_toolBar) {
-+        actionCollection()->action("switch_fullscreen")->setIcon(KIcon("view-restore"));
-+        actionCollection()->action("switch_fullscreen")->setText(i18n("Switch to Window Mode"));
-+
-         m_toolBar = new FloatingToolBar(m_fullscreenWindow, m_fullscreenWindow);
-         m_toolBar->winId(); // force it to be a native widget (prevents problem with QX11EmbedContainer)
-         m_toolBar->setSide(FloatingToolBar::Top);
-@@ -782,11 +793,11 @@
-         m_toolBar->addWidget(sessionComboBox);
- #endif
- 
--        m_toolBar->addAction(actionCollection()->action("fullscreen"));
-+        m_toolBar->addAction(actionCollection()->action("switch_fullscreen"));
- 
-         QAction *minimizeAction = new QAction(m_toolBar);
-         minimizeAction->setIcon(KIcon("go-down"));
--        minimizeAction->setText(i18n("Minimize Fullscreen Window"));
-+        minimizeAction->setText(i18n("Minimize Full Screen Window"));
-         connect(minimizeAction, SIGNAL(triggered()), m_fullscreenWindow, SLOT(showMinimized()));
-         m_toolBar->addAction(minimizeAction);
- 
-@@ -832,7 +843,7 @@
- 
-     RemoteView* view = m_currentRemoteView >= 0 ? m_remoteViewList.at(m_currentRemoteView) : NULL;
-     
--    actionCollection()->action("fullscreen")->setEnabled(enabled);
-+    actionCollection()->action("switch_fullscreen")->setEnabled(enabled);
-     actionCollection()->action("take_screenshot")->setEnabled(enabled);
-     actionCollection()->action("disconnect")->setEnabled(enabled);
- 
-Index: krdc/konsole/krdc_konsole.desktop
-===================================================================
---- krdc/konsole/krdc_konsole.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ krdc/konsole/krdc_konsole.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -10,6 +10,7 @@
- Name[mai]=कंसोल
- Name[nn]=Konsoll
- Name[pa]=ਕਨਸੋਲ
-+Name[pl]=Konsola
- Name[ro]=Konsolă
- Name[sl]=Konzola
- Name[sr]=Конзола
-@@ -36,6 +37,7 @@
- Comment[nds]=SSH- oder Telnet-Törns över KRDC plegen
- Comment[nl]=Staat het beheer van ssh- of telnet-sessies toe via KRDC
- Comment[nn]=Lèt deg handtera SSH- eller Telnet-økter gjennom KRDC
-+Comment[pl]=Pozwala zarządzać sesjami SSH lub Telnet za pomocą KRDC
- Comment[pt]=Permite a gestão de sessões SSH ou Telnet através do KRDC
- Comment[pt_BR]=Permite o gerenciamento de sessões SSH ou Telnet através do KRDC
- Comment[ro]=Permite gestiunea sesiunilor SSH sau Telnet prin KRDC
-Index: krfb/kinetd/kinetd.notifyrc
-===================================================================
---- krfb/kinetd/kinetd.notifyrc	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ krfb/kinetd/kinetd.notifyrc	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -101,7 +101,7 @@
- Comment[nl]=Inkomende verbinding ontvangen
- Comment[nn]=Fekk ei innkommande tilkopling
- Comment[pa]=ਮਿਲੇ ਆ ਰਹੇ ਕੁਨੈਕਸ਼ਨ
--Comment[pl]=Otrzymano połącznie przychodzące
-+Comment[pl]=Otrzymano połączenie przychodzące
- Comment[pt]=Foi recebida uma ligação
- Comment[pt_BR]=Recebendo conexão de entrada
- Comment[ro]=Conexiune de intrare recepționată
-Index: kopete/plugins/pipes/kopete_pipes.desktop
-===================================================================
---- kopete/plugins/pipes/kopete_pipes.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/plugins/pipes/kopete_pipes.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -26,6 +26,7 @@
- Name[ga]=Píopaí
- Name[hne]=पाइप
- Name[hu]=Csövek
-+Name[is]=Pípur
- Name[it]=Canali
- Name[ja]=パイプ
- Name[km]=បំពង់
-@@ -64,6 +65,7 @@
- Comment[ga]=Píopáil teachtaireachtaí trí ríomhchlár nó script sheachtrach
- Comment[gl]=Canaliza as mensaxes mediante un programa ou script externo
- Comment[hu]=Az üzenetek átengedése külső programon vagy szűrőn
-+Comment[is]=Dælir skilaboðum í gegnum ytra forrit eða skriftu
- Comment[it]=Incanala i messaggi in un programma o in uno script
- Comment[ja]=メッセージを外部プログラムやスクリプトにパイプします
- Comment[km]=សារបំពង់តាមកម្មវិធី ឬស្គ្រីបខាងក្រៅ
-Index: kopete/plugins/pipes/kopete_pipes_config.desktop
+--- krdc/mainwindow.cpp	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ krdc/mainwindow.cpp	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -635,6 +635,9 @@
+         Settings::setShowStartPage(false);
+         m_tabWidget->removeTab(0);
+         m_showStartPage = false;
++        // HACK : call tabChanged since when the start page is closed and it's called, m_showStartPage is still true
++        // which lead to a crash if the user click on any button like "grab all keys"
++        tabChanged(m_tabWidget->currentIndex());
+ 	updateActionStatus();
+         return;
+     }
+Index: kopete/plugins/webpresence/kopete_webpresence.desktop
 ===================================================================
---- kopete/plugins/pipes/kopete_pipes_config.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/plugins/pipes/kopete_pipes_config.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -21,6 +21,7 @@
- Name[ga]=Píopaí
- Name[hne]=पाइप
- Name[hu]=Csövek
-+Name[is]=Pípur
- Name[it]=Canali
- Name[ja]=パイプ
- Name[km]=បំពង់
-@@ -59,6 +60,7 @@
- Comment[ga]=Píopáil teachtaireachtaí trí ríomhchlár nó script sheachtrach
- Comment[gl]=Canaliza as mensaxes mediante un programa ou script externo
- Comment[hu]=Az üzenetek átengedése külső programon vagy szűrőn
-+Comment[is]=Dælir skilaboðum í gegnum ytra forrit eða skriftu
- Comment[it]=Incanala i messaggi in un programma o in uno script
- Comment[ja]=メッセージを外部プログラムやスクリプトにパイプします
- Comment[km]=សារបំពង់តាមកម្មវិធី ឬស្គ្រីបខាងក្រៅ
-Index: kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop
-===================================================================
---- kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -22,13 +22,16 @@
- Name[et]=Piltide eelvaatlus vestluses
- Name[fr]=Aperçu des photos dans les discussions
- Name[gl]=Previsualizar as imaxes nos chats
-+Name[is]=Forskoðar myndir í spjalli
- Name[it]=Anteprima di immagini in chat
- Name[km]=មើលរូបភាពជាមុននៅក្នុងគំនូសតាង
- Name[lv]=Attēlu priekšskatījumi tērzēšanā
- Name[nb]=Forhåndsvis bilder i pratevinduer
- Name[nds]=Vöransichten vun Biller bi't Klönen
- Name[nl]=Voorbeeld van afbeeldingen in gesprekken
-+Name[nn]=Førehandsvising av bilete i prat
- Name[pa]=ਗੱਲਾਂ 'ਚ ਤਸਵੀਰਾਂ ਦੀ ਝਲਕ
-+Name[pl]=Podgląd obrazków w rozmowie
- Name[pt]=Antevisão das Imagens nas Conversas
- Name[pt_BR]=Pré-visualização de imagens em bate-papos
- Name[ro]=Previzualizarea imaginilor în discuții
-@@ -60,6 +63,7 @@
- Comment[hi]=गपशप में छवियों के पूर्वावलोकन दिखाता है
- Comment[hne]=गपसप मं फोटू मन के प्रिव्यू देखाथे 
- Comment[hu]=Megjeleníti a csevegésekben előforduló képek előnézetét
-+Comment[is]=Sýnir forskoðun mynda í spjalli
- Comment[it]=Mostra un'anteprima di immagini in chat
- Comment[ja]=チャットに画像のプレビューを表示します
- Comment[km]=បង្ហាញការមើលរូបភាពជាមុនក្នុងជជែកកំសាន្ត
-Index: kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop
-===================================================================
---- kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -25,6 +25,7 @@
- Name[hi]=यूआरएलपिकप्रीव्यू प्लगइन कॉन्फ़िगरेशन
- Name[hne]=यूआरएलपिकप्रीव्यू प्लगइन कान्फिगरेसन
- Name[hu]=Az URLPicPreview modul beállításai
-+Name[is]=Stillingar URLPicPreview íforrits
- Name[it]=Configurazione dell'estensione URLPicPreview
- Name[ja]=URLPicPreview プラグインの設定
- Name[km]=ការកំណត់រចនាសម្ព័ន្ធកម្មវិធីជំនួយ URLPicPreview
-@@ -69,6 +70,7 @@
- Comment[hi]=यूआरएलपिकप्रीव्यू प्लगइन
- Comment[hne]=यूआरएलपिकप्रीव्यू प्लगइन
- Comment[hu]=URLPicPreview modul
-+Comment[is]=URLPicPreview íforrit
- Comment[it]=Estensione URLPicPreview
- Comment[ja]=URLPicPreview プラグイン
- Comment[km]=កម្មវិធីជំនួយ URLPicPreview
-Index: kopete/plugins/otr/kopete_otr.desktop
-===================================================================
---- kopete/plugins/otr/kopete_otr.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/plugins/otr/kopete_otr.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -27,6 +27,7 @@
- Comment[ga]=Criptigh seisiúin chomhráite le criptiú Off-The-Record
- Comment[gl]=Cifra as sesións de conversa mediante cifraxe non rexistrada
- Comment[hu]=A csevegések titkosítása Off-The-Record kódolással
-+Comment[is]=Dulkóða spjallsetur með Off-The-Record dulkóðun
- Comment[it]=Cifra le sessioni di chat con la cifratura Off-The-Record
- Comment[ja]=OTR (Off-the-Record) プロトコルでチャットセッションを暗号化します
- Comment[km]=អ៊ិនគ្រីបសម័យជជែកកំសាន្តជាមួយនឹងការបិទការអ៊ិនគ្រីបថត
-Index: kopete/plugins/otr/kopete_otr_config.desktop
-===================================================================
---- kopete/plugins/otr/kopete_otr_config.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/plugins/otr/kopete_otr_config.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -22,6 +22,7 @@
- Comment[ga]=Criptigh seisiúin chomhráite le criptiú Off-The-Record
- Comment[gl]=Cifra as sesións de conversa mediante cifraxe non rexistrada
- Comment[hu]=A csevegések titkosítása Off-The-Record kódolással
-+Comment[is]=Dulkóða spjallsetur með Off-The-Record dulkóðun
- Comment[it]=Cifra le sessioni di chat con la cifratura Off-The-Record
- Comment[ja]=OTR (Off-the-Record) プロトコルでチャットセッションを暗号化します
- Comment[km]=អ៊ិនគ្រីបសម័យជជែកកំសាន្តជាមួយនឹងការបិទការអ៊ិនគ្រីបថត
-Index: kopete/plugins/privacy/kopete_privacy_config.desktop
-===================================================================
---- kopete/plugins/privacy/kopete_privacy_config.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/plugins/privacy/kopete_privacy_config.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -27,6 +27,7 @@
- Name[hi]=गोपनीयता
- Name[hne]=गोपनीयता
- Name[hu]=Adatvédelem
-+Name[is]=Privacy persónuvernd
- Name[it]=Riservatezza
- Name[ja]=プライバシー
- Name[km]=ភាពឯកជន
-@@ -75,6 +76,7 @@
- Comment[hi]=प्राइवेसी प्लगइन
- Comment[hne]=प्राइवेसी प्लगइन
- Comment[hu]=Adatvédelem modul
-+Comment[is]=Privacy persónuverndaríforritið
- Comment[it]=Estensione riservatezza
- Comment[ja]=プライバシープラグイン
- Comment[km]=កម្មវិធីជំនួយភាពឯកជន
-Index: kopete/plugins/privacy/kopete_privacy.desktop
-===================================================================
---- kopete/plugins/privacy/kopete_privacy.desktop	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/plugins/privacy/kopete_privacy.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -33,6 +33,7 @@
- Name[hi]=गोपनीयता
- Name[hne]=गोपनीयता
- Name[hu]=Adatvédelem
-+Name[is]=Privacy persónuvernd
- Name[it]=Riservatezza
- Name[ja]=プライバシー
- Name[km]=ភាពឯកជន
-@@ -81,6 +82,7 @@
- Comment[hi]=आवक संदेशों को फिल्टर करता है
- Comment[hne]=आवक संदेस मन ल छनइया करथे 
- Comment[hu]=Szűrés a bejövő üzenetekre
-+Comment[is]=Sía innkomandi skeyti
- Comment[it]=Filtra i messaggi in arrivo
- Comment[ja]=受信メッセージをフィルタします
- Comment[kk]=Хабарларды бояулау
-Index: kopete/protocols/skype/libskype/skype.h
-===================================================================
---- kopete/protocols/skype/libskype/skype.h	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/protocols/skype/libskype/skype.h	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -214,6 +214,9 @@
- 		void setDisplayName(const QString &user, const QString &name);
- 		/**
- 		 * Open skype file transfer dilog to send file via skype
-+		 * @param user Skype user
-+		 * @url url of local file
-+		 * @return true if transfer opened
- 		 */
- 		bool openFileTransfer(const QString &user, const QString &url = QString::null);
- 	public slots:
-Index: kopete/protocols/skype/libskype/skypedbus/skypeconnection.h
-===================================================================
---- kopete/protocols/skype/libskype/skypedbus/skypeconnection.h	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/protocols/skype/libskype/skypedbus/skypeconnection.h	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -20,10 +20,6 @@
- #ifndef SKYPECONNECTION_H
- #define SKYPECONNECTION_H
- 
--#ifndef SKYPE_DEBUG_GLOBAL
--	#define SKYPE_DEBUG_GLOBAL 14311
--#endif
--
- #include <qobject.h>
+--- kopete/plugins/webpresence/kopete_webpresence.desktop	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ kopete/plugins/webpresence/kopete_webpresence.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -60,8 +60,8 @@
+ Comment[ru]=Отображает состояние вашего списка контактов (или его части) на странице в Сети
+ Comment[sk]=Zobrazenie stavu (časti) zo zoznamu kontaktov na webovej stránke
+ Comment[sl]=Pokaže stanje (dela) vašega seznama stikov na spletni strani
+-Comment[sr]=Приказивање стања (делова) вашег списка контаката на веб страници
+-Comment[sr at latin]=Prikazivanje stanja (delova) vašeg spiska kontakata na veb stranici
++Comment[sr]=Приказивање стања (делова) ваше листе контаката на веб страници
++Comment[sr at latin]=Prikazivanje stanja (delova) vaše liste kontakata na veb stranici
+ Comment[sv]=Visa status för (delar av) din kontaktlista på en webbsida
+ Comment[ta]=இணைய பக்கத்தில் உங்கள் தொடர்பாளரின் நிலைப்பட்டியலை காட்டு
+ Comment[tg]=Ҳолати (қисме аз) рӯйхати пайвастшавии шуморо дар саҳифаи шабака нишон медиҳад
+Index: kopete/plugins/webpresence/kopete_webpresence_config.desktop
+===================================================================
+--- kopete/plugins/webpresence/kopete_webpresence_config.desktop	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ kopete/plugins/webpresence/kopete_webpresence_config.desktop	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -54,8 +54,8 @@
+ Comment[ru]=Отображает состояние вашего списка контактов (или его части) на странице в Сети
+ Comment[sk]=Zobrazenie stavu (časti) zo zoznamu kontaktov na webovej stránke
+ Comment[sl]=Pokaže stanje (dela) vašega seznama stikov na spletni strani
+-Comment[sr]=Приказивање стања (делова) вашег списка контаката на веб страници
+-Comment[sr at latin]=Prikazivanje stanja (delova) vašeg spiska kontakata na veb stranici
++Comment[sr]=Приказивање стања (делова) ваше листе контаката на веб страници
++Comment[sr at latin]=Prikazivanje stanja (delova) vaše liste kontakata na veb stranici
+ Comment[sv]=Visa status för (delar av) din kontaktlista på en webbsida
+ Comment[ta]=இணைய பக்கத்தில் உங்கள் தொடர்பாளரின் நிலைப்பட்டியலை காட்டு
+ Comment[tg]=Ҳолати (қисме аз) рӯйхати пайвастшавии шуморо дар саҳифаи шабака нишон медиҳад
+Index: kopete/protocols/wlm/wlmtransfermanager.cpp
+===================================================================
+--- kopete/protocols/wlm/wlmtransfermanager.cpp	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ kopete/protocols/wlm/wlmtransfermanager.cpp	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -18,6 +18,7 @@
+ #include "wlmcontact.h"
+ #include "kopetecontact.h"
+ #include "kopeteuiglobal.h"
++#include "kopetetransfermanager.h"
+ 
+ #include <QObject>
+ #include <kmessagebox.h>
+Index: kopete/protocols/wlm/wlmchatsession.cpp
+===================================================================
+--- kopete/protocols/wlm/wlmchatsession.cpp	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ kopete/protocols/wlm/wlmchatsession.cpp	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -55,6 +55,7 @@
+ #include "kopeteview.h"
+ #include "kopeteutils.h"
+ #include "private/kopeteemoticons.h"
++#include "kopetetransfermanager.h"
+ 
+ #include "wlmcontact.h"
+ #include "wlmprotocol.h"
+Index: kopete/protocols/wlm/wlmtransfermanager.h
+===================================================================
+--- kopete/protocols/wlm/wlmtransfermanager.h	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ kopete/protocols/wlm/wlmtransfermanager.h	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -18,11 +18,16 @@
+ #define WLMTRANSFERMANAGER_H
+ 
+ #include <QObject>
+-#include "kopetetransfermanager.h"
+ 
+ #include "wlmaccount.h"
+ #include <msn/msn.h>
+ 
++namespace Kopete
++{
++	class Transfer;
++	class FileTransferInfo;
++}
++
+ class WlmTransferManager:public QObject
+ {
+   Q_OBJECT 
+Index: kopete/protocols/wlm/wlmaccount.h
+===================================================================
+--- kopete/protocols/wlm/wlmaccount.h	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ kopete/protocols/wlm/wlmaccount.h	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -24,7 +24,6 @@
+ #include "wlmchatsession.h"
+ #include "wlmtransfermanager.h"
+ #include "wlmchatmanager.h"
+-#include "kopetetransfermanager.h"
+ 
+ class KActionMenu;
+ namespace Kopete
+Index: kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
+===================================================================
+--- kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -135,6 +135,7 @@
+ 		
+ 		// reset connector
+ 		if(d->bs) {
++			disconnect(d->bs, 0, this, 0);
+ 			d->bs->close();
+ 			d->bs = 0;
+ 		}
+@@ -296,6 +297,9 @@
  
- typedef enum {
-Index: kopete/protocols/skype/libskype/skypedbus/skypeconnection.cpp
+ void ClientStream::cp_outgoingData( const QByteArray& outgoingBytes )
+ {
++	if ( !d->bs )
++		return;
++	
+ 	// take formatted bytes from CoreProtocol and put them on the wire
+ 	kDebug(YAHOO_RAW_DEBUG) << "[data size: " << outgoingBytes.size() << "]";
+ 	//cs_dump( outgoingBytes );
+Index: kopete/protocols/jabber/jabberprotocol.cpp
+===================================================================
+--- kopete/protocols/jabber/jabberprotocol.cpp	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ kopete/protocols/jabber/jabberprotocol.cpp	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -65,7 +65,7 @@
+ 	JabberKOSChatty(Kopete::OnlineStatus::Online,        100, this, JabberFreeForChat, QStringList("jabber_chatty"), i18n ("Free for Chat"), i18n ("Free for Chat"), Kopete::OnlineStatusManager::FreeForChat, Kopete::OnlineStatusManager::HasStatusMessage ),
+ 	JabberKOSOnline(Kopete::OnlineStatus::Online,         90, this, JabberOnline, QStringList(), i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasStatusMessage ),
+ 	JabberKOSAway(Kopete::OnlineStatus::Away,             80, this, JabberAway, QStringList("contact_away_overlay"), i18n ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasStatusMessage),
+-	JabberKOSXA(Kopete::OnlineStatus::Away,               70, this, JabberXA, QStringList("contact_xa_overlay"), i18n ("Extended Away"), i18n ("Extended Away"), 0, Kopete::OnlineStatusManager::HasStatusMessage),
++	JabberKOSXA(Kopete::OnlineStatus::Away,               70, this, JabberXA, QStringList("contact_xa_overlay"), i18n ("Extended Away"), i18n ("Extended Away"), Kopete::OnlineStatusManager::ExtendedAway, Kopete::OnlineStatusManager::HasStatusMessage),
+ 	JabberKOSDND(Kopete::OnlineStatus::Away,              60, this, JabberDND, QStringList("contact_busy_overlay"), i18n ("Do not Disturb"), i18n ("Do not Disturb"), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasStatusMessage),
+ 	JabberKOSOffline(Kopete::OnlineStatus::Offline,       50, this, JabberOffline, QStringList(), i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasStatusMessage ),
+ 	JabberKOSInvisible(Kopete::OnlineStatus::Invisible,   40, this, JabberInvisible, QStringList("contact_invisible_overlay"),   i18n ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible),
+@@ -250,6 +250,7 @@
+ 		}
+ 		else
+ 		{
++			status = JabberKOSOnline; // Assume that contact is online bug 210558
+ 			kDebug (JABBER_DEBUG_GLOBAL) << "Unknown status <show>" << resource.status ().show () << "</show> for contact. One of your contact is probably using a broken client, ask him to report a bug";
+ 		}
+ 	}
+Index: kopete/protocols/oscar/liboscar/client.cpp
 ===================================================================
---- kopete/protocols/skype/libskype/skypedbus/skypeconnection.cpp	(.../tags/KDE/4.3.0/kdenetwork)	(wersja 1013414)
-+++ kopete/protocols/skype/libskype/skypedbus/skypeconnection.cpp	(.../branches/KDE/4.3/kdenetwork)	(wersja 1013414)
-@@ -72,7 +72,8 @@
- 	disconnectSkype();//disconnect before you leave
- 	if ( d->skypeProcess.state() != QProcess::NotRunning )//if we started skype process kill it
- 		d->skypeProcess.kill();
--	QProcess::execute("bash -c \"pkill -6 -U $USER -x skype.*\"");//try find skype process (skype, skype.real, ...) and kill it if we dont start skype or use skype.real wrapper
-+	QProcess::execute("bash -c \"pkill -6 -U $USER -x ^skype.*$\"");//try find skype process (skype, skype.real, ...) and kill it if we dont start skype or use skype.real wrapper
-+	QProcess::execute("bash -c \"pkill -6 -U $USER -x skype\"");
- 	delete d;//Remove the D pointer
- }
- 
-@@ -154,8 +155,13 @@
- 
- 	new SkypeAdaptor(this);
- 	QDBusConnection busConn = BUS;
--	busConn.registerObject("/com/Skype/Client", this); //Register skype client to dbus for receiving messages to slot Notify
-+	bool registred = busConn.registerObject("/com/Skype/Client", this); //Register skype client to dbus for receiving messages to slot Notify
+--- kopete/protocols/oscar/liboscar/client.cpp	(.../tags/KDE/4.3.3/kdenetwork)	(wersja 1053997)
++++ kopete/protocols/oscar/liboscar/client.cpp	(.../branches/KDE/4.3/kdenetwork)	(wersja 1053997)
+@@ -353,7 +353,8 @@
+ 		}
+ 
+ 		ProfileTask* pt = new ProfileTask( c->rootTask() );
+-		pt->setAwayMessage( msg );
<<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.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdenetwork/kde4-kdenetwork.spec?r1=1.82&r2=1.83&f=u

