SOURCES: kdelibs-branch.diff, kdebase-branch.diff, kdepim-branch.d...

arekm arekm at pld-linux.org
Sat Oct 21 14:12:46 CEST 2006 

Author: arekm                        Date: Sat Oct 21 12:12:46 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.39 -> 1.40) , kdebase-branch.diff (1.41 -> 1.42) , kdepim-branch.diff (1.27 -> 1.28) , kdenetwork-branch.diff (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.39 SOURCES/kdelibs-branch.diff:1.40
--- SOURCES/kdelibs-branch.diff:1.39	Mon Oct 16 13:27:15 2006
+++ SOURCES/kdelibs-branch.diff	Sat Oct 21 14:12:40 2006
@@ -1,7 +1,32 @@
+Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
+===================================================================
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -28,6 +28,7 @@
+ Comment[hr]=Trenutne poruke s DCOP sučeljem
+ Comment[hsb]=Instant Messenger z DCOP-interfejsom
+ Comment[hu]=Azonnali ßzenetkßldő DCOP-felßlettel
++Comment[id]=Instant Messenger dengan antarmuka DCOP
+ Comment[is]=Spjallforrit meĂ° DCOP viĂ°mĂłti
+ Comment[it]=Messaggistica istantanea con un'interfaccia DCOP
+ Comment[ja]=DCOP ă‚¤ăƒłă‚żăƒźăƒ•ă‚§ăƒźă‚šă‚’ă‚‚ă¤ă‚¤ăƒłă‚šă‚żăƒłăƒˆăƒĄăƒƒă‚ťăƒłă‚¸ăƒŁăƒź
+Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+===================================================================
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -66,7 +66,7 @@
+ Comment[es]=El Instant Messenger permite conversaciĂłn en dos sentidos entre indivĂ­duos y grupos.
+ Comment[et]=Kiirsuhtlus vĂľimaldab Ăźksikisikute ja gruppide kahepoolset vestlust.
+ Comment[eu]=Berehalako mezularitzak banan-banako edo taldeen arteko berriketan aritzeko.
+-Comment[fa]=ŮžŰŒŘ§Ů
â€ŒŘąŘłŘ§Ů† ŮŮˆŘąŰŒ اŮ
ڊان ÚŻŮž ŘŻŮˆ ءعفه Ř¨ŰŒŮ† افعاد Ůˆ ÚŻŘąŮˆŮ‡Ů‡Ř§ عا Ů
ŰŒâ€ŒŘŻŮ‡ŘŻ
++Comment[fa]=ŮžŰŒŘ§Ů
â€ŒŘąŘłŘ§Ů† ŮŮˆŘąŰŒ اŮ
ڊان ÚŻŮž ŘŻŮˆ ءعفه Ř¨ŰŒŮ† افعاد Ůˆ ÚŻŘąŮˆŮ‡Ů‡Ř§ عا Ů
ŰŒâ€ŒŘŻŮ‡ŘŻ.
+ Comment[fi]=Pikaviestiohjelman avulla voidaan keskustella kahden kesken tai ryhmässä.
+ Comment[fr]=La messagerie instantanĂŠe permet un dialogue bidirectionnel entre individus et groupes.
+ Comment[fy]=Mei de instant messenger kinne jo twaspraak hâlde mei in yndividu en groepen.
 Index: interfaces/kspeech/kspeech.h
 ===================================================================
---- interfaces/kspeech/kspeech.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- interfaces/kspeech/kspeech.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -371,10 +371,11 @@
   *
   * A Talker Code consists of a series of XML tags and attributes.
@@ -17,8 +42,8 @@
   * Markup Language (SSML) and Java Speech Markup Language (JSML).
 Index: interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
 ===================================================================
---- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -21,8 +21,10 @@
  {
  protected:
@@ -33,8 +58,8 @@
  };
 Index: kmdi/kmdi/mainwindow.h
 ===================================================================
---- kmdi/kmdi/mainwindow.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kmdi/kmdi/mainwindow.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kmdi/kmdi/mainwindow.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kmdi/kmdi/mainwindow.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -107,6 +107,10 @@
       * as toplevel and stay-on-top on the application's main widget.
       * @param pWnd widget for the toolview
@@ -48,8 +73,8 @@
      KMDI::ToolViewAccessor *addToolWindow( QWidget* pWnd, KDockWidget::DockPosition pos = KDockWidget::DockNone, QWidget* pTargetWnd = 0L, int percent = 50, const QString& tabToolTip = 0, const QString& tabCaption = 0);
 Index: kmdi/kmdi/dockcontainer.h
 ===================================================================
---- kmdi/kmdi/dockcontainer.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kmdi/kmdi/dockcontainer.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kmdi/kmdi/dockcontainer.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kmdi/kmdi/dockcontainer.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -50,7 +50,7 @@
      /**
       * Add a widget to this container.
@@ -68,10 +93,22 @@
       * does exactly nothing
       */
      virtual void setToolTip (KDockWidget *, QString &);
+Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
+===================================================================
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -23,6 +23,7 @@
+ Name[hi]=क༇-ŕ¤ŸŕĽ‡ŕ¤•ŕĽŕ¤¸ŕĽŕ¤Ÿ-ŕ¤ŕ¤Ąŕ¤żŕ¤Ÿŕ¤° ŕ¤‘ŕ¤ŸŕĽ‹ŕ¤ŹŕĽŕ¤•ŕ¤Žŕ¤žŕ¤°ŕĽŕ¤•ŕ¤°
+ Name[hr]=KTextEditor automatske oznake
+ Name[hu]=KTextEditor automatikus kÜnyvjelzők
++Name[id]=Penandabuku Otomatis KTextEditor
+ Name[is]=KTextEditor sjĂĄlfvirkur bĂłkamerkjari
+ Name[it]=Segnalibri automatici di KTextEditor
+ Name[ja]=KTextEditor č‡Şĺ‹•ăƒ–ăƒƒă‚Żăƒžăƒźă‚Ż
 Index: kate/plugins/autobookmarker/autobookmarker.cpp
 ===================================================================
---- kate/plugins/autobookmarker/autobookmarker.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/plugins/autobookmarker/autobookmarker.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/plugins/autobookmarker/autobookmarker.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/plugins/autobookmarker/autobookmarker.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -364,12 +364,12 @@
  {
    QString text = i18n("Select the MimeTypes for this pattern.\nPlease note that this will automatically edit the associated file extensions as well.");
@@ -89,10 +126,43 @@
    }
  }
  //END
+Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+===================================================================
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -23,6 +23,7 @@
+ Name[hr]=KTextEditor dodatak za dopunjavanje riječi
+ Name[hsb]=KTextEditor Plugin za wudospołnjenje słowow
+ Name[hu]=KTextEditor szókiegÊszítő bővítőmodul
++Name[id]=Plugin Pelengkapan Kata KTextEditor
+ Name[is]=KTextEditor Ă­forrit til aĂ° klĂĄra orĂ°
+ Name[it]=Plugin completamento parole di KTextEditor
+ Name[ja]=KTextEditor ĺ˜čŞžčŁœĺŽŒăƒ—ăƒŠă‚°ă‚¤ăƒł
+@@ -73,7 +74,7 @@
+ Comment[es]=Completado de palabras direccional o de menĂş emergente en el documento.
+ Comment[et]=LĂľpetamine vastavalt suunale vĂľi hĂźpikvariantide alusel dokumendi sĂľnade pĂľhjal
+ Comment[eu]=Dokumentuko hitzen osaketarako plugin-a
+-Comment[fa]=ŘŞÚŠŮ
ŰŒŮ„ ؏هت ŘŻŘ§ŘąŰŒŘ§ Ů
Ř¨Ů†ŰŒ بعبالاٞعاز ÚŠŮ„Ů
ات Ů
ŮˆŘŹŮˆŘŻŘŻŘąŘłŮ†ŘŻ
++Comment[fa]=ŘŞÚŠŮ
ŰŒŮ„ ŘŹŮ‡ŘŞâ€ŒŘŻŘ§Řą ŰŒŘ§ Ů
Ř¨Ů†ŰŒ بع بالاٞع از ÚŠŮ„Ů
ات Ů
ŮˆŘŹŮˆŘŻ ŘŻŘą سند
+ Comment[fi]=Asiakirjasta lÜytyvillä sanoilla täydentäminen
+ Comment[fr]=Complètement basÊ sur la direction ou un menu à partir des mots du document
+ Comment[fy]=kompleet meitsje fan wurden yn it dokumint op Direktsjeneel of popup-basearje 
+Index: kate/plugins/isearch/ktexteditor_isearch.desktop
+===================================================================
+--- kate/plugins/isearch/ktexteditor_isearch.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -27,6 +27,7 @@
+ Name[hr]=KTextEditor dodatak za traĹženje u koracima
+ Name[hsb]=KTextEditor Plugin za inkrementelne pytanje
+ Name[hu]=KTextEditor inkrementålis keresÊsi bővítőmodul
++Name[id]=Plugin Pencarian Bertahap KTextEditor
+ Name[is]=KTextEditor Ăžrepaleitar-Ă­forrit
+ Name[it]=Plugin ricerca incrementale di KTextEditor
+ Name[ja]=KTextEditor ă‚¤ăƒłă‚ŻăƒŞăƒĄăƒłă‚żăƒŤć¤œç´˘ăƒ—ăƒŠă‚°ă‚¤ăƒł
 Index: kate/part/katecodecompletion.cpp
 ===================================================================
---- kate/part/katecodecompletion.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/katecodecompletion.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/katecodecompletion.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/katecodecompletion.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -56,7 +56,6 @@
    public:
      /**
@@ -103,8 +173,8 @@
      {
 Index: kate/part/katefactory.h
 ===================================================================
---- kate/part/katefactory.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/katefactory.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/katefactory.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/katefactory.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -75,6 +75,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -115,8 +185,8 @@
       */
 Index: kate/part/katefiletype.cpp
 ===================================================================
---- kate/part/katefiletype.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/katefiletype.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/katefiletype.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/katefiletype.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -503,12 +503,12 @@
  
    QString text = i18n("Select the MimeTypes you want for this file type.\nPlease note that this will automatically edit the associated file extensions as well.");
@@ -136,8 +206,8 @@
  //END KateFileTypeConfigTab
 Index: kate/part/katejscript.cpp
 ===================================================================
---- kate/part/katejscript.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/katejscript.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/katejscript.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/katejscript.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -360,7 +360,7 @@
  
  const KJS::ClassInfo KateJSDocument::info = { "KateJSDocument", 0, 0, 0 };
@@ -167,8 +237,8 @@
  
 Index: kate/part/kateview.h
 ===================================================================
---- kate/part/kateview.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/kateview.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/kateview.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/kateview.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -286,8 +286,8 @@
          { return getDoc()->textLine( cursorLine() ); }
      QString currentWord()
@@ -190,8 +260,8 @@
      void findPrev()               { findAgain( true );           }
 Index: kate/part/katedocument.h
 ===================================================================
---- kate/part/katedocument.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/katedocument.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -264,6 +264,7 @@
       * @p removeLine is true, @p length is ignored (eg not needed).
       * @param line line number
@@ -211,8 +281,8 @@
  
 Index: kate/part/katedocument.cpp
 ===================================================================
---- kate/part/katedocument.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/katedocument.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -4688,9 +4688,9 @@
          else
            m_config->setIndentationMode( KateAutoIndent::modeNumber( val) );
@@ -227,8 +297,8 @@
        // STRING SETTINGS
 Index: kate/part/kateautoindent.h
 ===================================================================
---- kate/part/kateautoindent.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/kateautoindent.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -349,7 +349,7 @@
      KateCSmartIndent (KateDocument *doc);
      ~KateCSmartIndent ();
@@ -267,8 +337,8 @@
      virtual void processLine (KateDocCursor &line);
 Index: kate/part/kateviewhelpers.cpp
 ===================================================================
---- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -277,7 +277,7 @@
    public:
      KateCmdLineFlagCompletion() {;}
@@ -280,8 +350,8 @@
      }
 Index: kate/part/katefactory.cpp
 ===================================================================
---- kate/part/katefactory.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/katefactory.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/katefactory.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/katefactory.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -52,6 +52,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -292,8 +362,8 @@
       */
 Index: kate/part/katesearch.h
 ===================================================================
---- kate/part/katesearch.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/katesearch.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/katesearch.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/katesearch.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -223,7 +223,7 @@
      bool help(class Kate::View *, const QString &, QString &);
      QStringList cmds();
@@ -305,8 +375,8 @@
      /**
 Index: kate/part/kateautoindent.cpp
 ===================================================================
---- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -714,6 +714,7 @@
    int parenCount = 0;  // Possibly in a multiline for stmt.  Used to skip ';' ...
    bool found = false;
@@ -344,8 +414,8 @@
    if (!found)
 Index: kate/part/katedialogs.cpp
 ===================================================================
---- kate/part/katedialogs.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kate/part/katedialogs.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kate/part/katedialogs.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/part/katedialogs.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -1423,13 +1423,13 @@
  {
    QString text = i18n("Select the MimeTypes you want highlighted using the '%1' syntax highlight rules.\nPlease note that this will automatically edit the associated file extensions as well.").arg( hlCombo->currentText() );
@@ -364,10 +434,23 @@
    }
  }
  //END KateHlConfigPage
+Index: kate/scripts/jstest.desktop
+===================================================================
+--- kate/scripts/jstest.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kate/scripts/jstest.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -9,7 +9,7 @@
+ Name[es]=Prueba JavaScript de Kate Part
+ Name[et]=Kate komponendi JavaScripti test
+ Name[eu]=Kate zatiaren JavaScript proba
+-Name[fa]=آزŮ
ŮˆŮ† ŘŻŘłŘŞâ€ŒŮ†ŮˆŘ´ŘŞŮ‡ ŘŹŘ§ŮˆŘ§  Kate Part
++Name[fa]=آزŮ
ŮˆŮ† ŘŻŘłŘŞâ€ŒŮ†ŮˆŘ´ŘŞŰ€ ŘŹŘ§ŮˆŘ§  Kate Part
+ Name[fi]=Kate Part JavaScript -testi
+ Name[fr]=Test du module JavaScript pour Kate
+ Name[fy]=Kate-part JavaSkript-test
 Index: kab/qconfigDB.h
 ===================================================================
---- kab/qconfigDB.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kab/qconfigDB.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kab/qconfigDB.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kab/qconfigDB.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -199,7 +199,7 @@
    bool save(QTextStream& file, int count); 
    /**
@@ -487,8 +570,8 @@
     */
 Index: kab/addressbook.h
 ===================================================================
---- kab/addressbook.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kab/addressbook.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kab/addressbook.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kab/addressbook.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -178,7 +178,7 @@
   *  your mainwindow (or whereever). (The toolbar is not implemented by now). <BR>
   *  Some parts of the AddressBook widget are \e interactive, that means they are
@@ -591,8 +674,8 @@
     **/
 Index: kab/kabapi.h
 ===================================================================
---- kab/kabapi.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ kab/kabapi.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- kab/kabapi.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ kab/kabapi.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -77,6 +77,7 @@
     * without failures. Thus you have to call init before you can
     * use the database.
@@ -612,8 +695,8 @@
     * @return NoError if an entry is found or NoEntry.
 Index: arts/kde/kplayobject.h
 ===================================================================
---- arts/kde/kplayobject.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ arts/kde/kplayobject.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- arts/kde/kplayobject.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ arts/kde/kplayobject.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -37,7 +37,7 @@
  
  	/**
@@ -623,10 +706,249 @@
  	  */
  	void setObject(Arts::PlayObject playObject);
  	
+Index: arts/knotify/knotify.cpp
+===================================================================
+--- arts/knotify/knotify.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ arts/knotify/knotify.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -26,24 +26,29 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#include <config.h>
++#ifndef WITHOUT_ARTS
+ // aRts headers
+ #include <connect.h>
+ #include <dispatcher.h>
+ #include <flowsystem.h>
++#include <qiomanager.h>
+ #include <soundserver.h>
++#endif
+ 
+ // QT headers
+ #include <qfile.h>
+ #include <qfileinfo.h>
+-#include <qiomanager.h>
+ #include <qstringlist.h>
+ #include <qtextstream.h>
+ 
+ // KDE headers
+ #include <dcopclient.h>
+ #include <kaboutdata.h>
++#ifndef WITHOUT_ARTS
+ #include <kartsdispatcher.h>
+ #include <kartsserver.h>
++#endif
+ #include <kcmdlineargs.h>
+ #include <kconfig.h>
+ #include <kdebug.h>
+@@ -53,8 +58,10 @@
+ #include <kpassivepopup.h>
+ #include <kiconloader.h>
+ #include <kmacroexpander.h>
++#ifndef WITHOUT_ARTS
+ #include <kplayobjectfactory.h>
+ #include <kaudiomanagerplay.h>
++#endif
+ #include <kprocess.h>
+ #include <kstandarddirs.h>
+ #include <kuniqueapplication.h>
+@@ -73,22 +80,26 @@
+     QString externalPlayer;
+     KProcess *externalPlayerProc;
+ 
++#ifndef WITHOUT_ARTS
+     QPtrList<KDE::PlayObject> playObjects;
+     QMap<KDE::PlayObject*,int> playObjectEventMap;
++    KAudioManagerPlay *audioManager;
++#endif
+     int externalPlayerEventId;
+ 
+     bool useExternal;
+     bool useArts;
+     int volume;
+     QTimer *playTimer;
+-    KAudioManagerPlay *audioManager;
+     bool inStartup;
+     QString startupEvents;
+ };
+ 
+ // Yes, it's ugly to put this here, but this facilitates the cautious startup
+ // procedure.
++#ifndef WITHOUT_ARTS
+ KArtsServer *soundServer = 0;
++#endif
+ 
+ extern "C"{
+ 
+@@ -124,6 +135,7 @@
+     // We try to prevent this by tracking our startup and offer options to
+     // abort this.
+ 
++#ifndef WITHOUT_ARTS
+     KConfigGroup config( KGlobal::config(), "StartProgress" );
+     KConfig artsKCMConfig( "kcmartsrc" );
+     artsKCMConfig.setGroup( "Arts" );
+@@ -208,14 +220,23 @@
+     config.writeEntry( "KNotify Init", true );
+     config.sync();
+ 
++#else
++
++    // start notify service, without aRts
++    KNotify *notify = new KNotify( false );
++
++#endif
++
+     app.dcopClient()->setDefaultObject( "Notify" );
+     app.dcopClient()->setDaemonMode( true );
+     // kdDebug() << "knotify starting" << endl;
+ 
+     int ret = app.exec();
+     delete notify;
++#ifndef WITHOUT_ARTS
+     delete soundServer;
+     delete dispatcher;
++#endif
+     return ret;
+ }
+ }// end extern "C"
+@@ -228,14 +249,16 @@
+     d->globalConfig = new KConfig("knotify.eventsrc", true, false);
+     d->externalPlayerProc = 0;
+     d->useArts = useArts;
++    d->inStartup = true;
++#ifndef WITHOUT_ARTS
+     d->playObjects.setAutoDelete(true);
+     d->audioManager = 0;
+-    d->inStartup = true;
+     if( useArts )
+     {
+         connect( soundServer, SIGNAL( restartedServer() ), this, SLOT( restartedArtsd() ) );
+         restartedArtsd(); //started allready need to initialize d->audioManager
+     }
++#endif
+ 
+     d->volume = 100;
+ 
+@@ -248,12 +271,14 @@
+ {
+     reconfigure();
+ 
++#ifndef WITHOUT_ARTS
+     d->playObjects.clear();
+ 
+     delete d->globalEvents;
+     delete d->globalConfig;
+     delete d->externalPlayerProc;
+     delete d->audioManager;
++#endif
+     delete d;
+ }
+ 
+@@ -449,6 +474,7 @@
+             return false;
+         }
+ 
++#ifndef WITHOUT_ARTS
+         // play sound finally
+         while( d->playObjects.count()>5 )
+             abortFirstPlayObject();
+@@ -506,7 +532,7 @@
+         }
+         if ( !d->playTimer->isActive() )
+             d->playTimer->start( 1000 );
+-
++#endif
+         return true;
+ 
+     } else if(!d->externalPlayer.isEmpty()) {
+@@ -661,6 +687,7 @@
+ 
+ void KNotify::playTimeout()
+ {
++#ifndef WITHOUT_ARTS
+     for ( QPtrListIterator< KDE::PlayObject > it(d->playObjects); *it;)
+     {
+         QPtrListIterator< KDE::PlayObject > current = it;
+@@ -678,16 +705,18 @@
+     }
+     if ( !d->playObjects.count() )
+         d->playTimer->stop();
++#endif
+ }
+ 
+ bool KNotify::isPlaying( const QString& soundFile ) const
+ {
++#ifndef WITHOUT_ARTS
+     for ( QPtrListIterator< KDE::PlayObject > it(d->playObjects); *it; ++it)
+     {
+         if ( (*it)->mediaName() == soundFile )
+             return true;
+     }
+-
++#endif
+     return false;
+ }
+ 
+@@ -699,6 +728,7 @@
+ 
+ void KNotify::abortFirstPlayObject()
+ {
++#ifndef WITHOUT_ARTS
+     QMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
+     if ( it != d->playObjectEventMap.end() )
+     {
+@@ -706,6 +736,7 @@
+         d->playObjectEventMap.remove( it );
+     }
+     d->playObjects.removeFirst();
++#endif
+ }
+ 
+ void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason )
+@@ -750,10 +781,12 @@
+ 
+ void KNotify::restartedArtsd()
+ {
++#ifndef WITHOUT_ARTS
+     delete d->audioManager;
+     d->audioManager = new KAudioManagerPlay( soundServer );
+     d->audioManager->setTitle( i18n( "KDE System Notifications" ) );
+     d->audioManager->setAutoRestoreID( "KNotify Aman Play" );
++#endif
+ }
+ 
+ void KNotify::sessionReady()
+Index: arts/knotify/Makefile.am
+===================================================================
+--- arts/knotify/Makefile.am	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ arts/knotify/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -6,7 +6,9 @@
+ kde_module_LTLIBRARIES = knotify.la
+ 
+ knotify_la_SOURCES	= knotify.cpp knotify.skel
++if include_ARTS
+ knotify_la_LIBADD	= -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(top_builddir)/arts/kde/libartskde.la
++endif
+ knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ knotify_la_METASOURCES = AUTO
+ 
+Index: arts/knotify/knotify.h
+===================================================================
+--- arts/knotify/knotify.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ arts/knotify/knotify.h	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -23,7 +23,6 @@
+ #include <qobject.h>
+ #include <knotifyclient.h>
+ #include <dcopobject.h>
+-#include <soundserver.h>
+ 
+ class KNotifyPrivate;
+ class KProcess;
 Index: arts/knotify/knotify.desktop
 ===================================================================
---- arts/knotify/knotify.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
-+++ arts/knotify/knotify.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+--- arts/knotify/knotify.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ arts/knotify/knotify.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
 @@ -68,7 +68,7 @@
  Comment[ms]=Daemon Pemberitahuan KDE
  Comment[mt]=Daemon tan-notifika KDE
@@ -636,22 +958,3684 @@
  Comment[nl]=KDE's systeemnotificatieprogramma
  Comment[nn]=KDE-varselnisse
  Comment[nso]=Daemon ya Tsebiso ya KDE
+Index: arts/Makefile.am
+===================================================================
+--- arts/Makefile.am	(.../tags/KDE/3.5.5/kdelibs)	(revision 597699)
++++ arts/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 597699)
+@@ -1,4 +1,8 @@
++if include_ARTS
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.41&r2=1.42&f=u
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.14&r2=1.15&f=u

More information about the pld-cvs-commit mailing list