Hello community, here is the log from the commit of package mozilla-kde4-integration for openSUSE:Factory checked in at 2012-09-13 00:05:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozilla-kde4-integration (Old) and /work/SRC/openSUSE:Factory/.mozilla-kde4-integration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozilla-kde4-integration", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mozilla-kde4-integration/mozilla-kde4-integration.changes 2011-12-07 14:38:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mozilla-kde4-integration.new/mozilla-kde4-integration.changes 2012-09-13 00:05:19.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 11 06:09:47 UTC 2012 - [email protected] + +- update to version 0.6.4 + * filedialog doesn't handle local url correctly (bnc#722994) + * API addition (bnc#777415) + make use of "--select" argument provided by dolphin and konqueror + +------------------------------------------------------------------- Old: ---- kmozillahelper-0.6.3.tar.bz2 New: ---- kmozillahelper-0.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-kde4-integration.spec ++++++ --- /var/tmp/diff_new_pack.6ijDdF/_old 2012-09-13 00:05:20.000000000 +0200 +++ /var/tmp/diff_new_pack.6ijDdF/_new 2012-09-13 00:05:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mozilla-kde4-integration # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,13 @@ # - Name: mozilla-kde4-integration BuildRequires: libkde4-devel +Summary: Mozilla KDE Integration License: MIT Group: System/GUI/KDE -Summary: Mozilla KDE Integration -Version: 0.6.3 -Release: 1 +Version: 0.6.4 +Release: 0 Source: kmozillahelper-%{version}.tar.bz2 Supplements: packageand(MozillaFirefox:kdebase4-workspace) # this is needed to match this package with the main package without the main package ++++++ kmozillahelper-0.6.3.tar.bz2 -> kmozillahelper-0.6.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmozillahelper/main.cpp new/kmozillahelper/main.cpp --- old/kmozillahelper/main.cpp 2011-01-20 15:24:01.000000000 +0100 +++ new/kmozillahelper/main.cpp 2012-09-11 13:21:34.000000000 +0200 @@ -44,13 +44,14 @@ #include <kshell.h> #include <kstandarddirs.h> #include <kwindowsystem.h> +#include <kprocess.h> #include <stdio.h> #include <unistd.h> //#define DEBUG_KDE #define HELPER_VERSION 6 -#define APP_HELPER_VERSION "0.6.3" +#define APP_HELPER_VERSION "0.6.4" int main( int argc, char* argv[] ) { @@ -119,6 +120,8 @@ status = handleGetDirectoryX( true ); else if( command == "OPEN" ) status = handleOpen(); + else if( command == "REVEAL" ) + status = handleReveal(); else if( command == "RUN" ) status = handleRun(); else if( command == "GETDEFAULTFEEDREADER" ) @@ -338,7 +341,10 @@ { outputLine( QString::number( dialog.filterWidget()->currentIndex())); foreach( const KUrl& str, result ) - outputLine( str.toLocalFile()); + { + KUrl newUrl = KIO::NetAccess::mostLocalUrl(str, NULL); + outputLine( newUrl.toLocalFile() ); + } return true; } } @@ -465,6 +471,32 @@ } } +bool App::handleReveal() + { + if( !readArguments( 1 )) + return false; + QString path = getArgument(); + if( !allArgumentsUsed()) + return false; + KApplication::updateUserTimestamp( 0 ); // TODO + const KService::List apps = KMimeTypeTrader::self()->query("inode/directory", "Application"); + if (apps.size() != 0) + { + QString command = apps.at(0)->exec().split( " " ).first(); // only the actual command + if (command == "dolphin" || command == "konqueror") + { + command = KStandardDirs::findExe( command ); + if( command.isEmpty()) + return false; + return KProcess::startDetached(command, QStringList() << "--select" << path); + } + } + QFileInfo info(path); + QString dir = info.dir().path(); + (void) new KRun( KUrl(dir), NULL ); // TODO parent + return true; // TODO check for errors? + } + bool App::handleRun() { if( !readArguments( 2 )) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmozillahelper/main.h new/kmozillahelper/main.h --- old/kmozillahelper/main.h 2009-09-10 23:22:21.000000000 +0200 +++ new/kmozillahelper/main.h 2012-09-11 08:02:34.000000000 +0200 @@ -47,6 +47,7 @@ bool handleGetSaveX( bool url ); bool handleGetDirectoryX( bool url ); bool handleOpen(); + bool handleReveal(); bool handleRun(); bool handleGetDefaultFeedReader(); bool handleOpenMail(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
