Merging changes in BRANCH_1_0 into HEAD

7 files changed, 15 insertions, 9 deletions

diff --git a/core/pim/today/plugins/addressbook/addressplugin.cpp b/core/pim/today/plugins/addressbook/addressplugin.cpp
index a70f8d8..5d5d34c 100644
--- a/core/pim/today/plugins/addressbook/addressplugin.cpp
+++ b/core/pim/today/plugins/addressbook/addressplugin.cpp
@@ -67,3 +67,8 @@ void AddressBookPlugin::refresh()
 {
     m_abWidget->refresh( NULL );
 }
+
+void AddressBookPlugin::reinitialize()
+{
+    m_abWidget->reinitialize();
+}
diff --git a/core/pim/today/plugins/addressbook/addressplugin.h b/core/pim/today/plugins/addressbook/addressplugin.h
index 04e4faf..0b3b065 100644
--- a/core/pim/today/plugins/addressbook/addressplugin.h
+++ b/core/pim/today/plugins/addressbook/addressplugin.h
@@ -42,6 +42,7 @@ public:
     QString appName() const;
     bool excludeFromRefresh() const;
     void refresh();
+    void reinitialize();
 
  private:
     AddressBookPluginWidget* m_abWidget; 
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index 9c65e7d..b79c679 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -78,7 +78,6 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     SpinDaysClip->setMaxValue( 200 );
     QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) );
 
-    // Headline color settings
     QHBox *box5 = new QHBox( this );
     QLabel* colorLabel2 = new QLabel( box5, "" );
     colorLabel2->setText( tr( "Set Headline Color: " ) );
@@ -106,7 +105,6 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
 
 
     layout->addWidget( b_group );
-    //    layout->addWidget( box4 );
     layout->addWidget( box1 );
     //    layout->addWidget( box2 );
     layout->addWidget( box3 );
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.h b/core/pim/today/plugins/addressbook/addresspluginconfig.h
index 5e07aa3..5626e5d 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.h
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.h
@@ -27,7 +27,7 @@
 #include <opie/ocolorbutton.h>
 
 class AddressBookPluginConfig : public TodayConfigWidget {
-
+    Q_OBJECT
 
 public:
 
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index 498de28..dad09db 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -64,6 +64,10 @@ void AddressBookPluginWidget::refresh( const OContactAccess* )
 	getAddress();
 }
 
+void AddressBookPluginWidget::reinitialize() {
+	readConfig();
+	getAddress();
+}
 
 void AddressBookPluginWidget::readConfig() {
     Config cfg( "todayaddressplugin" );
@@ -98,10 +102,7 @@ void AddressBookPluginWidget::getAddress() {
 	QString output;
 
 	// Check whether the database provide the search option..
-	// The following if-statement was replaced due to a bug in some
-	// implementations of libopie. The replacement should work everywhere..(eilers)
-	// if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
- 	if ( !( m_contactdb->querySettings() & OContactAccess::DateDiff ) ){
+	if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
 		// Libopie seems to be old..
 		output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" );
 		addressLabel->setText( output );
@@ -115,10 +116,10 @@ void AddressBookPluginWidget::getAddress() {
 		qWarning("Searching from now (%s) until %s ! ", 
 			 QDate::currentDate().toString().latin1(), 
 			 lookAheadDate.toString().latin1() );
+
 		OContact querybirthdays;
 		querybirthdays.setBirthday( lookAheadDate );
 		
-		
 		m_list = m_contactdb->queryByExample( querybirthdays, 
 						      OContactAccess::DateDiff );
 		if ( m_list.count() > 0 ){
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h
index cf2ecce..b0e3811 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.h
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h
@@ -35,6 +35,7 @@ public:
     AddressBookPluginWidget( QWidget *parent,  const char *name );
     ~AddressBookPluginWidget();
 
+    void reinitialize();
 public slots:
     void refresh( const OContactAccess* db ); 
 
diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
index 9fe23b6..1876eb8 100644
--- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
+++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
@@ -4,6 +4,6 @@ Priority: optional
 Section: opie/applications
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2, opie-today
 Description: Addressbook plugin for today shows Birthdays and Anniversaries
+Version: $QPE_VERSION$EXTRAVERSION