Date: Thu, 18 Jul 2002 14:29:16 +0200 (CEST) From: Tilman Linneweh <tilman@arved.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tilman@arved.de Subject: ports/40731: [Maintainer Fix] ftp/kbear Message-ID: <200207181229.g6ICTGqs055240@tl.kom.tuwien.ac.at>
next in thread | raw e-mail | index | archive | help
Note: There was a bad value `maintainer-bug' for the field `>Class:'.
It was set to the default value of `sw-bug'.
>Number: 40731
>Category: ports
>Synopsis: [Maintainer Fix] ftp/kbear
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 18 05:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Tilman Linneweh
>Release: FreeBSD 4.6-PRERELEASE i386
>Organization:
Vienna University of Technology
>Environment:
System: FreeBSD tl.kom.tuwien.ac.at 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #1: Fri May 3 16:38:54 CEST 2002 tilman@tl.kom.tuwien.ac.at:/usr/obj/usr/src/sys/MYKERNEL i386
>Description:
This fixes the crash of kbear, if clicking on a mp3 file.
Obtained from: kbear Author.
>How-To-Repeat:
>Fix:
--- kbear.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/kbear/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 17 Jul 2002 15:42:36 -0000 1.2
+++ Makefile 18 Jul 2002 12:24:01 -0000
@@ -6,6 +6,7 @@
PORTNAME= kbear
PORTVERSION= 2.0.b.1
+PORTREVISION= 1
CATEGORIES= ftp kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
Index: files/patch-kbeardirlister
===================================================================
RCS file: files/patch-kbeardirlister
diff -N files/patch-kbeardirlister
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-kbeardirlister 18 Jul 2002 10:46:45 -0000
@@ -0,0 +1,90 @@
+--- kbear/parts/filesyspart/kbeardirlister.cpp Thu Jun 20 18:51:32 2002
++++ kbear/parts/filesyspart/kbeardirlister.cpp Wed Jul 17 10:18:18 2002
+@@ -30,16 +30,17 @@
+ #include <kdirlister.h>
+ #include <kapplication.h>
+ #include <kdirwatch.h>
+ #include <kconfig.h>
+ #include <kio/slave.h>
+ #include <kio/scheduler.h>
+ #include <kparts/part.h>
+ #include <kparts/componentfactory.h>
++#include <ktrader.h>
+ #include <kdebug.h>
+ //////////////////////////////////////////////////////////////////////
+ // Application specific include files
+ #include "kbeardirlister.h"
+ #include "../../base/kbearlistjob.h"
+ #include "../../base/kbeardeletejob.h"
+ #include "../../base/kbearconnectionmanager.h"
+
+@@ -98,34 +99,40 @@
+ }
+ //-----------------------------------------------
+ KParts::ReadOnlyPart* KBearDirLister::getPreviewPartInternal( const QString& mime ) {
+ kdDebug()<<"KBearDirLister::getPreviewPartInternal() mime in="<<mime<<endl;
+ // first we need to find out if user want ReadOnly, ReadWrite or want to be asked
+ QString oldGroup = kapp->config()->group();
+ kapp->config()->setGroup("General");
+ unsigned int viewMode = kapp->config()->readUnsignedNumEntry( "Preview Mode", 0 );
++
+ if( viewMode == 2 ) { // Ask
+ int ret = KMessageBox::questionYesNoCancel( 0L, i18n( "Do you want to open the file in read only mode or in read/write mode ?"),
+ i18n("Select view mode..."), KGuiItem(i18n("Read only")), KGuiItem(i18n("Read/write")) );
+ if( ret == KMessageBox::Cancel )
+ m_partViewer = (KParts::ReadOnlyPart*)1;
+ else if( ret == KMessageBox::No )
+ viewMode = 1; // ReadWrite
+ }
++
++ QObject* obj = 0L;
+ if( viewMode == 1 ) { // ReadWrite
+- m_partViewer = KParts::ComponentFactory::
+- createPartInstanceFromQuery<KParts::ReadWritePart>
+- ( mime, QString::null, m_partViewerWidget, "PreviewWidget", m_partViewerWidget, "PreviewPart" );
+- }
+- if( ! m_partViewer ) { // ReadOnly
+- m_partViewer = KParts::ComponentFactory::
+- createPartInstanceFromQuery<KParts::ReadOnlyPart>
+- ( mime, QString::null, m_partViewerWidget, "PreviewWidget", m_partViewerWidget, "PreviewPart" );
++ obj = KParts::ComponentFactory::
++ createInstanceFromQuery<KParts::ReadWritePart>
++ ( mime, QString::null, m_partViewerWidget, "PreviewPart" );
++ }
++ if( ! obj ) { // ReadOnly
++ obj = KParts::ComponentFactory::
++ createInstanceFromQuery<KParts::ReadOnlyPart>
++ ( mime, QString::null, m_partViewerWidget, "PreviewPart" );
+ }
++ if( obj )
++ m_partViewer = dynamic_cast<KParts::ReadOnlyPart*>( obj );
++
+ kapp->config()->setGroup( oldGroup );
+ return m_partViewer;
+ }
+ //-----------------------------------------------
+ KParts::ReadOnlyPart* KBearDirLister::getPreviewPart( const KURL& url, QWidget* parent ) {
+ kdDebug()<<"KBearDirLister::getPreviewPart url="<<url.prettyURL()<<endl;
+ m_previewURL = url;
+ m_mime = QString::null;
+@@ -173,18 +180,18 @@
+ KMessageBox::detailedError( 0L, list[1], list[2], list[0] );
+ }
+ m_mime = "error";
+ }
+ //-----------------------------------------------
+ void KBearDirLister::slotMimeType( KIO::Job*, const QString& mime ) {
+ kdDebug()<<"KBearDirLister::slotMimeType() mime="<<mime<<endl;
+ m_partViewer = getPreviewPartInternal( mime );
+- if( (int)m_partViewer > 1 ) {
+- connectionManager->putOnHold( (unsigned long)this );
++ if( m_partViewer && (int)m_partViewer > 1 ) {
++ connectionManager->putOnHold( (unsigned long)this );
+ connect( m_slave, SIGNAL( infoMessage( const QString& ) ),
+ this, SIGNAL( infoMessage( const QString& ) ) );
+ }
+ m_mime = mime;
+ }
+ //-----------------------------------------------
+ void KBearDirLister::slotDisconnectSlaveInfo() {
+ disconnect( m_slave, SIGNAL( infoMessage( const QString& ) ),
--- kbear.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207181229.g6ICTGqs055240>