[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: kdebase/kcontrol/konqhtml
From:       Laurent Montel <montel () kde ! org>
Date:       2004-03-18 11:24:22
Message-ID: 200403181224.22517.montel () kde ! org
[Download RAW message or body]

Le Thursday 18 March 2004 12:13, George Staikos a écrit :
> On Thursday 18 March 2004 06:07, Laurent Montel wrote:
> > keep sync with kdebase/nsplugins/pluginscan
> >
> >
> >   M +7 -3      pluginopts.cpp   1.40
> >
> >
> > --- kdebase/kcontrol/konqhtml/pluginopts.cpp  #1.39:1.40
> > @@ -351,8 +352,11 @@ void KPluginOptions::dirLoad( KConfig *c
> >      if ( config->hasKey( "scanPaths" ) )
> >          paths = config->readListEntry( "scanPaths" );
> > -    else {
> > +    else {//keep sync with kdebase/nsplugins/pluginscan
> >          paths.append("$HOME/.netscape/plugins");
> > +        paths.append("/usr/lib64/browser-plugins");
> > +        paths.append("/usr/lib/browser-plugins");
>
>    This is just asking for trouble I think.  What happens when
> nspluginviewer picks the wrong architecture and tries to load the plugin?

Before there is already lib64 path (I just sync with 
kdebase/nsplugins/pluginscan) :
        paths.append("$HOME/.netscape/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");

Perhaps we can add a test on arch to add or not these entries.

I don't know if KDE have a variable to define if we used AMD64/IA64 etc.
Reagrds.
[prev in list] [next in list] [prev in thread] [next in thread]