rpms/kpackagekit/F-12 kpackagekit-0.5.3-defaults_hacks.patch, NONE, 1.1 kpackagekit.spec, 1.55, 1.56 kpackagekit-0.5.1-defaults_hacks.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kpackagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4796

Modified Files:
	kpackagekit.spec 
Added Files:
	kpackagekit-0.5.3-defaults_hacks.patch 
Removed Files:
	kpackagekit-0.5.1-defaults_hacks.patch 
Log Message:
rebase the default_hacks patch


kpackagekit-0.5.3-defaults_hacks.patch:
 KPackageKitD/kpackagekitd.cpp |    4 ++--
 Settings/KpkSettings.cpp      |    4 ++--
 SmartIcon/KpkUpdateIcon.cpp   |    2 +-
 libkpackagekit/KpkEnum.h      |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE kpackagekit-0.5.3-defaults_hacks.patch ---
diff -ur kpk-orig/KPackageKitD/kpackagekitd.cpp KPackageKit-0.5.3/KPackageKitD/kpackagekitd.cpp
--- kpk-orig/KPackageKitD/kpackagekitd.cpp	2010-01-12 13:47:50.000000000 +0100
+++ KPackageKit-0.5.3/KPackageKitD/kpackagekitd.cpp	2010-01-14 15:10:51.455435926 +0100
@@ -87,7 +87,7 @@
     KConfig config("KPackageKit");
     KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
     // default to one day, 86400 sec
-    uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
+    const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
 
     if (!canRefreshCache) {
         //if the backend does not suport refreshing cache let's don't do nothing
@@ -116,7 +116,7 @@
     KConfig config("KPackageKit");
     KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
     // default to one day, 86400 sec
-    int interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
+    const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
     int actRefreshCache = getTimeSinceRefreshCache();
     if (interval == KpkEnum::Never) {
         return;
diff -ur kpk-orig/libkpackagekit/KpkEnum.h KPackageKit-0.5.3/libkpackagekit/KpkEnum.h
--- kpk-orig/libkpackagekit/KpkEnum.h	2009-11-17 13:32:14.000000000 +0100
+++ KPackageKit-0.5.3/libkpackagekit/KpkEnum.h	2010-01-14 15:08:00.335561308 +0100
@@ -28,7 +28,7 @@
             Security,
             All
     } AutoUpdate;
-    const int AutoUpdateDefault = None;
+    const uint AutoUpdateDefault = None;
 
     typedef enum {
             Never   =       0,
@@ -37,7 +37,7 @@
             Weekly  =  604800,
             Monthly = 2628000
     } TimeInterval;
-    const int TimeIntervalDefault = Weekly;
+    const uint TimeIntervalDefault = Daily;
 
 }
 
diff -ur kpk-orig/Settings/KpkSettings.cpp KPackageKit-0.5.3/Settings/KpkSettings.cpp
--- kpk-orig/Settings/KpkSettings.cpp	2009-12-07 19:31:35.000000000 +0100
+++ KPackageKit-0.5.3/Settings/KpkSettings.cpp	2010-01-14 15:08:00.336561428 +0100
@@ -58,15 +58,15 @@
         originGB->setEnabled(false);
     }
 
-    intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"),  KpkEnum::Hourly);
     intervalCB->addItem(i18nc("Daily refresh the package cache", "Daily"),   KpkEnum::Daily);
+    intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"),  KpkEnum::Hourly);
     intervalCB->addItem(i18nc("Weekly refresh the package cache", "Weekly"),  KpkEnum::Weekly);
     intervalCB->addItem(i18nc("Monthly refresh the package cache", "Monthly"), KpkEnum::Monthly);
     intervalCB->addItem(i18nc("Never refresh package cache", "Never"), KpkEnum::Never);
 
+    autoCB->addItem(i18nc("None updates will be automatically installed", "None"),          KpkEnum::None);
     autoCB->addItem(i18n("Security only"), KpkEnum::Security);
     autoCB->addItem(i18n("All updates"),   KpkEnum::All);
-    autoCB->addItem(i18nc("None updates will be automatically installed", "None"),          KpkEnum::None);
 
     connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
     connect(intervalCB, SIGNAL(currentIndexChanged(int)), this, SLOT(checkChanges()));
diff -ur kpk-orig/SmartIcon/KpkUpdateIcon.cpp KPackageKit-0.5.3/SmartIcon/KpkUpdateIcon.cpp
--- kpk-orig/SmartIcon/KpkUpdateIcon.cpp	2009-11-17 19:25:12.000000000 +0100
+++ KPackageKit-0.5.3/SmartIcon/KpkUpdateIcon.cpp	2010-01-14 15:08:00.336561428 +0100
@@ -244,7 +244,7 @@
 //         m_icon->show();
         KConfig config("KPackageKit");
         KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
-        uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
+        const uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
         if (updateType == KpkEnum::None) {
             // update none
             notifyUpdates();


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/extras/rpms/kpackagekit/F-12/kpackagekit.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- kpackagekit.spec	14 Jan 2010 13:51:30 -0000	1.55
+++ kpackagekit.spec	14 Jan 2010 14:16:53 -0000	1.56
@@ -14,7 +14,7 @@ URL:		http://www.kde-apps.org/content/sh
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Hacks to smash kpackagekit: daily/none default (#469375)
-Patch50: kpackagekit-0.5.1-defaults_hacks.patch
+Patch50: kpackagekit-0.5.3-defaults_hacks.patch
 # backport http://websvn.kde.org?view=revision&revision=1073079
 Patch51: kpackagekit-0.5.2-crash.patch
 


--- kpackagekit-0.5.1-defaults_hacks.patch DELETED ---