Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit kdebase3
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 29 Aug 2007 22:58:09 +0200
  • Message-id: <20070829205810.073EB6781B8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdebase3
checked in at Wed Aug 29 22:58:09 CEST 2007.

--------
--- KDE/kdebase3/kdebase3.changes       2007-08-25 11:42:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes      2007-08-28 15:32:43.533266000 +0200
@@ -1,0 +2,6 @@
+Tue Aug 28 15:29:19 CEST 2007 - stbinner@xxxxxxx
+
+- change Kickoff's "Home Folder" and "My Document" icons (#304656)
+- check if netscape plugins have changed (eg by YOU) (#296425)
+
+-------------------------------------------------------------------

New:
----
  nsplugin-paths.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.D22043/_old  2007-08-29 22:57:31.000000000 +0200
+++ /var/tmp/diff_new_pack.D22043/_new  2007-08-29 22:57:31.000000000 +0200
@@ -52,7 +52,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.kde.org/
 Version:        3.5.7
-Release:        60
+Release:        63
 %define        kde_version     3.5.7
 Source0:        kdebase-%{kde_version}.tar.bz2
 Source3:        startkde.suse.sh
@@ -203,6 +203,7 @@
 Patch220:       mediamanager-mount-point-utf8.diff
 Patch221:       old-liblazy-api.diff
 Patch222:       khelpcenter-delayed-indexcheck.cpp
+Patch223:       nsplugin-paths.diff
 
 %description
 This package contains kdebase, one of the basic packages of the K
@@ -390,7 +391,7 @@
 Summary:        Set and list fileshares
 Group:          System/Management
 Version:        2.0
-Release:        345
+Release:        348
 
 %description -n fileshareset
 This package contains the the fileshareset utility to allow users to
@@ -574,6 +575,7 @@
 %patch221
 %endif
 %patch222
+%patch223
 #%patch197
 %patch206
 rm -rf kappfinder
@@ -1592,6 +1594,9 @@
 %endif
 
 %changelog
+* Tue Aug 28 2007 - stbinner@xxxxxxx
+- change Kickoff's "Home Folder" and "My Document" icons (#304656)
+- check if netscape plugins have changed (eg by YOU) (#296425)
 * Sat Aug 25 2007 - stbinner@xxxxxxx
 - reorder default Kickoff favorites: Firefox first, Help not last
 * Wed Aug 22 2007 - stbinner@xxxxxxx











++++++ kickoff.diff ++++++
--- /var/tmp/diff_new_pack.D22043/_old  2007-08-29 22:57:34.000000000 +0200
+++ /var/tmp/diff_new_pack.D22043/_new  2007-08-29 22:57:34.000000000 +0200
@@ -11062,3 +11062,25 @@
 Makefile.in
 
 
+Index: kicker/ui/k_new_mnu.cpp
+===================================================================
+--- kicker/ui/k_new_mnu.cpp    (revision 705703)
++++ kicker/ui/k_new_mnu.cpp    (working copy)
+@@ -1350,7 +1350,7 @@

+     m_systemView->insertSeparator( nId++, i18n("System Folders"), index++ );

+-    m_systemView->insertItem( "folder_red", i18n( "Home Folder" ),
++    m_systemView->insertItem( "folder_home", i18n( "Home Folder" ),
+                               QDir::homeDirPath(), "file://"+QDir::homeDirPath(), nId++, index++ );

+     if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) )
+@@ -1359,7 +1359,7 @@
+         if ( documentPath.endsWith( "/" ) )
+             documentPath = documentPath.left( documentPath.length() - 1 );
+         if (documentPath!=QDir::homeDirPath())
+-           m_systemView->insertItem( "folder_green", i18n( "My Documents" ), documentPath, documentPath, nId++, index++ );
++           m_systemView->insertItem( "folder_man", i18n( "My Documents" ), documentPath, documentPath, nId++, index++ );
+     }

+     m_systemView->insertItem( "network", i18n( "Network Folders" ),



++++++ nsplugin-paths.diff ++++++
--- nsplugins/pluginscan.cpp.sav        2007-08-27 17:39:29.000000000 +0200
+++ nsplugins/pluginscan.cpp    2007-08-27 17:40:31.000000000 +0200
@@ -56,6 +56,8 @@
 #include "sdk/npupp.h"
 #include <X11/Intrinsic.h>
 
+#include "plugin_paths.h"
+
 static int showProgress=0;
 
 // provide these symbols when compiling with gcc 3.x
@@ -444,51 +446,6 @@ void scanDirectory( QString dir, QString
 }
 
 
-QStringList getSearchPaths()
-{
-    QStringList searchPaths;
-
-    KConfig *config = new KConfig("kcmnspluginrc", false);
-    config->setGroup("Misc");
-
-    // setup default paths
-    if ( !config->hasKey("scanPaths") ) {
-        QStringList paths;
-        paths.append("$HOME/.mozilla/plugins");
-        paths.append("$HOME/.netscape/plugins");
-        paths.append("/usr/lib/firefox/plugins");
-        paths.append("/usr/lib64/browser-plugins");
-        paths.append("/usr/lib/browser-plugins");
-        paths.append("/usr/local/netscape/plugins");
-        paths.append("/opt/mozilla/plugins");
-       paths.append("/opt/mozilla/lib/plugins");
-        paths.append("/opt/netscape/plugins");
-        paths.append("/opt/netscape/communicator/plugins");
-        paths.append("/usr/lib/netscape/plugins");
-        paths.append("/usr/lib/netscape/plugins-libc5");
-        paths.append("/usr/lib/netscape/plugins-libc6");
-        paths.append("/usr/lib/mozilla/plugins");
-       paths.append("/usr/lib64/netscape/plugins");
-       paths.append("/usr/lib64/mozilla/plugins");
-        paths.append("$MOZILLA_HOME/plugins");
-        config->writeEntry( "scanPaths", paths );
-    }
-
-    // read paths
-    config->setDollarExpansion( true );
-    searchPaths = config->readListEntry( "scanPaths" );
-    delete config;
-
-    // append environment variable NPX_PLUGIN_PATH
-    QStringList envs = QStringList::split(':', getenv("NPX_PLUGIN_PATH"));
-    QStringList::Iterator it;
-    for (it = envs.begin(); it != envs.end(); ++it)
-        searchPaths.append(*it);
-
-    return searchPaths;
-}
-
-
 void writeServicesFile( QStringList mimeTypes )
 {
     QString fname = KGlobal::dirs()->saveLocation("services", "")
--- nsplugins/kcm_nsplugins.cpp.sav     2007-08-27 17:39:29.000000000 +0200
+++ nsplugins/kcm_nsplugins.cpp 2007-08-27 17:48:13.000000000 +0200
@@ -36,6 +36,54 @@
 #include <dcopclient.h>
 #include <kprocio.h>
 
+#include "plugin_paths.h"
+
+static QDateTime lastChanged( QString dir )
+{
+    QDateTime t = QFileInfo( dir ).lastModified();
+    if( t.isNull())
+        return t;
+    QStringList subdirs = QDir( dir ).entryList();
+    for( QStringList::ConstIterator it = subdirs.begin();
+         it != subdirs.end();
+         ++it )
+    {
+        if( *it == "." || *it == ".." )
+            continue;
+        QDateTime t2 = lastChanged( *it );
+        if( !t2.isNull() && t2 > t )
+            t = t2;
+    }
+    return t;
+}
+
+static bool checkSearchPathTimestamps( QStringList paths, QStringList timestamps )
+{
+    QStringList currentTimestamps;
+    bool changed = false;
+    QStringList::ConstIterator t = timestamps.begin();
+    for( QStringList::ConstIterator it = paths.begin();
+         it != paths.end();
+         ++it, ++t )
+    {
+        QDateTime current = lastChanged( *it );
+        // store non-existent directory as "N" string rather than empty string, KConfig
+        // has a bug with storing a list of empty items
+        if( *t == "N" ? !current.isNull() : current != QDateTime::fromString( *t, Qt::ISODate ))
+            changed = true;
+        currentTimestamps.append( current.isNull() ? "N" : current.toString( Qt::ISODate ));
+    }
+    if( changed )
+    {
+        KConfig config("kcmnspluginrc");
+        config.setGroup("Misc");
+        config.writeEntry( "lastSearchPaths", paths );
+        config.writeEntry( "lastSearchTimestamps", currentTimestamps );
+        return true;
+    }
+    return false;
+}
+
 extern "C"
 {
     KDE_EXPORT void init_nsplugin()
@@ -44,6 +92,26 @@ extern "C"
         config->setGroup("Misc");
         bool scan = config->readBoolEntry( "startkdeScan", false );
         bool firstTime = config->readBoolEntry( "firstTime", true );
+        
+        if( !scan )
+        {
+        // check if plugins have changed, as just ignoring everything and requiring the user
+        // to trigger the check manually is not reasonable - that probably actually obsoletes
+        // both options
+            QStringList searchPaths = getSearchPaths();
+            QStringList lastSearchPaths = config->readListEntry( "lastSearchPaths" );
+            QStringList lastTimestamps = config->readListEntry ( "lastSearchTimestamps" );
+            if( searchPaths != lastSearchPaths || lastTimestamps.count() != lastSearchPaths.count())
+            { // count changed, set empty timestamps, still call checkSearchPathTimestamps()
+              // in order to save the current timestamps for the next time
+                lastSearchPaths = searchPaths;
+                lastTimestamps.clear();
+                lastTimestamps.insert( lastTimestamps.end(), searchPaths.count(), "N" );
+                scan = true;
+            }
+            if( checkSearchPathTimestamps( lastSearchPaths, lastTimestamps ))
+                scan = true;
+        }
         delete config;
 
         if ( scan || firstTime )
--- nsplugins/plugin_paths.cpp.sav      2007-08-27 17:40:31.000000000 +0200
+++ nsplugins/plugin_paths.cpp  2007-08-27 17:40:31.000000000 +0200
@@ -0,0 +1,73 @@
+/*
+
+  This application scans for Netscape plugins and create a cache and
+  the necessary mimelnk and service files.
+
+
+  Copyright (c) 2000 Matthias Hoelzer-Kluepfel <hoelzer@xxxxxxx>
+                     Stefan Schimanski <1Stein@xxxxxx>
+
+  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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+*/
+
+#include "plugin_paths.h"
+
+#include <kconfig.h>
+#include <stdlib.h>
+
+QStringList getSearchPaths()
+{
+    QStringList searchPaths;
+
+    KConfig *config = new KConfig("kcmnspluginrc", false);
+    config->setGroup("Misc");
+
+    // setup default paths
+    if ( !config->hasKey("scanPaths") ) {
+        QStringList paths;
+        paths.append("$HOME/.mozilla/plugins");
+        paths.append("$HOME/.netscape/plugins");
+        paths.append("/usr/lib/firefox/plugins");
+        paths.append("/usr/lib64/browser-plugins");
+        paths.append("/usr/lib/browser-plugins");
+        paths.append("/usr/local/netscape/plugins");
+        paths.append("/opt/mozilla/plugins");
+        paths.append("/opt/mozilla/lib/plugins");
+        paths.append("/opt/netscape/plugins");
+        paths.append("/opt/netscape/communicator/plugins");
+        paths.append("/usr/lib/netscape/plugins");
+        paths.append("/usr/lib/netscape/plugins-libc5");
+        paths.append("/usr/lib/netscape/plugins-libc6");
+        paths.append("/usr/lib/mozilla/plugins");
+        paths.append("/usr/lib64/netscape/plugins");
+        paths.append("/usr/lib64/mozilla/plugins");
+        paths.append("$MOZILLA_HOME/plugins");
+        config->writeEntry( "scanPaths", paths );
+    }
+
+    // read paths
+    config->setDollarExpansion( true );
+    searchPaths = config->readListEntry( "scanPaths" );
+    delete config;
+
+    // append environment variable NPX_PLUGIN_PATH
+    QStringList envs = QStringList::split(':', getenv("NPX_PLUGIN_PATH"));
+    QStringList::Iterator it;
+    for (it = envs.begin(); it != envs.end(); ++it)
+        searchPaths.append(*it);
+
+    return searchPaths;
+}
--- nsplugins/plugin_paths.h.sav        2007-08-27 17:40:31.000000000 +0200
+++ nsplugins/plugin_paths.h    2007-08-27 17:40:31.000000000 +0200
@@ -0,0 +1,8 @@
+#ifndef PLUGIN_PATHS_H
+#define PLUGIN_PATHS_H
+
+#include <qstringlist.h>
+
+extern QStringList getSearchPaths();
+
+#endif
--- nsplugins/Makefile.am.sav   2007-08-27 17:39:40.000000000 +0200
+++ nsplugins/Makefile.am       2007-08-27 17:40:31.000000000 +0200
@@ -14,11 +14,11 @@ libnsplugin_la_LDFLAGS = $(all_libraries
 libnsplugin_la_LIBADD  = -lkparts
 
 bin_PROGRAMS = nspluginscan
-nspluginscan_SOURCES = pluginscan.cpp
+nspluginscan_SOURCES = pluginscan.cpp plugin_paths.cpp
 nspluginscan_LDFLAGS =  $(KDE_RPATH) $(all_libraries) -export-dynamic
 nspluginscan_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lXt
 
-kcm_nsplugins_la_SOURCES = kcm_nsplugins.cpp
+kcm_nsplugins_la_SOURCES = kcm_nsplugins.cpp plugin_paths.cpp
 kcm_nsplugins_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kcm_nsplugins_la_LIBADD = $(LIB_KDECORE)
 





++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >