SOURCES: kdebase-branch.diff - updated

arekm arekm at pld-linux.org
Sat Jan 21 23:55:07 CET 2006 

Author: arekm                        Date: Sat Jan 21 22:55:07 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdebase-branch.diff (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.23 SOURCES/kdebase-branch.diff:1.24
--- SOURCES/kdebase-branch.diff:1.23	Tue Jan 17 16:09:32 2006
+++ SOURCES/kdebase-branch.diff	Sat Jan 21 23:55:02 2006
@@ -1,7 +1,7 @@
 Index: ksmserver/shutdown.h
 ===================================================================
---- ksmserver/shutdown.h	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ ksmserver/shutdown.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- ksmserver/shutdown.h	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ ksmserver/shutdown.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -1,87 +0,0 @@
 -/*****************************************************************
 -ksmserver - the KDE session management server
@@ -93,7 +93,7 @@
 Index: ksmserver/shutdowndlg.cpp
 ===================================================================
 --- ksmserver/shutdowndlg.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/shutdowndlg.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
++++ ksmserver/shutdowndlg.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -0,0 +1,273 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -381,7 +381,7 @@
 Index: ksmserver/startup.cpp
 ===================================================================
 --- ksmserver/startup.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/startup.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
++++ ksmserver/startup.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -0,0 +1,289 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -685,7 +685,7 @@
 Index: ksmserver/legacy.cpp
 ===================================================================
 --- ksmserver/legacy.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/legacy.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
++++ ksmserver/legacy.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -0,0 +1,388 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -1087,8 +1087,8 @@
 
 Index: ksmserver/server.cpp
 ===================================================================
---- ksmserver/server.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ ksmserver/server.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- ksmserver/server.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ ksmserver/server.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -2,6 +2,7 @@
  ksmserver - the KDE session management server
  
@@ -2308,7 +2308,7 @@
 Index: ksmserver/shutdowndlg.h
 ===================================================================
 --- ksmserver/shutdowndlg.h	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/shutdowndlg.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
++++ ksmserver/shutdowndlg.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -0,0 +1,88 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -2410,8 +2410,8 @@
 
 Index: ksmserver/shutdown.cpp
 ===================================================================
---- ksmserver/shutdown.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ ksmserver/shutdown.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- ksmserver/shutdown.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ ksmserver/shutdown.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -2,267 +2,514 @@
  ksmserver - the KDE session management server
  
@@ -3122,8 +3122,8 @@
 +}
 Index: ksmserver/server.h
 ===================================================================
---- ksmserver/server.h	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ ksmserver/server.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- ksmserver/server.h	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ ksmserver/server.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -33,37 +33,8 @@
  typedef QValueList<QCString> QCStringList;
  class KSMListener;
@@ -3211,7 +3211,7 @@
 Index: ksmserver/client.cpp
 ===================================================================
 --- ksmserver/client.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/client.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
++++ ksmserver/client.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -0,0 +1,190 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -3415,8 +3415,8 @@
 
 Index: ksmserver/test.cpp
 ===================================================================
---- ksmserver/test.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ ksmserver/test.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- ksmserver/test.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ ksmserver/test.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -1,4 +1,4 @@
 -#include <shutdown.h>
 +#include "shutdowndlg.h"
@@ -3442,7 +3442,7 @@
 Index: ksmserver/client.h
 ===================================================================
 --- ksmserver/client.h	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/client.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
++++ ksmserver/client.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -0,0 +1,60 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -3516,8 +3516,8 @@
 
 Index: ksmserver/Makefile.am
 ===================================================================
---- ksmserver/Makefile.am	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ ksmserver/Makefile.am	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- ksmserver/Makefile.am	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ ksmserver/Makefile.am	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -22,11 +22,13 @@
  bin_PROGRAMS =
  lib_LTLIBRARIES =
@@ -3545,8 +3545,8 @@
  	$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
 Index: ksmserver/server2.h
 ===================================================================
---- ksmserver/server2.h	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ ksmserver/server2.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- ksmserver/server2.h	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ ksmserver/server2.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -12,3 +12,5 @@
  #include <X11/SM/SM.h>
  #include <X11/SM/SMlib.h>
@@ -3555,8 +3555,8 @@
 +#include <fixx11h.h>
 Index: debian/local/kdm.options.5
 ===================================================================
---- debian/local/kdm.options.5	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ debian/local/kdm.options.5	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- debian/local/kdm.options.5	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ debian/local/kdm.options.5	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -13,8 +13,8 @@
  .\"
  .\" You should have received a copy of the GNU General Public License with
@@ -3570,8 +3570,8 @@
  kdm.options \- configuration options for X display manager
 Index: kate/app/katedocmanager.cpp
 ===================================================================
---- kate/app/katedocmanager.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/katedocmanager.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/katedocmanager.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/katedocmanager.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -39,6 +39,7 @@
  #include <kmdcodec.h>
  #include <kmessagebox.h>
@@ -3656,8 +3656,8 @@
    // never ever empty the whole document list
 Index: kate/app/kateviewmanager.cpp
 ===================================================================
---- kate/app/kateviewmanager.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/kateviewmanager.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/kateviewmanager.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/kateviewmanager.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -403,10 +403,10 @@
    KateDocManager::self()->closeDocument (activeView()->getDoc());
  }
@@ -3711,8 +3711,8 @@
    int activeOne=config->readNumEntry("Active ViewSpaceContainer",0);
 Index: kate/app/kwritemain.cpp
 ===================================================================
---- kate/app/kwritemain.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/kwritemain.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/kwritemain.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/kwritemain.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -173,7 +173,7 @@
    a=KStdAction::keyBindings(this, SLOT(editKeys()), actionCollection());
    a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
@@ -3771,8 +3771,8 @@
 +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
 Index: kate/app/kateappIface.cpp
 ===================================================================
---- kate/app/kateappIface.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/kateappIface.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/kateappIface.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/kateappIface.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -71,9 +71,14 @@
  
  bool KateAppDCOPIface::openURL (KURL url, QString encoding)
@@ -3801,9 +3801,30 @@
  // kate: space-indent on; indent-width 2; replace-tabs on;
 Index: kate/app/kateapp.cpp
 ===================================================================
---- kate/app/kateapp.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/kateapp.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
-@@ -161,7 +161,7 @@
+--- kate/app/kateapp.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/kateapp.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
+@@ -47,6 +47,10 @@
+ #include <qdir.h>
+ #include <qtextcodec.h>
+ 
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/types.h>
++
+ KateApp::KateApp (KCmdLineArgs *args)
+  : KApplication ()
+  , m_args (args)
+@@ -76,6 +80,9 @@
+   // application dcop interface
+   m_obj = new KateAppDCOPIface (this);
+ 
++  kdDebug()<<"Setting KATE_PID: '"<<getpid()<<"'"<<endl;
++  ::setenv( "KATE_PID", QString("%1").arg(getpid()).latin1(), 1 );
++
+   // handle restore different
+   if (isRestored())
+   {
+@@ -161,7 +168,7 @@
    {
      sessionManager()->activateSession (sessionManager()->giveSession (m_args->getOption("start")), false, false);
    }
@@ -3812,7 +3833,7 @@
    {
      // let the user choose session if possible
      if (!sessionManager()->chooseSession ())
-@@ -181,6 +181,8 @@
+@@ -181,6 +188,8 @@
  
    QTextCodec *codec = m_args->isSet("encoding") ? QTextCodec::codecForName(m_args->getOption("encoding")) : 0;
  
@@ -3821,7 +3842,7 @@
    Kate::Document::setOpenErrorDialogsActivated (false);
    uint id = 0;
    for (int z=0; z<m_args->count(); z++)
-@@ -192,9 +194,9 @@
+@@ -192,9 +201,9 @@
      {
        // open a normal file
        if (codec)
@@ -3833,7 +3854,7 @@
      }
      else
        KMessageBox::sorry( activeMainWindow(),
-@@ -286,7 +288,7 @@
+@@ -286,7 +295,7 @@
    return m_sessionManager;
  }
  
@@ -3842,7 +3863,7 @@
  {
    KateMainWindow *mainWindow = activeMainWindow ();
  
-@@ -304,9 +306,9 @@
+@@ -304,9 +313,9 @@
    {
      // open a normal file
      if (codec)
@@ -3856,8 +3877,8 @@
      KMessageBox::sorry( mainWindow,
 Index: kate/app/katemainwindow.h
 ===================================================================
---- kate/app/katemainwindow.h	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/katemainwindow.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/katemainwindow.h	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/katemainwindow.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -143,6 +143,7 @@
  
      void slotFileQuit();
@@ -3868,8 +3889,8 @@
      void documentMenuAboutToShow();
 Index: kate/app/katemain.cpp
 ===================================================================
---- kate/app/katemain.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/katemain.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/katemain.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/katemain.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -26,6 +26,7 @@
  #include <kglobal.h>
  #include <kconfig.h>
@@ -3970,8 +3991,8 @@
 +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
 Index: kate/app/kateexternaltools.cpp
 ===================================================================
---- kate/app/kateexternaltools.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/kateexternaltools.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/kateexternaltools.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/kateexternaltools.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -308,13 +308,8 @@
  
  void KateExternalToolsMenuAction::reload()
@@ -3989,8 +4010,8 @@
    KConfig *config = new KConfig( "externaltools", false, false, "appdata" );
 Index: kate/app/katedocmanager.h
 ===================================================================
---- kate/app/katedocmanager.h	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/katedocmanager.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/katedocmanager.h	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/katedocmanager.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -30,6 +30,8 @@
  #include <qobject.h>
  #include <qptrdict.h>
@@ -4028,8 +4049,8 @@
      bool m_saveMetaInfos;
 Index: kate/app/kateviewmanager.h
 ===================================================================
---- kate/app/kateviewmanager.h	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/kateviewmanager.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/kateviewmanager.h	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/kateviewmanager.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -65,7 +65,7 @@
      /* restore it */
      void restoreViewConfiguration (KConfig *config,const QString& group);
@@ -4041,8 +4062,8 @@
      void openURL (const KURL &url);
 Index: kate/app/kwritemain.h
 ===================================================================
---- kate/app/kwritemain.h	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/kwritemain.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/kwritemain.h	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/kwritemain.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -69,6 +69,9 @@
      void editToolbars();
      void changeEditor();
@@ -4060,8 +4081,8 @@
 +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
 Index: kate/app/katemainwindow.cpp
 ===================================================================
---- kate/app/katemainwindow.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/katemainwindow.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/katemainwindow.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/katemainwindow.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -177,11 +177,11 @@
  
    readOptions();
@@ -4139,26 +4160,24 @@
  }
  
  void KateMainWindow::pluginHelp()
-@@ -812,7 +818,14 @@
+@@ -812,7 +818,12 @@
      c = m_viewManager->activeView()->getDoc()->url().prettyURL();
    }
  
 -  setCaption( KStringHandler::lsqueeze(c,64), m_viewManager->activeView()->getDoc()->isModified());
 +  QString sessName = KateApp::self()->sessionManager()->activeSession()->sessionName();
 +  if ( !sessName.isEmpty() )
-+    sessName = QString(" (%1)").arg( sessName );
++    sessName = QString("%1: ").arg( sessName );
 +
-+  setPlainCaption( KateApp::self()->makeStdCaption(
-+      KStringHandler::lsqueeze(c,64), true,
-+      m_viewManager->activeView()->getDoc()->isModified()
-+                                                  )+sessName);
++  setCaption( sessName + KStringHandler::lsqueeze(c,64),
++      m_viewManager->activeView()->getDoc()->isModified());
  }
  
  void KateMainWindow::saveProperties(KConfig *config)
 Index: kate/app/kateappIface.h
 ===================================================================
---- kate/app/kateappIface.h	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/kateappIface.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/kateappIface.h	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/kateappIface.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -52,6 +52,14 @@
      bool openURL (KURL url, QString encoding);
  
@@ -4188,8 +4207,8 @@
  };
 Index: kate/app/katesession.cpp
 ===================================================================
---- kate/app/katesession.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/katesession.cpp	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/katesession.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/katesession.cpp	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -43,6 +43,7 @@
  #include <qhbox.h>
  #include <qcheckbox.h>
@@ -4209,47 +4228,26 @@
       // uhh, no name given
      if (m_sessionName.isEmpty())
      {
-@@ -100,6 +103,27 @@
+@@ -100,6 +103,7 @@
      KSimpleConfig config (sessionFile ());
      config.setGroup ("General");
      config.writeEntry ("Name", m_sessionName);
 +
-+    // If this is not the default session, copy GUI properties from that.
-+    if ( m_sessionFileRel != "default.katesession" )
-+    {
-+      int cnt = 0;
-+      QString group;
-+      KSimpleConfig defaultConfig( m_manager->sessionsDir() + "/default.katesession" );
-+      while ( defaultConfig.hasGroup( group = QString("MainWindow%1").arg(cnt) ) )
-+      {
-+        config.setGroup( group );
-+        QMap<QString,QString> map = defaultConfig.entryMap( group );
-+        QMap<QString,QString>::ConstIterator it;
-+        for ( it = map.begin(); it != map.end(); ++it )
-+          config.writeEntry( it.key(), it.data() );
-+
-+        cnt++;
-+      }
-+      config.setGroup( "Open MainWindows" );
-+      config.writeEntry( "Count", cnt );
-+    }
-+
      config.sync ();
    }
  }
-@@ -245,6 +269,11 @@
+@@ -245,6 +249,10 @@
  
  void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLast, bool saveLast, bool loadNew)
  {
 +  // don't reload.
 +  // ### comparing the pointers directly is b0rk3d :(
-+  if ( session->sessionName() == m_activeSession->sessionName() )
-+    return;
-+
++   if ( ! session->sessionName().isEmpty() && session->sessionName() == m_activeSession->sessionName() )
++     return;
    // try to close last session
    if (closeLast)
    {
-@@ -278,6 +307,11 @@
+@@ -278,6 +286,11 @@
      if (sc)
        KateApp::self()->documentManager()->restoreDocumentList (sc);
  
@@ -4261,15 +4259,26 @@
      // window config
      if (sc)
      {
-@@ -891,3 +925,4 @@
+@@ -286,6 +299,10 @@
+ 
+       if (c->readBoolEntry("Restore Window Configuration", true))
+       {
++        // a new, named session, read settings of the default session.
++        if ( ! sc->hasGroup("Open MainWindows") )
++          sc = new KSimpleConfig( sessionsDir() + "/default.katesession" );
++
+         sc->setGroup ("Open MainWindows");
+         unsigned int wCount = sc->readUnsignedNumEntry("Count", 1);
+ 
+@@ -891,3 +908,4 @@
  
    KateSessionManager::self()->activateSession(slist[(uint)i]);
  }
 +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
 Index: kate/app/kateapp.h
 ===================================================================
---- kate/app/kateapp.h	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/app/kateapp.h	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/app/kateapp.h	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/app/kateapp.h	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -177,9 +177,10 @@
       * used by kate if --use given
       * @param url filename
@@ -4284,8 +4293,8 @@
       * position cursor in current active view
 Index: kate/data/kateui.rc
 ===================================================================
---- kate/data/kateui.rc	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/data/kateui.rc	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/data/kateui.rc	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/data/kateui.rc	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -1,5 +1,5 @@
  <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 -<kpartgui name="kate" version="48">
@@ -4318,8 +4327,8 @@
      <Action name="view_close_current_space" />
 Index: kate/data/kwriteui.rc
 ===================================================================
---- kate/data/kwriteui.rc	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/data/kwriteui.rc	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/data/kwriteui.rc	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/data/kwriteui.rc	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -1,5 +1,5 @@
  <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 -<kpartgui name="kwrite" version="14">
@@ -4338,9 +4347,17 @@
    </Menu>
 Index: kate/data/kateplugin.desktop
 ===================================================================
---- kate/data/kateplugin.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/data/kateplugin.desktop	(.../branches/KDE/3.5/kdebase)	(revision 499311)
-@@ -70,7 +70,6 @@
+--- kate/data/kateplugin.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/data/kateplugin.desktop	(.../branches/KDE/3.5/kdebase)	(revision 501051)
+@@ -42,6 +42,7 @@
+ Comment[lv]=Kate spraudnis
+ Comment[mk]=ĐŸŃ€Đ¸ĐşĐťŃƒŃ‡ĐžĐş Од Kate 
+ Comment[mn]=Kate-Plugin
++Comment[ms]=Plugin Kate
+ Comment[mt]=Plagin ta' Kate
+ Comment[nb]=Kate-programtillegg
+ Comment[nds]=Kate-Plugin
+@@ -70,7 +71,6 @@
  Comment[uk]=Đ’Ń‚ŃƒĐťĐžĐş Kate
  Comment[uz]=Kate ŃƒŃ‡ŃƒĐ˝ пНагин
  Comment[xh]=Iplagi efakiweyo ye Kate
@@ -4350,9 +4367,21 @@
  Comment[zu]=I-Plugin ye-Kate
 Index: kate/data/kate.desktop
 ===================================================================
---- kate/data/kate.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/data/kate.desktop	(.../branches/KDE/3.5/kdebase)	(revision 499311)
-@@ -62,7 +62,6 @@
+--- kate/data/kate.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/data/kate.desktop	(.../branches/KDE/3.5/kdebase)	(revision 501051)
+@@ -35,9 +35,10 @@
+ GenericName[lv]=Teksta Redaktors
+ GenericName[mk]=ĐĐ°ĐżŃ€ĐľĐ´ĐľĐ˝ ŃƒŃ€ĐľĐ´ŃƒĐ˛Đ°Ń‡ на токст 
+ GenericName[mn]=Токст ĐąĐžĐťĐžĐ˛ŃŃ€ŃƒŃƒĐťĐ°ĐłŃ‡
++GenericName[ms]=Editor Teks Lanjutan
+ GenericName[mt]=Editur tat-test avvanzat
+ GenericName[nb]=Avansert skriveprogram
+-GenericName[nds]= En verwiederte Text-Editor
++GenericName[nds]=Verwiedert Text-Editor
+ GenericName[nl]=Geavanceerde teksteditor
+ GenericName[nn]=Avansert skriveprogram
+ GenericName[pa]=ŕ¨¤ŕ¨•ŕ¨¨ŕŠ€ŕ¨•ŕŠ€ ਪਞਠ ਌ਰਜਕ
+@@ -62,7 +63,6 @@
  GenericName[uz]=КонгаКтириНган Патн таҳрирчи
  GenericName[vi]=TrĂŹnh soấn văn bản tiĂŞn tiáşżn
  GenericName[wa]=Aspougneu di tecse avancĂŽ
@@ -4360,7 +4389,7 @@
  GenericName[zh_CN]=éŤ˜çş§ć–‡ćœŹçź–čž‘ĺ™¨
  GenericName[zh_TW]=進階文字硨蟯器
  Name=Kate
-@@ -74,10 +73,10 @@
+@@ -74,10 +74,10 @@
  Name[ko]=ěš´í
Œ
  Name[pa]=ŕ¨•ŕŠ‡ŕ¨Ÿ
  Name[ru]=РодактОр Kate
@@ -4374,8 +4403,8 @@
  DocPath=kate/index.html
 Index: kate/data/kwrite.desktop
 ===================================================================
---- kate/data/kwrite.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/data/kwrite.desktop	(.../branches/KDE/3.5/kdebase)	(revision 499311)
+--- kate/data/kwrite.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/data/kwrite.desktop	(.../branches/KDE/3.5/kdebase)	(revision 501051)
 @@ -73,7 +73,6 @@
  GenericName[vi]=TrĂŹnh soấn văn bản
  GenericName[wa]=Aspougneu di tecse
@@ -4394,9 +4423,9 @@
  X-KDE-StartupNotify=true
 Index: kate/README
 ===================================================================
---- kate/README	(.../tags/KDE/3.5.0/kdebase)	(revision 499311)
-+++ kate/README	(.../branches/KDE/3.5/kdebase)	(revision 499311)
-@@ -17,3 +17,34 @@
+--- kate/README	(.../tags/KDE/3.5.0/kdebase)	(revision 501051)
++++ kate/README	(.../branches/KDE/3.5/kdebase)	(revision 501051)
+@@ -17,3 +17,46 @@
  
  Licensing:
  The Kate app/utils/interfaces and KWrite app are licensed under the LGPL VERSION 2.
@@ -4423,7 +4452,7 @@
 +This will only work for local files for which you have write permissions.
 +
 +* Kate will display the name of a named session in the window title, the form is
-+<Document name or URL> [modified] - (Kate <Session Name>)
++<Session Name>: <Document name or URL> [modified] - Kate
 +
 +* If you use --start <sessionName> with --use, kate will use instance with
 +the specified session running, or start a new instance if it is not found.
@@ -4431,6 +4460,19 @@
 +* The KateApplication DCOP interface has a function QString session() that
 +returns the name of the active session (which might be an empty string).
 +
++* Kate will export the PID of the instance in the environment variable KATE_PID.
++You can use that to do some initialization in your ~/.bashrc file for example,
++if you like to open files in kate from the built in terminal:
++
++# If we are running in a konsole in kate,
++# $KATE_PID is the pid of that kate application instance.
++if [ -n "$KATE_PID" ] ; then
++  # open files in this instance
++  alias kate="kate -u -p $KATE_PID"
++  # allow creating a new instance
++  alias kate_newinst="`which kate`"
++fi
+\ No newline at end of file
 
 Property changes on: kate/pics/hi64-app-kate.png
 ___________________________________________________________________
@@ -4457,9 +4499,17 @@
 
 Index: kdepasswd/kcm/kcm_useraccount.desktop
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.23&r2=1.24&f=u

More information about the pld-cvs-commit mailing list