SOURCES: kdenetwork-branch.diff - updated
arekm
arekm at pld-linux.org
Thu Sep 7 17:29:00 CEST 2006
Author: arekm Date: Thu Sep 7 15:29:00 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdenetwork-branch.diff (1.11 -> 1.12)
---- Diffs:
================================================================
Index: SOURCES/kdenetwork-branch.diff
diff -u SOURCES/kdenetwork-branch.diff:1.11 SOURCES/kdenetwork-branch.diff:1.12
--- SOURCES/kdenetwork-branch.diff:1.11 Tue Aug 8 08:12:16 2006
+++ SOURCES/kdenetwork-branch.diff Thu Sep 7 17:28:52 2006
@@ -1,7 +1,91 @@
+Index: kpf/kpfpropertiesdialogplugin.desktop
+===================================================================
+--- kpf/kpfpropertiesdialogplugin.desktop (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ kpf/kpfpropertiesdialogplugin.desktop (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -16,6 +16,7 @@
+ Name[fi]=KPF-hakemiston ominaisuussivu
+ Name[fr]=Page des propriĂŠtĂŠs d'un dossier KPF
+ Name[gl]=PĂĄxina coas propiedades do directorio KPF
++Name[he]=דף מ××¤×™×™× ×™ ץפריה ׊ל KPF
+ Name[hu]=KPF kÜnyvtårjellemzők-adatlap
+ Name[is]=KPF mĂśppustillingasĂĂ°a
+ Name[it]=Pagina proprietĂ directory KPF
+Index: kpf/kpfapplet.desktop
+===================================================================
+--- kpf/kpfapplet.desktop (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ kpf/kpfapplet.desktop (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -78,6 +78,7 @@
+ Comment[eu]=Sarean zehar fitxtegiak partekatzea errazten duen web-zerbitzari txiki bat
+ Comment[fr]=Un petit serveur web permettant de partager facilement des fichiers sur le rĂŠseau
+ Comment[gl]=Un pequeno servidor web que fai doada a comparticiĂłn de ficheiros por rede
++Comment[he]=׊רת ××™× ×˜×¨× ×˜ קטן ×Š×’×•×¨× ×œ×Ş×˘×‘×•×¨×Ş ×§×‘×Ś×™× ×‘×¨×Š×Ş ×œ×”×™×•×Ş קלה
+ Comment[hu]=Mini webkiszolgĂĄlĂł egyszerĹą fĂĄjlmegosztĂĄshoz
+ Comment[is]=LĂtill vefĂžjĂłnn sem auĂ°veldar deilingu af skrĂĄm yfir netiĂ°
+ Comment[it]=Un piccolo server web che permette di condividere dei file attraverso la rete in modo semplice
+@@ -92,7 +93,7 @@
+ Comment[pt]=Um pequeno servidor Web que torna simples a partilha de ficheiros na rede
+ Comment[pt_BR]=Um pequeno servidor web que facilita o compartilhamento de arquivos na rede
+ Comment[ru]=ĐĐľĐąĐžĐťŃŒŃˆĐžĐš вой-Ńорвор, ОйНогчающиК ОйщиК Đ´ĐžŃŃ‚ŃƒĐż Đş фаКНаП пО Ńоти
+-Comment[sk]=Malý web server, ktorý robà zdielanie súborov v sieti jednoduchým
++Comment[sk]=Malý web server, ktorý robà zdieĞanie súborov v sieti jednoduchým
+ Comment[sl]=Majhen spletni streĹžnik, ki poenostavi deljenje datotek prek omreĹžja
+ Comment[sr]=ĐœĐ°ĐťĐ¸ вой Ńорвор ĐşĐžŃ˜Đ¸ дољоњо Ń„Đ°Ń˜ĐťĐžĐ˛Đ° прокО ПроМо чини НакиП
+ Comment[sr at Latn]=Mali veb server koji deljenje fajlova preko mreĹže Äini lakim
+Index: krdc/krdc.desktop
+===================================================================
+--- krdc/krdc.desktop (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ krdc/krdc.desktop (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -23,6 +23,7 @@
+ GenericName[fr]=Connexion Ă un bureau distant
+ GenericName[ga]=Nasc Deisce Cianda
+ GenericName[gl]=ConexiĂłn Remota de Escritorio
++GenericName[he]=חיבור ל׊ולחן עבודה מרוחק
+ GenericName[hu]=TĂĄvoli munkaasztal elĂŠrĂŠse
+ GenericName[is]=Tengingar viĂ° fjarlĂŚg skjĂĄborĂ°
+ GenericName[it]=Connessione a desktop remoto
+Index: krdc/vidmode.cpp
+===================================================================
+--- krdc/vidmode.cpp (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ krdc/vidmode.cpp (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -38,7 +38,9 @@
+ if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
+ return;
+
+- XF86VidModeGetAllModeLines(dpy,oldResolution.screen,&modecount, &modes);
++ if (!XF86VidModeGetAllModeLines(dpy, oldResolution.screen, &modecount, &modes))
++ return;
++
+ for (int i = 0; i < modecount; i++) {
+ int w = (*modes[i]).hdisplay;
+ int h = (*modes[i]).vdisplay;
+@@ -69,7 +71,9 @@
+ if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
+ return Resolution();
+
+- XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes);
++ if (!XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes))
++ return Resolution();
++
+ int cw = (*modes[0]).hdisplay;
+ int ch = (*modes[0]).vdisplay;
+ nx = cw;
+Index: krdc/krdc.cpp
+===================================================================
+--- krdc/krdc.cpp (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ krdc/krdc.cpp (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -732,7 +732,7 @@
+
+ switch (m_isFullscreen) {
+ case WINDOW_MODE_AUTO:
+- if ((w >= dw) || (h >= dh))
++ if ((w > dw) || (h > dh))
+ switchToFullscreen(m_windowScaling);
+ else
+ switchToNormal(m_windowScaling);
Index: krfb/krfb/xupdatescanner.cc
===================================================================
---- krfb/krfb/xupdatescanner.cc (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ krfb/krfb/xupdatescanner.cc (.../branches/KDE/3.5/kdenetwork) (revision 570934)
+--- krfb/krfb/xupdatescanner.cc (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ krfb/krfb/xupdatescanner.cc (.../branches/KDE/3.5/kdenetwork) (revision 581799)
@@ -140,7 +140,7 @@
tilesX = (width + tileWidth - 1) / tileWidth;
tilesY = (height + tileHeight - 1) / tileHeight;
@@ -24,8 +108,8 @@
Index: krfb/krfb/eventsrc
===================================================================
---- krfb/krfb/eventsrc (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ krfb/krfb/eventsrc (.../branches/KDE/3.5/kdenetwork) (revision 570934)
+--- krfb/krfb/eventsrc (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ krfb/krfb/eventsrc (.../branches/KDE/3.5/kdenetwork) (revision 581799)
@@ -626,7 +626,7 @@
Comment[hu]=A meghĂvott fĂŠl ĂŠrvĂŠnytelen jelszĂłt kĂźldĂśtt. A csatlakozĂĄs nem sikerĂźlt.
Comment[is]=BoĂ°inn aĂ°ili sendi Ăłgilt lykilorĂ°. Tengingu hafnaĂ°
@@ -82,8 +166,8 @@
Comment[mk]=ЗафатонО, ĐżĐžĐ˛Ń€ĐˇŃƒĐ˛Đ°ŃšĐľŃ‚Đž Đľ ОдйионО
Index: krfb/libvncserver/sraRegion.h
===================================================================
---- krfb/libvncserver/sraRegion.h (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ krfb/libvncserver/sraRegion.h (.../branches/KDE/3.5/kdenetwork) (revision 570934)
+--- krfb/libvncserver/sraRegion.h (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ krfb/libvncserver/sraRegion.h (.../branches/KDE/3.5/kdenetwork) (revision 581799)
@@ -1,4 +1,3 @@
-
#ifndef SRAREGION_H
@@ -108,8 +192,8 @@
#endif
Index: krfb/libvncserver/sraRegion.c
===================================================================
---- krfb/libvncserver/sraRegion.c (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ krfb/libvncserver/sraRegion.c (.../branches/KDE/3.5/kdenetwork) (revision 570934)
+--- krfb/libvncserver/sraRegion.c (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ krfb/libvncserver/sraRegion.c (.../branches/KDE/3.5/kdenetwork) (revision 581799)
@@ -33,7 +33,7 @@
sraSpanList *sraSpanListDup(const sraSpanList *src);
void sraSpanListDestroy(sraSpanList *list);
@@ -482,8 +566,8 @@
#endif
Index: krfb/kcm_krfb/kcmkrfb.desktop
===================================================================
---- krfb/kcm_krfb/kcmkrfb.desktop (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ krfb/kcm_krfb/kcmkrfb.desktop (.../branches/KDE/3.5/kdenetwork) (revision 570934)
+--- krfb/kcm_krfb/kcmkrfb.desktop (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ krfb/kcm_krfb/kcmkrfb.desktop (.../branches/KDE/3.5/kdenetwork) (revision 581799)
@@ -149,7 +149,7 @@
Keywords[hu]=munkaasztal-megosztĂĄs,krfb,vnc,megosztĂĄs,krdc,csatlakozĂĄs tĂĄvoli munkaasztalhoz,meghĂvĂĄs,port,slp,meghĂvĂĄs nĂŠlkĂźl
Keywords[is]=skjĂĄborĂ°smiĂ°lun,miĂ°lun,krfb,vnc,rdp,krdc,fjarvinnsla,remote desktop connection,rdp
@@ -495,8 +579,8 @@
Keywords[mk]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,доНоњо на ĐżĐžĐ˛Ń€ŃˆĐ¸Đ˝Đ°Ń‚Đ°,krfb,vnc,доНоњо,krdc,ĐżĐžĐ˛Ń€ĐˇŃƒĐ˛Đ°ŃšĐľ ŃĐž ОддаНочона ĐżĐžĐ˛Ń€ŃˆĐ¸Đ˝Đ°,пОкана,пОрта,slp,нопОканот
Index: krfb/kinetd/kinetd.cpp
===================================================================
---- krfb/kinetd/kinetd.cpp (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ krfb/kinetd/kinetd.cpp (.../branches/KDE/3.5/kdenetwork) (revision 570934)
+--- krfb/kinetd/kinetd.cpp (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ krfb/kinetd/kinetd.cpp (.../branches/KDE/3.5/kdenetwork) (revision 581799)
@@ -45,6 +45,8 @@
m_srvreg(srvreg),
m_dnssdreg(0)
@@ -506,464 +590,143467 @@
m_uuid = createUUID();
loadConfig(s);
-Index: kopete/plugins/history/kopete_history.desktop
+Index: lanbrowsing/kio_lan/lisa.desktop
===================================================================
---- kopete/plugins/history/kopete_history.desktop (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ kopete/plugins/history/kopete_history.desktop (.../branches/KDE/3.5/kdenetwork) (revision 570934)
-@@ -54,7 +54,7 @@
- Name[nl]=Geschiedenis
- Name[nn]=Historie
- Name[pl]=Historia
--Name[pt]=Historial
-+Name[pt]=HistĂłrico
- Name[pt_BR]=HistĂłria
- Name[ro]=Istoric
- Name[ru]=Đ–ŃƒŃ€Đ˝Đ°Đť раСгОвОрОв
-Index: kopete/plugins/history/kopete_history_config.desktop
+--- lanbrowsing/kio_lan/lisa.desktop (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ lanbrowsing/kio_lan/lisa.desktop (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -21,6 +21,7 @@
+ Name[fr]=Navigateur rĂŠseau
+ Name[ga]=BrabhsĂĄlaĂ an GhrĂŠasĂĄin LogĂĄnta
+ Name[gl]=Explorador LAN
++Name[he]=LAN דפדפן
+ Name[hr]=Preglednik LAN-a
+ Name[hu]=HålózatbÜngÊsző
+ Name[is]=Netflakkari
+Index: kdnssd/ioslave/zeroconf.protocol
===================================================================
---- kopete/plugins/history/kopete_history_config.desktop (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ kopete/plugins/history/kopete_history_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 570934)
-@@ -50,7 +50,7 @@
- Name[nl]=Geschiedenis
- Name[nn]=Historie
- Name[pl]=Historia
--Name[pt]=Historial
-+Name[pt]=HistĂłrico
- Name[pt_BR]=HistĂłria
- Name[ro]=Istoric
- Name[ru]=Đ–ŃƒŃ€Đ˝Đ°Đť раСгОвОрОв
-Index: kopete/protocols/oscar/liboscar/ssimodifytask.cpp
+--- kdnssd/ioslave/zeroconf.protocol (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ kdnssd/ioslave/zeroconf.protocol (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -27,6 +27,7 @@
+ Description[fi]=SiirräntätyÜskentelijä ZeroConfille
+ Description[fr]=Un module d'entrÊe / sortie pour ZeroConf
+ Description[gl]=Un kioslabe para ZeroConf
++Description[he]=kioslave ב׊ביל ZeroConf
+ Description[hu]=KDE-protokoll a Zeroconf hasznĂĄlatĂĄhoz
+ Description[is]=kioslave fyrir ZeroConf
+ Description[it]=Un kioslave per Zeroconf
+Index: kopete/plugins/nowlistening/nowlisteningconfig.kcfg
===================================================================
---- kopete/protocols/oscar/liboscar/ssimodifytask.cpp (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ kopete/protocols/oscar/liboscar/ssimodifytask.cpp (.../branches/KDE/3.5/kdenetwork) (revision 570934)
-@@ -216,6 +216,10 @@
+--- kopete/plugins/nowlistening/nowlisteningconfig.kcfg (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ kopete/plugins/nowlistening/nowlisteningconfig.kcfg (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -33,9 +33,14 @@
+ </entry>
+
+ <entry name="StatusAdvertising" type="Bool">
+- <label>Show the current music listened in your status message.</label>
++ <label>Show the current music listened in place of your status message.</label>
+ <default>false</default>
+ </entry>
++
++ <entry name="AppendStatusAdvertising" type="Bool">
++ <label>Show the current music listened appended to your status message.</label>
++ <default>false</default>
++ </entry>
+
+ <entry name="UseSpecifiedMediaPlayer" type="Bool">
+ <label>Use the specified media player.</label>
+Index: kopete/plugins/nowlistening/nowlisteningplugin.cpp
+===================================================================
+--- kopete/plugins/nowlistening/nowlisteningplugin.cpp (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ kopete/plugins/nowlistening/nowlisteningplugin.cpp (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -4,9 +4,9 @@
+ Kopete Now Listening To plugin
+
+ Copyright (c) 2002,2003,2004 by Will Stephenson <will at stevello.free-online.co.uk>
+- Copyright (c) 2005 by MichaĂŤl Larouche <michael.larouche at kdemail.net>
++ Copyright (c) 2005-2006 by MichaĂŤl Larouche <michael.larouche at kdemail.net>
+
+- Kopete (c) 2002-2005 by the Kopete developers <kopete-devel at kde.org>
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
+
+ *************************************************************************
+ * *
+@@ -20,6 +20,7 @@
+
+ #include <qtimer.h>
+ #include <qstringlist.h>
++#include <qregexp.h>
+
+ #include <kdebug.h>
+ #include <kgenericfactory.h>
+@@ -245,7 +246,7 @@
+ void NowListeningPlugin::slotAdvertCurrentMusic()
+ {
+ // Do anything when statusAdvertising is off.
+- if( !NowListeningConfig::self()->statusAdvertising() )
++ if( !NowListeningConfig::self()->statusAdvertising() && !NowListeningConfig::self()->appendStatusAdvertising() )
+ return;
+
+ // This slot is called every 5 seconds, so we check if we have a new track playing.
+@@ -260,8 +261,10 @@
+ NOTE:
+ MSN status message(personal message) use a special tag to advert the current music playing.
+ So, we don't send the all formatted string, send a special string seperated by ";".
++
++ Also, do not use MSN hack in appending mode.
+ */
+- if( a->protocol()->pluginId() == "MSNProtocol" )
++ if( a->protocol()->pluginId() == "MSNProtocol" && !NowListeningConfig::self()->appendStatusAdvertising() )
+ {
+ QString track, artist, album, mediaList;
+ bool isPlaying=false;
+@@ -294,12 +297,45 @@
+
+ // KDE4 TODO: Use the new status message framework, and remove this "hack".
+ if( isPlaying )
++ {
+ advert = QString("[Music]%1").arg(mediaList);
++ }
++
+ }
+ else
+ {
+- advert = mediaPlayerAdvert(false); // newTrackPlaying has done the update.
++ if( NowListeningConfig::self()->appendStatusAdvertising() )
++ {
++ // Check for the now listening message in parenthesis,
++ // include the header to not override other messages in parenthesis.
++ QRegExp statusSong( QString("\\(%1.*\\)$").arg( NowListeningConfig::header()) );
++
++ // HACK: Don't keep appending the now listened song. Replace it in the status message.
++ advert = a->myself()->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString();
++ // Remove the braces when they are no listened song.
++ QString mediaAdvert = mediaPlayerAdvert(false);
++ if(!mediaAdvert.isEmpty())
++ {
++ if(statusSong.search(advert) != -1)
++ {
++ advert = advert.replace(statusSong, QString("(%1)").arg(mediaPlayerAdvert(false)) );
++ }
++ else
++ {
++ advert += QString("(%1)").arg( mediaPlayerAdvert(false) );
++ }
++ }
++ else
++ {
++ advert = advert.replace(statusSong, "");
++ }
++ }
++ else
++ {
++ advert = mediaPlayerAdvert(false); // newTrackPlaying has done the update.
++ }
+ }
++
+ a->setOnlineStatus(a->myself()->onlineStatus(), advert);
+ }
+ }
+@@ -502,7 +538,7 @@
+ this,
+ SLOT(slotOutgoingMessage(Kopete::Message&)));
+ }
+- else if( NowListeningConfig::self()->statusAdvertising() )
++ else if( NowListeningConfig::self()->statusAdvertising() || NowListeningConfig::self()->appendStatusAdvertising() )
{
- WORD ackCode = b->getWord();
- kdDebug(OSCAR_RAW_DEBUG) << "Acknowledgement code is " << ackCode << endl;
-+
-+ if ( ackCode != 0x0000 )
-+ freeIdOnError();
-+
- switch( ackCode )
- {
- case 0x0000:
-@@ -448,6 +452,31 @@
- setSuccess( 0, QString::null );
- }
+ kdDebug(14307) << k_funcinfo << "Now using status message advertising." << endl;
-+void SSIModifyTask::freeIdOnError()
-+{
-+ if ( m_oldItem.isValid() && m_newItem.isValid() )
-+ {
-+ if ( m_opSubject == Contact || m_opSubject == NoSubject )
-+ {
-+ if ( m_oldItem.bid() != m_newItem.bid() )
-+ m_ssiManager->removeID( m_newItem );
-+ }
-+ else if ( m_opSubject == Group )
-+ {
-+ if ( m_oldItem.gid() != m_newItem.gid() )
-+ m_ssiManager->removeID( m_newItem );
-+ }
-+ }
-+ else if ( m_newItem.isValid() && !m_oldItem )
-+ {
-+ if ( m_opSubject == Group || m_opSubject == Contact ||
-+ m_opSubject == NoSubject )
-+ {
-+ m_ssiManager->removeID( m_newItem );
-+ }
-+ }
+Index: kopete/plugins/nowlistening/nowlisteningprefs.ui
+===================================================================
+--- kopete/plugins/nowlistening/nowlisteningprefs.ui (.../tags/KDE/3.5.4/kdenetwork) (revision 581799)
++++ kopete/plugins/nowlistening/nowlisteningprefs.ui (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -8,8 +8,8 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>443</width>
+- <height>398</height>
++ <width>391</width>
++ <height>370</height>
+ </rect>
+ </property>
+ <property name="caption">
+@@ -208,47 +208,46 @@
+ <property name="title">
+ <string></string>
+ </property>
+- <grid>
++ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+- <widget class="QLayoutWidget" row="0" column="0">
++ <widget class="QRadioButton">
+ <property name="name">
+- <cstring>layout6</cstring>
++ <cstring>kcfg_ExplicitAdvertising</cstring>
+ </property>
+- <vbox>
+- <property name="name">
+- <cstring>unnamed</cstring>
+- </property>
+- <widget class="QRadioButton">
+- <property name="name">
+- <cstring>kcfg_ExplicitAdvertising</cstring>
+- </property>
+- <property name="text">
+- <string>Explicit &via "Tools->Send Media Info",
++ <property name="text">
++ <string>Explicit &via "Tools->Send Media Info",
+ or by typing "/media" in the chat
+ window edit area.</string>
+- </property>
+- </widget>
+- <widget class="QRadioButton">
+- <property name="name">
+- <cstring>kcfg_ChatAdvertising</cstring>
+- </property>
+- <property name="text">
+- <string>Show in chat &window (automatic)</string>
+- </property>
+- </widget>
+- <widget class="QRadioButton">
+- <property name="name">
+- <cstring>kcfg_StatusAdvertising</cstring>
+- </property>
+- <property name="text">
+- <string>Show in &your status message (automatic)</string>
+- </property>
+- </widget>
+- </vbox>
++ </property>
+ </widget>
+- </grid>
++ <widget class="QRadioButton">
++ <property name="name">
++ <cstring>kcfg_ChatAdvertising</cstring>
++ </property>
++ <property name="text">
++ <string>&Show in chat window (automatic)</string>
++ </property>
++ </widget>
++ <widget class="QRadioButton">
++ <property name="name">
++ <cstring>kcfg_StatusAdvertising</cstring>
++ </property>
++ <property name="text">
++ <string>Show &the music you are listening to
++in place of your status message.</string>
++ </property>
++ </widget>
++ <widget class="QRadioButton">
++ <property name="name">
++ <cstring>kcfg_AppendStatusAdvertising</cstring>
++ </property>
++ <property name="text">
++ <string>Appe&nd to your status message</string>
++ </property>
++ </widget>
++ </vbox>
+ </widget>
+ <spacer>
+ <property name="name">
+@@ -263,7 +262,7 @@
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+- <height>40</height>
++ <height>80</height>
+ </size>
+ </property>
+ </spacer>
+
+Property changes on: kopete/plugins/nowlistening
+___________________________________________________________________
+Name: svn:ignore
+ - *.la
+*.lo
+*.loT
+*.moc
+*~
+*.bak
+Makefile
+Makefile.in
+configure.in.in
+kopete_nowlistening.la.closure
+nowlisteningprefs.h
+nowlisteningprefs.cpp
+ + .libs
+.deps
+*.la
+*.lo
+*.loT
+*.moc
+Makefile
+Makefile.in
+configure.in.in
+kopete_nowlistening.la.closure
+nowlisteningprefs.h
+nowlisteningprefs.cpp
+nowlisteningconfig.h
+nowlisteningconfig.cpp
+
+
+
+Property changes on: kopete/plugins/motionautoaway
+___________________________________________________________________
+Name: svn:ignore
+ - *.la
+*.lo
+*.loT
+Makefile
+Makefile.in
+Makefile.rules.in
+semantic.cache
+motionawayprefs.cpp
+motionawayprefs.h
+ + .deps
+*.la
+*.lo
+*.loT
+Makefile
+Makefile.in
+Makefile.rules.in
+semantic.cache
+motionawayprefs.cpp
+motionawayprefs.h
+
+
+Index: kopete/plugins/smpppdcs/smpppdlocationwidget.cpp
+===================================================================
+--- kopete/plugins/smpppdcs/smpppdlocationwidget.cpp (.../tags/KDE/3.5.4/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdlocationwidget.cpp (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -0,0 +1,30 @@
++/*
++ smpppdlocationwidget.cpp
++
++ Copyright (c) 2004-2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * This program is free software; you can redistribute it and/or modify *
++ * it under the terms of the GNU General Public License as published by *
++ * the Free Software Foundation; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#include <klineedit.h>
++
++#include "smpppdlocationwidget.h"
++
++SMPPPDLocationWidget::SMPPPDLocationWidget(QWidget* parent, const char* name, WFlags fl)
++ : SMPPPDLocationWidgetBase(parent, name, fl) {}
++
++SMPPPDLocationWidget::~SMPPPDLocationWidget() {}
++
++void SMPPPDLocationWidget::setServer(const QString& serv) {
++ server->setText(serv);
+}
+
- void SSIModifyTask::sendEditStart()
- {
- SNAC editStartSnac = { 0x0013, 0x0011, 0x0000, client()->snacSequence() };
-Index: kopete/protocols/oscar/liboscar/ssimanager.h
++#include "smpppdlocationwidget.moc"
+Index: kopete/plugins/smpppdcs/kinternetiface.h
===================================================================
---- kopete/protocols/oscar/liboscar/ssimanager.h (.../tags/KDE/3.5.4/kdenetwork) (revision 570934)
-+++ kopete/protocols/oscar/liboscar/ssimanager.h (.../branches/KDE/3.5/kdenetwork) (revision 570934)
-@@ -111,6 +111,9 @@
- bool newItem( const Oscar::SSI& item );
- bool removeItem( const Oscar::SSI& item );
+--- kopete/plugins/smpppdcs/kinternetiface.h (.../tags/KDE/3.5.4/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/kinternetiface.h (.../branches/KDE/3.5/kdenetwork) (revision 581799)
+@@ -0,0 +1,47 @@
++// -*- c++ -*-
++/***************************************************************************
++ * *
++ * Copyright: SuSE Linux AG, Nuernberg *
++ * *
++ * Author: Arvin Schnell <arvin at suse.de> *
++ * *
++ ***************************************************************************/
++
++/***************************************************************************
++ * *
++ * This program is free software; you can redistribute it and/or modify *
++ * it under the terms of the GNU General Public License as published by *
++ * the Free Software Foundation; either version 2 of the License, or *
++ * (at your option) any later version. *
++ * *
++ ***************************************************************************/
++
++
++#ifndef KINTERNETIFACE_H
++#define KINTERNETIFACE_H
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list