From owner-freebsd-ports Thu Jul 18 5:30:21 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D3D637B400 for ; Thu, 18 Jul 2002 05:30:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEFBA43E65 for ; Thu, 18 Jul 2002 05:30:07 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ICU7JU053068 for ; Thu, 18 Jul 2002 05:30:07 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ICU7be053067; Thu, 18 Jul 2002 05:30:07 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61F6837B400 for ; Thu, 18 Jul 2002 05:29:24 -0700 (PDT) Received: from tl.kom.tuwien.ac.at (tl.kom.tuwien.ac.at [128.130.34.35]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EE5D43E67 for ; Thu, 18 Jul 2002 05:29:23 -0700 (PDT) (envelope-from tilman@tl.kom.tuwien.ac.at) Received: from tl.kom.tuwien.ac.at (localhost [127.0.0.1]) by tl.kom.tuwien.ac.at (8.12.2/8.12.2) with ESMTP id g6ICTHxE055241; Thu, 18 Jul 2002 14:29:17 +0200 (CEST) (envelope-from tilman@tl.kom.tuwien.ac.at) Received: (from tilman@localhost) by tl.kom.tuwien.ac.at (8.12.5/8.12.2/Submit) id g6ICTGqs055240; Thu, 18 Jul 2002 14:29:16 +0200 (CEST) Message-Id: <200207181229.g6ICTGqs055240@tl.kom.tuwien.ac.at> Date: Thu, 18 Jul 2002 14:29:16 +0200 (CEST) From: Tilman Linneweh Reply-To: Tilman Linneweh To: FreeBSD-gnats-submit@FreeBSD.org Cc: tilman@arved.de X-Send-Pr-Version: 3.113 Subject: ports/40731: [Maintainer Fix] ftp/kbear Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org 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 + #include + #include + #include + #include + #include + #include + #include ++#include + #include + ////////////////////////////////////////////////////////////////////// + // 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="<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 +- ( mime, QString::null, m_partViewerWidget, "PreviewWidget", m_partViewerWidget, "PreviewPart" ); +- } +- if( ! m_partViewer ) { // ReadOnly +- m_partViewer = KParts::ComponentFactory:: +- createPartInstanceFromQuery +- ( mime, QString::null, m_partViewerWidget, "PreviewWidget", m_partViewerWidget, "PreviewPart" ); ++ obj = KParts::ComponentFactory:: ++ createInstanceFromQuery ++ ( mime, QString::null, m_partViewerWidget, "PreviewPart" ); ++ } ++ if( ! obj ) { // ReadOnly ++ obj = KParts::ComponentFactory:: ++ createInstanceFromQuery ++ ( mime, QString::null, m_partViewerWidget, "PreviewPart" ); + } ++ if( obj ) ++ m_partViewer = dynamic_cast( obj ); ++ + kapp->config()->setGroup( oldGroup ); + return m_partViewer; + } + //----------------------------------------------- + KParts::ReadOnlyPart* KBearDirLister::getPreviewPart( const KURL& url, QWidget* parent ) { + kdDebug()<<"KBearDirLister::getPreviewPart url="<