Fix merge commit 99b99185ca6b91158e109a1e636fa510cb2389ca

The said merge commit was a merge from 1.1 to master and lost a number of
changes that were in 1.1 at that time.

This patch was created by doing:
$ git checkout d12ec76     # mainline parent
$ git merge 21b738c        # the other parent
(fix merge conflicts)
$ git commit
$ git checkout -b temp-fix1
$ git checkout 99b9918
$ git diff HEAD temp-fix1 | git apply -
$ git add (all the new files)
$ git commit -a
$ git checkout -b temp-fix2
$ git checkout master-from-1.1
$ git cherry-pick temp-fix2
(fix merge conflicts - these are listed below)

Conflicts:

	.gitattributes
	dist/changes-1.1.0
	doc/src/examples.qdoc
	examples/declarative-systeminfo/storage/declarative-storage.qrc
	examples/sysinfo/dialog.cpp
	examples/sysinfo/dialog.h
	plugins/multimedia/gstreamer/camerabin/camerabinsession.cpp
	src/organizer/details/qorganizeritemdetails.cpp
	src/organizer/details/qorganizeritemreminder.h
	src/organizer/items/qorganizerevent.h
	src/organizer/items/qorganizereventoccurrence.h
	src/organizer/items/qorganizerjournal.h
	src/organizer/items/qorganizernote.h
	src/organizer/items/qorganizertodo.h
	src/organizer/items/qorganizertodooccurrence.h
	src/organizer/qorganizercollection.cpp
	src/organizer/qorganizercollection.h
	src/organizer/qorganizercollectionenginelocalid.cpp
	src/organizer/qorganizeritemengineid.cpp
	src/organizer/qorganizeritemid.cpp
	src/organizer/qorganizeritemmanager.cpp
	src/organizer/qorganizermanagerengine.cpp
	src/serviceframework/ipc/qremoteserviceregister_dbus_p.h
	src/serviceframework/ipc/qremoteserviceregister_p.cpp
	src/systeminfo/qsystemdeviceinfo.cpp
	src/systeminfo/qsystemdeviceinfo.h
	src/systeminfo/qsystemdisplayinfo.cpp
	src/systeminfo/qsystemscreensaver.cpp
	src/systeminfo/qsystemstorageinfo.cpp
	tests/auto/auto.pro
	tests/auto/contacts.pro
	tests/auto/feedback.pro
	tests/auto/host.pro
	tests/auto/maketestselftest/checktest/main.cpp
	tests/auto/multimedia.pro
	tests/auto/organizer.pro
	tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp
	tests/auto/versit.pro
	translations/qtmobility_uk.ts

1 files changed, 1 insertions, 3 deletions

diff --git a/examples/sysinfo/dialog.cpp b/examples/sysinfo/dialog.cpp
index 12fc7d85ec..1d041c9759 100644
--- a/examples/sysinfo/dialog.cpp
+++ b/examples/sysinfo/dialog.cpp
@@ -541,7 +541,6 @@ void Dialog::displayBatteryStatus(QSystemDeviceInfo::BatteryStatus status)
     if(currentBatStat == status || currentPowerState != QSystemDeviceInfo::BatteryPower)
         return;
     QString msg;
-//    if(di->isBatteryCharging()) {
         switch(status) {
         case QSystemDeviceInfo::BatteryCritical:
             {
@@ -573,8 +572,7 @@ void Dialog::displayBatteryStatus(QSystemDeviceInfo::BatteryStatus status)
             }
             break;
         };
-  //  }
-
+        currentBatStat = status;
 }
 
 void Dialog::networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode , int strength)