Fix a Crash when using All Files.. as name and default() returns 0l

Fix a Crash in reparse when the chooser is not yet initialized

1 files changed, 7 insertions, 7 deletions

diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index 7f38f5b..4ab744c 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -225,52 +225,52 @@ void OFileSelector::setCaseSensetive(bool caSe )
 
   if ( m_selector != Fileselector )
       reparse();
 }
 void OFileSelector::setShowFiles(bool show )
 {
   m_files = show;
   reparse();
 }
 ///
 bool OFileSelector::cd(const QString &path )
 {
   m_currentDir = path;
   reparse();
   return true;
 }
 void OFileSelector::setSelector(int mode )
 {
   QString text;
   switch( mode ){
   case Normal:
     text = tr("Documents");
     break;
   case Extended:
-    text = tr("Files");
+    text = tr("List View");
     break;
   case ExtendedAll:
-    text = tr("All Files");
+    text = tr("All List View");
     break;
   }
   slotViewCheck( text );
 }
 
 void OFileSelector::setPopupFactory(OPopupMenuFactory */*popup*/ )
 {
 /*  m_custom = popup;
   m_showPopup = true;
 */
 }
 
 //void OFileSelector::updateL
 
 QString OFileSelector::selectedName() const
 {
   QString name;
   if( m_selector == Normal ){
       DocLnk lnk = m_select->selectedDocument();
       name = lnk.file();
   }else {
       if ( m_shLne ) {
           name = m_currentDir + "/" +m_edit->text();
       }else{
@@ -445,73 +445,72 @@ void OFileSelector::slotInsertLocationPath(const QString &currentPath, int count
 }
 /*
  * Do not crash anymore
  * don't try to change dir to a file
  */
 void OFileSelector::locationComboChanged()
 {
     QFileInfo info( m_location->lineEdit()->text() );
     qWarning("info %s %s", info.dirPath(true).latin1(), m_location->lineEdit()->text().latin1() );
     if (info.isFile() )
         cd(info.dirPath(TRUE) ); //absolute path
     else
         cd( m_location->lineEdit()->text() );
 
     reparse();
 }
 void OFileSelector::init()
 {
   initFactory();
   m_lay = new QVBoxLayout( this );
   m_lay->setSpacing(0 );
 
   /* take care of the main view... */
   initToolbar();
+  //if( m_shChooser ) // the Chooser for the view and Mimetypes
+  initializeChooser();
 
   /* initialize the file lister */
   if( m_selector == Normal ){
       QString mime;
       if (!m_autoMime) {
           if (!m_mimetypes.isEmpty() ) {
               QMap<QString, QStringList>::Iterator it;
               it = m_mimetypes.begin(); // cause we're in the init
               mime = it.data().join(";");
           }
       }
       initializeOldSelector();
   }else{
       initializeView();
   }
 
   if( m_shLne ) // the LineEdit with the current FileName
       initializeName();
 
   if( m_shPerm ) // the Permission QCheckBox
       initializePerm();
 
-  if( m_shChooser ) // the Chooser for the view and Mimetypes
-      initializeChooser();
-
   if( m_shYesNo ) // the Yes No button row
       initializeYes( );
 
   if (m_selector != Normal )
       reparse();
 }
 void OFileSelector::updateMimes()
 {
   if( m_autoMime ){
     m_mimetypes.clear();
     m_mimetypes.insert( tr("All"), QString::null );
     if( m_selector == Normal ){
       DocLnkSet  set;
       Global::findDocuments(&set, QString::null );
       QListIterator<DocLnk> dit( set.children() );
       for( ; dit.current(); ++dit ){
 	if( !m_mimetypes.contains( (*dit)->type() ) )
 	  m_mimetypes.insert( (*dit)->type(), (*dit)->type() );
       }
     }// else done in reparse
   }
 }
 void OFileSelector::initVars()
 {
@@ -935,48 +934,49 @@ void OFileSelector::setLister(const QString& lister) {
 
     if (listerList.contains(lister) ) {
         delete (OLister*) m_lister;
         m_lister = factory()->lister( lister, this );
     }else if (!m_lister ) {
         /*
          * if we do not have a lister
          * we need to take the default one
          */
         m_lister = new OLocalLister(this);
     }
     m_listerName = lister;
 }
 void OFileSelector::setView( const QString& lis ) {
     qWarning("setView ");
     fillList();
     if ( lis == tr("Documents") ) {
         m_selector = Normal;
         delete m_lister;
         delete m_fileView;
         m_lister = 0l;
         m_fileView = 0l;
         initializeOldSelector();
     }else {
+        qWarning("lis %s", lis.latin1() );
         QString list;
 
         delete m_lister;
         delete m_fileView;
         delete m_select;
         m_lister =0l;
         m_fileView = 0l;
         m_select = 0l;
         if ( lis.startsWith("All") ) {
             m_selector = ExtendedAll;
             list = lis.mid(4 ).stripWhiteSpace();
         } else{
             list = lis;
             m_selector = Extended;
         }
         setLister(m_listerName);
         m_fileView = factory()->view( list, this, m_mainView );
         m_mainView->setWidget( m_fileView->widget() );
         reparse();
     }
 }
 /*
  * the factory
  */
@@ -1071,30 +1071,30 @@ void OFileSelector::initializeOldSelector() {
 				 m_mainView, "fileselector",
 				 FALSE, FALSE);
     m_select->setCategorySelectVisible( FALSE );
     m_select->setTypeComboVisible( FALSE );
 
     connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ),
 	    this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) );
     connect(m_select, SIGNAL(closeMe() ),
 	    this, SIGNAL(closeMe() ) );
     //connect to close me and other signals as well
     m_mainView->setWidget( m_select );
 }
 /*
  * initialize the listview
  * we will call fillList
  * setLister
  * with QString::null to get the default
  * setView with either Files or All Files
  * depending on Extended
  */
 void OFileSelector::initializeView() {
     setLister(QString::null);
     fillList();
     if (m_selector == Extended ) {
-        setView( tr("Files") );
+        setView( tr("List View") );
     }else{
-        setView( tr("All Files") );
+        setView( tr("All List View") );
     }
 }