3 files changed, 16 insertions, 14 deletions

diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index 3b2a6b7..a7d271f 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -96,9 +96,9 @@ void ResourceOpie::init( const QString &fileName )
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 */
   //US opie addressbook is always readonly
-  setReadOnly( true );
+//US  setReadOnly( true );
 
   setFileName( fileName );
  
 }
@@ -111,9 +111,9 @@ ResourceOpie::~ResourceOpie()
 
 void ResourceOpie::writeConfig( KConfig *config )
 {
   //US opie addressbook is always readonly
-  setReadOnly( true );
+//US  setReadOnly( true );
 
   Resource::writeConfig( config );
 
   config->writeEntry( "FileName", mFileName );
@@ -193,15 +193,25 @@ bool ResourceOpie::load()
   }
   
   access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
 
+  bool res = false;
   if (mConverter == 0)
+  {
     mConverter = new OpieConverter();
+    res = mConverter->init();
+    if ( !res )
+    {
+      qDebug("Unable to initialize opie converter. Most likely a problem with the category file");
+      addressBook()->error( i18n( "Unable to initialize opie converter. Most likely a problem with the category file" ) );
+      delete access;
+      return false;
+    }
+  }
 
 
 	OContactAccess::List::Iterator it;
   OContactAccess::List allList = access->allRecords();
-  bool res = false;
   for ( it = allList.begin(); it != allList.end(); ++it )
   {
     OContact c = (*it);
     
diff --git a/kabc/plugins/opie/resourceopieconfig.cpp b/kabc/plugins/opie/resourceopieconfig.cpp
index f4cc4f9..eef9cc9 100644
--- a/kabc/plugins/opie/resourceopieconfig.cpp
+++ b/kabc/plugins/opie/resourceopieconfig.cpp
@@ -61,17 +61,9 @@ ResourceOpieConfig::ResourceOpieConfig( QWidget* parent,  const char* name )
            SLOT( checkFilePermissions( const QString & ) ) );
 
   mainLayout->addWidget( label, 0, 0 );
   mainLayout->addWidget( mFileNameEdit, 0, 1 );
-
-//US  mInEditMode = false;
-}
-/*US
-void ResourceOpieConfig::setEditMode( bool value )
-{
-  mInEditMode = value;
 }
-*/
 
 void ResourceOpieConfig::loadSettings( KRES::Resource *res  )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
@@ -84,8 +76,11 @@ void ResourceOpieConfig::loadSettings( KRES::Resource *res  )
 
   mFileNameEdit->setURL( resource->fileName() );
   if ( mFileNameEdit->url().isEmpty() )
     mFileNameEdit->setURL( QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml" );
+    
+  //US Opie resources are ReadOnly by definition
+  emit setPersistentReadOnly( true );
 }
 
 void ResourceOpieConfig::saveSettings( KRES::Resource *res )
 {
diff --git a/kabc/plugins/opie/resourceopieconfig.h b/kabc/plugins/opie/resourceopieconfig.h
index 533b7f4..8cc192c 100644
--- a/kabc/plugins/opie/resourceopieconfig.h
+++ b/kabc/plugins/opie/resourceopieconfig.h
@@ -41,10 +41,8 @@ class ResourceOpieConfig : public KRES::ConfigWidget
 
 public:
   ResourceOpieConfig( QWidget* parent = 0, const char* name = 0 );
 
-//US  void setEditMode( bool value );
-
 public slots:
   void loadSettings( KRES::Resource *resource );
   void saveSettings( KRES::Resource *resource );
 
@@ -52,9 +50,8 @@ protected slots:
   void checkFilePermissions( const QString& fileName );
 
 private:
   KURLRequester* mFileNameEdit;
-//US  bool mInEditMode;
 };
 
 }