Hello community,
here is the log from the commit of package mozilla-xulrunner191-kde4 for openSUSE:Factory
checked in at Mon Nov 16 16:04:56 CET 2009.
--------
--- mozilla-xulrunner191-kde4/mozilla-xulrunner191-kde4.changes 2009-09-17 08:12:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/mozilla-xulrunner191-kde4/mozilla-xulrunner191-kde4.changes 2009-11-11 14:30:59.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Nov 11 13:10:18 CET 2009 - llunak@novell.com
+
+- 0.5.2, fix file dialog resetting icon size (bnc#546490)
+ and file dialog for multiple files not working (bnc#548267)
+
+-------------------------------------------------------------------
+Mon Oct 19 21:00:22 CEST 2009 - llunak@novell.com
+
+- version 0.5.1, compile also with older KDE4 versions
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kmozillahelper-0.5.tar.bz2
New:
----
kmozillahelper-0.5.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-xulrunner191-kde4.spec ++++++
--- /var/tmp/diff_new_pack.nLPzXZ/_old 2009-11-16 16:03:36.000000000 +0100
+++ /var/tmp/diff_new_pack.nLPzXZ/_new 2009-11-16 16:03:36.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package mozilla-xulrunner191-kde4 (Version 0.5)
+# spec file for package mozilla-xulrunner191-kde4 (Version 0.5.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
Group: System/GUI/KDE
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Mozilla KDE Integration
-Version: 0.5
+Version: 0.5.2
Release: 1
Source: kmozillahelper-%{version}.tar.bz2
Supplements: packageand(mozilla-xulrunner191:kdebase4-workspace)
++++++ kmozillahelper-0.5.tar.bz2 -> kmozillahelper-0.5.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmozillahelper/main.cpp new/kmozillahelper/main.cpp
--- old/kmozillahelper/main.cpp 2009-09-11 08:52:21.000000000 +0200
+++ new/kmozillahelper/main.cpp 2009-11-11 14:25:44.000000000 +0100
@@ -30,6 +30,9 @@
#include
#include
#include
+#include
+#include
+#include
#include
#include
#include
@@ -52,9 +55,13 @@
int main( int argc, char* argv[] )
{
KAboutData about( "kmozillahelper", "kdelibs4", ki18n( "KMozillaHelper" ), APP_HELPER_VERSION );
+#if KDE_IS_VERSION( 4, 1, 0 )
about.setProgramIconName( "firefox" ); // TODO what about other mozilla apps?
+#endif
KCmdLineArgs::init( argc, argv, &about );
App app;
+ app.disableSessionManagement();
+ app.setQuitOnLastWindowClosed( false );
return app.exec();
}
@@ -286,7 +293,7 @@
bool App::handleGetOpenX( bool url )
{
- if( !readArguments( 3 ))
+ if( !readArguments( 4 ))
return false;
QString startDir = getArgument();
QString filter = getArgument();
@@ -328,7 +335,7 @@
{
outputLine( QString::number( dialog.filterWidget()->currentIndex()));
foreach( const KUrl& str, result )
- outputLine( str.url());
+ outputLine( str.toLocalFile());
return true;
}
}
@@ -337,7 +344,7 @@
bool App::handleGetSaveX( bool url )
{
- if( !readArguments( 3 ))
+ if( !readArguments( 4 ))
return false;
QString startDir = getArgument();
QString filter = getArgument();
@@ -352,7 +359,6 @@
dialog.setMode( ( url ? KFile::Mode( 0 ) : KFile::LocalOnly ) | KFile::File );
#if KDE_IS_VERSION( 4, 2, 0 )
dialog.setConfirmOverwrite( true );
- dialog.setInlinePreviewShown( true ); // TODO
#endif
if( title.isEmpty())
title = i18n( "Save As" );
@@ -368,6 +374,17 @@
KUrl result = dialog.selectedUrl();
if( result.isValid())
{
+#if !KDE_IS_VERSION( 4, 2, 0 )
+ KIO::StatJob* job = KIO::stat( result, KIO::HideProgressInfo );
+ if( KIO::NetAccess::synchronousRun( job, NULL )
+ && KMessageBox::warningContinueCancelWId( wid,
+ i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?",
+ result.fileName()), i18n( "Overwrite File?" ), KGuiItem( i18n( "Overwrite" )))
+ == KMessageBox::Cancel )
+ {
+ return false;
+ }
+#endif
outputLine( QString::number( dialog.filterWidget()->currentIndex()));
outputLine( result.url());
return true;
@@ -378,6 +395,16 @@
QString result = dialog.selectedFile();
if( !result.isEmpty())
{
+#if !KDE_IS_VERSION( 4, 2, 0 )
+ if( QFile::exists( result )
+ && KMessageBox::warningContinueCancelWId( wid,
+ i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?",
+ result ), i18n( "Overwrite File?" ), KGuiItem( i18n( "Overwrite" )))
+ == KMessageBox::Cancel )
+ {
+ return false;
+ }
+#endif
KRecentDocument::add( result );
outputLine( QString::number( dialog.filterWidget()->currentIndex()));
outputLine( KUrl( result ).url());
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
