2 files changed, 13 insertions, 5 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index df55b2d..1eb537f 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -2,53 +2,50 @@ Stuff todo until OPIE 1.0 :
 ===========================
 
 Feature requests:
 -----------------
 - Dial by mobile phone by tapping the number.. 
   (Maybe using gsmtool. And we may
         add a library class for this)
 - dial with dtmfdial incase it's installed and there's no mobile
 - 3rd column for 2. Contact
 - Implementing additional Views (Phonebook, ...)
 - Birthday & Anniversary Reminder
 - Plugin for Today for Birthdays and Anniversaries
 - Beaming of multiple contacts (current list/ by search or by category)
 
 Known Bugs:
 -----------
-- Language not English (tested with german opie-translation): 
-        1. Configure nicht übersetzt (alles leer).
-        2. Contacteditor nur teilweise übersetzt.
-        3. Kategorie-Picker geht nicht.
 
 
 Bugs but not in addressbook:
 -----------------------------
 - VCARD: If umlaut (äöüß) in address, the parser gets confused..
 
 - Exporting and reimporting of Jobtitle was reported to fail (Could not reproduce this ! (se))
 
 
 Urgent:
 --------
 ContactEditor:
 - Contact-Editor is temporarely reenabled. Wait for replacement.
 - Redesign of Contacteditor
 - Store last settings of combo-boxes
 - Category is on the wrong position after changing to personal and back to normal
         ( Temporarily workaround: Category is never deactivated.. :S )
+
 - Personal and Business Web-page is not editable 
 
 Important:
 ----------
 
 - Implement a picker/combo for the default email.
 - After search (Started with Return): KeyFocus should be on Tabelle
 
 - "What's this" should be added (Deleyed after Feature Freeze)
 
 Less important:
 ---------------
 - Reload if contacts were changed externally
 - Overview window cleanup needed..
 - The picker (alphabetical sort widget) should be
    placed verticaly or horizontally (configurable)
@@ -94,16 +91,20 @@ Fixed:
 - Unfiled shown just in Category "All" and "Unfiled". 
 - After finising search and after Edit: Clear Picker
 - After Edit: Table position back to edited entry.
 - Optimize Table Update...
 - Change MyDialog to Config
 - Store position and state of toolbar
 - Searchwidget closed: Selected user is jumping
 - Wenn suchen beendet, dann dauert das Tabellenupdate (was überhaupt überflüssig ist)
         zu lange..
 - VCARD: Import of Anniversary does not work correctly (currently disabled)
 - Name order selected in "contacteditor" not used in list view.
 - OK-Key does not switch from Detailview (ablable) to Listview
 - Receiving of beams should open a dialog
 - Fix start of opie-mail
 - Implement Button Pics
 - Add a dialog to accept and optionally edit  received contacts by IRDA. 
+- Language not English (tested with german opie-translation): 
+        1. Configure nicht übersetzt (alles leer).
+        2. Contacteditor nur teilweise übersetzt.
+        3. Kategorie-Picker geht nicht.
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 161b163..93e57ca 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -140,32 +140,33 @@ OContact AbView::currentEntry()
 
 bool AbView::save()
 {
         qWarning("abView:Save data");
 
         return m_contactdb->save();
 }
 
 void AbView::load()
 {
         qWarning("abView:Load data");
 
         // Letter Search is stopped at this place
         emit signalClearLetterPicker();
 
         if ( m_inPersonal )
+                // VCard Backend does not sort.. 
                 m_list = m_contactdb->allRecords();
         else{
                 m_list = m_contactdb->sorted( true, 0, 0, 0 );
                 clearForCategory();
         }
 
         qWarning ("Number of contacts: %d", m_list.count());
 
         updateView( true );
 
 }
 
 void AbView::reload()
 {
         qWarning( "void AbView::reload()" );
 
@@ -212,34 +213,40 @@ void AbView::setShowToView( Views view )
                 m_prev_View = m_curr_View;
                 m_curr_View = view;
 
                 updateView();
         }
 
 }
 
 void AbView::setShowByLetter( char c )
 {
         qWarning("void AbView::setShowByLetter( %c )", c );
         OContact query;
         if ( c == 0 ){
                 load();
                 return;
         }else{
+                // If the current Backend is unable to solve the query, we will 
+                // ignore the request ..
+                if ( ! m_contactdb->hasQuerySettings( OContactAccess::WildCards | OContactAccess::IgnoreCase ) ){
+                        return;
+                }
+
                 query.setLastName( QString("%1*").arg(c) );
-                m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards );
+                m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase );
                 clearForCategory();
                 m_curr_Contact = 0;
         }
         updateView( true );
 }
 
 void AbView::setListOrder( const QValueList<int>& ordered )
 {
         m_orderedFields = ordered;
         updateView();
 }
 
 
 QString AbView::showCategory() const
 {
         return mCat.label( "Contacts", m_curr_category );