rpms/kdeutils/devel kdeutils-3.5.4-kde#113622.patch, NONE, 1.1 kdeutils-3.5.4-kde#132929.patch, NONE, 1.1 kdeutils.spec, 1.77, 1.78 kdeutils-3.5.4-klaptopdaemon-crash.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Sep 28 20:36:29 UTC 2006
- Previous message (by thread): rpms/openssl/FC-5 openssl-0.9.8a-cve-2006-2940.patch, NONE, 1.1 openssl-0.9.8b-cve-2006-2937.patch, NONE, 1.1 openssl-0.9.8b-cve-2006-3738.patch, NONE, 1.1 openssl-0.9.8b-cve-2006-4343.patch, NONE, 1.1 openssl.spec, 1.70, 1.71
- Next message (by thread): rpms/kernel/devel/scripts rebase-xen-kernel.sh,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/dist/rpms/kdeutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29666
Modified Files:
kdeutils.spec
Added Files:
kdeutils-3.5.4-kde#113622.patch
kdeutils-3.5.4-kde#132929.patch
Removed Files:
kdeutils-3.5.4-klaptopdaemon-crash.patch
Log Message:
fix #132929, Apply default settings in Power Control->Laptop Battery crash
fix #113622, kde logout on low battery
kdeutils-3.5.4-kde#113622.patch:
daemon_state.cpp | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdeutils-3.5.4-kde#113622.patch ---
Index: klaptopdaemon/daemon_state.cpp
===================================================================
--- klaptopdaemon/daemon_state.cpp (Revision 578796)
+++ klaptopdaemon/daemon_state.cpp (Revision 578797)
@@ -188,7 +188,7 @@
playSoundPath[1] = config->readEntry("PlaySoundPath");
systemBeep[1] = config->readBoolEntry("SystemBeep", true)&exists;
logout[1] = config->readBoolEntry("Logout", false)&exists;
- shutdown[1] = config->readBoolEntry("Shutdown", true)&exists;
+ shutdown[1] = config->readBoolEntry("Shutdown", false)&exists;
notify[1] = config->readBoolEntry("Notify", (can_suspend?false:true))&exists;
do_hibernate[1] = config->readBoolEntry("Hibernate", false)&can_hibernate&exists;
do_suspend[1] = config->readBoolEntry("Suspend", (can_suspend?true:false))&can_suspend&exists;
kdeutils-3.5.4-kde#132929.patch:
acpi.cpp | 28 +++++++-----------
acpi.h | 1
apm.cpp | 20 ++++++-------
apm.h | 1
battery.cpp | 33 ++++++----------------
battery.h | 1
buttons.cpp | 9 +++++-
buttons.h | 1
power.cpp | 84 ++++++--------------------------------------------------
power.h | 1
profile.cpp | 47 ++++++-------------------------
profile.h | 1
sony.cpp | 18 ++++++------
sony.h | 1
warning.cpp | 90 +++++++-----------------------------------------------------
warning.h | 3 +-
16 files changed, 85 insertions(+), 254 deletions(-)
--- NEW FILE kdeutils-3.5.4-kde#132929.patch ---
Index: klaptopdaemon/power.h
===================================================================
--- klaptopdaemon/power.h (Revision 575808)
+++ klaptopdaemon/power.h (Revision 575809)
@@ -46,6 +46,7 @@
~PowerConfig();
void save( void );
void load();
+ void load(bool useDefaults);
void defaults();
virtual QString quickHelp() const;
Index: klaptopdaemon/buttons.h
===================================================================
--- klaptopdaemon/buttons.h (Revision 575808)
+++ klaptopdaemon/buttons.h (Revision 575809)
@@ -45,6 +45,7 @@
~ButtonsConfig();
void save( void );
void load();
+ void load(bool useDefaults);
void defaults();
virtual QString quickHelp() const;
Index: klaptopdaemon/profile.h
===================================================================
--- klaptopdaemon/profile.h (Revision 575808)
+++ klaptopdaemon/profile.h (Revision 575809)
@@ -48,6 +48,7 @@
void save( void );
void load();
+ void load(bool useDefaults);
void defaults();
virtual QString quickHelp() const;
Index: klaptopdaemon/warning.cpp
===================================================================
--- klaptopdaemon/warning.cpp (Revision 575808)
+++ klaptopdaemon/warning.cpp (Revision 575809)
@@ -408,14 +408,20 @@
void WarningConfig::load()
{
+ load( false );
+}
+
+void WarningConfig::load(bool useDefaults)
+{
if (config == NULL)
return;
- my_load(0);
- my_load(1);
+ my_load(0, useDefaults);
+ my_load(1, useDefaults);
}
-void WarningConfig::my_load(int x)
+void WarningConfig::my_load(int x, bool useDefaults )
{
+ config->setReadDefaults( useDefaults );
// open the config file
if (!x) {
@@ -522,86 +528,12 @@
editPlaySound->setURL(sound_val);
}
- changed(false);
-
+ emit changed(useDefaults);
}
void WarningConfig::defaults()
{
- // open the config file
- runcommand = false;
- playsound = false;
- beep = true;
- logout = false;
- shutdown = false;
- notify = !(type && checkSuspend);
- do_standby = false;
- do_hibernate = false;
- do_brightness = 1;
- val_brightness = (type?0:160);
- do_performance = 0;
- val_performance = "";
- do_throttle = 0;
- val_throttle = "";
- do_suspend = (type && checkSuspend);
- runcommand_val = "";
- time_based_action_low = true;
- time_based_action_critical = true;
- low_val_time = 15;
- low_val_percent = 7;
- critical_val_time = 5;
- critical_val_percent = 3;
- sound_val = "";
-
- if (apm) {
- checkRunCommand->setChecked(runcommand);
- checkPlaySound->setChecked(playsound);
- checkBeep->setChecked(beep);
- if (checkBrightness)
- checkBrightness->setChecked(do_brightness);
- if (valueBrightness) {
- valueBrightness->setValue(val_brightness);
- valueBrightness->setEnabled(do_brightness);
- }
- if (performance)
- performance->setChecked(do_performance);
- if (performance_val) {
- performance_val->setCurrentItem(0);
- performance_val->setEnabled(do_performance);
- }
- if (throttle)
- throttle->setChecked(do_throttle);
- if (throttle_val) {
- throttle_val->setCurrentItem(0);
- throttle_val->setEnabled(do_throttle);
- }
- checkLogout->setChecked(logout);
- checkNotify->setChecked(notify);
- checkShutdown->setChecked(shutdown);
- if (checkHibernate) {
- checkHibernate->setChecked(do_hibernate);
- } else {
- do_hibernate = 0;
- }
- if (checkStandby) {
- checkStandby->setChecked(do_standby);
- } else {
- do_standby = 0;
- }
- if (checkSuspend) {
- checkSuspend->setChecked(do_suspend);
- } else {
- do_suspend = 0;
- }
- checkNone->setChecked(!do_suspend&!do_standby&!do_hibernate&!logout&!shutdown);
- editRunCommand->setURL(runcommand_val);
- editLowTime->setValue(low_val_time);
- editLowPercent->setValue(low_val_percent);
- editCriticalTime->setValue(critical_val_time);
- editCriticalPercent->setValue(critical_val_percent);
- editPlaySound->setURL(sound_val);
- }
- changed(true);
+ load( true );
}
Index: klaptopdaemon/battery.cpp
===================================================================
--- klaptopdaemon/battery.cpp (Revision 575808)
+++ klaptopdaemon/battery.cpp (Revision 575809)
@@ -211,8 +211,14 @@
void BatteryConfig::load()
{
- config->setGroup("BatteryDefault");
+ load( false );
+}
+void BatteryConfig::load(bool useDefaults)
+{
+ config->setReadDefaults( useDefaults );
+ config->setGroup("BatteryDefault");
+
poll_time = config->readNumEntry("Poll", 20);
enablemonitor = config->readBoolEntry("Enable", true);
notifyme = config->readBoolEntry("NotifyMe", false);
@@ -233,34 +239,13 @@
}
battery_pm = SmallIcon(nochargebattery, 20, KIcon::DefaultState, instance);
battery_nopm = SmallIcon(nobattery, 20, KIcon::DefaultState, instance);
- changed(false);
+ emit changed(useDefaults);
BatteryStateUpdate();
}
void BatteryConfig::defaults()
{
- poll_time = 20;
- enablemonitor = true;
- useblanksaver = false;
- notifyme = false;
-
- nobattery = "laptop_nobattery";
- nochargebattery = "laptop_nocharge";
- chargebattery = "laptop_charge";
-
- runMonitor->setChecked(enablemonitor);
- notifyMe->setChecked(notifyme);
- blankSaver->setChecked(useblanksaver);
- if (apm) {
- editPoll->setValue(poll_time);
- buttonNoCharge->setIcon(nochargebattery);
- buttonCharge->setIcon(chargebattery);
- buttonNoBattery->setIcon(nobattery);
- }
- battery_pm = SmallIcon(nochargebattery, 20, KIcon::DefaultState, instance);
- battery_nopm = SmallIcon(nobattery, 20, KIcon::DefaultState, instance);
- changed(true);
- BatteryStateUpdate();
+ load( true );
}
Index: klaptopdaemon/acpi.h
===================================================================
--- klaptopdaemon/acpi.h (Revision 575808)
+++ klaptopdaemon/acpi.h (Revision 575809)
@@ -46,6 +46,7 @@
void save( void );
void load();
+ void load( bool useDefaults );
void defaults();
virtual QString quickHelp() const;
Index: klaptopdaemon/apm.h
===================================================================
--- klaptopdaemon/apm.h (Revision 575808)
+++ klaptopdaemon/apm.h (Revision 575809)
@@ -46,6 +46,7 @@
void save( void );
void load();
+ void load(bool useDefaults);
void defaults();
virtual QString quickHelp() const;
Index: klaptopdaemon/sony.cpp
===================================================================
--- klaptopdaemon/sony.cpp (Revision 575808)
+++ klaptopdaemon/sony.cpp (Revision 575809)
@@ -153,24 +153,26 @@
void SonyConfig::load()
{
- config->setGroup("SonyDefault");
+ load( false );
+}
+void SonyConfig::load(bool useDefaults)
+{
+ config->setReadDefaults( useDefaults );
+
+ config->setGroup("SonyDefault");
+
enablescrollbar = config->readBoolEntry("EnableScrollBar", false);
enableScrollBar->setChecked(enablescrollbar);
middleemulation = config->readBoolEntry("EnableMiddleEmulation", false);
enableMiddleEmulation->setChecked(middleemulation);
- changed(false);
+ emit changed( useDefaults );
}
void SonyConfig::defaults()
{
- enablescrollbar = false;
- enableScrollBar->setChecked(enablescrollbar);
- middleemulation = false;
- enableMiddleEmulation->setChecked(middleemulation);
-
- changed(true);
+ load( true );
}
Index: klaptopdaemon/power.cpp
===================================================================
--- klaptopdaemon/power.cpp (Revision 575808)
+++ klaptopdaemon/power.cpp (Revision 575809)
@@ -382,6 +382,13 @@
void PowerConfig::load()
{
+ load( false );
+}
+
+void PowerConfig::load(bool useDefaults)
+{
+ config->setReadDefaults( useDefaults );
+
config->setGroup("LaptopPower");
nopower = config->readNumEntry("NoPowerSuspend", (nopowerStandby?1:nopowerSuspend?2:0));
power = config->readNumEntry("PowerSuspend", 0);
@@ -482,85 +489,12 @@
powerValThrottle->setEnabled(power_throttle_enabled);
}
}
- changed(false);
+ emit changed( useDefaults );
}
void PowerConfig::defaults()
{
- setPower(1, 0);
- edit_wait = 20;
- noedit_wait = 5;
- nopower_bright_enabled = 0;
- power_bright_enabled = 0;
- nopower_bright_val = 0;
- power_bright_val = 0;
- nopower_performance_enabled = 0;
- power_performance_enabled = 0;
- nopower_performance_val = "";
- power_performance_val = "";
- nopower_throttle_enabled = 0;
- power_throttle_enabled = 0;
- nopower_throttle_val = "";
- power_throttle_val = "";
- lav_enabled = 0;
- nolav_enabled = 0;
- edit_lav = -1;
- noedit_lav = -1;
- if (editwait) {
- editwait->setValue(edit_wait);
- noeditwait->setValue(noedit_wait);
- if (editlav) {
- editlav->setValue(edit_lav);
- editlav->setEnabled(lav_enabled);
- }
- if (noeditlav) {
- noeditlav->setValue(noedit_lav);
- noeditlav->setEnabled(nolav_enabled);
- }
- if (enablelav)
- enablelav->setChecked(lav_enabled);
- if (noenablelav)
- noenablelav->setChecked(nolav_enabled);
- if (nopowerBrightness)
- nopowerBrightness->setChecked(nopower_bright_enabled);
- if (powerBrightness)
- powerBrightness->setChecked(power_bright_enabled);
- if (nopowerValBrightness) {
- nopowerValBrightness->setValue(nopower_bright_val);
- nopowerValBrightness->setEnabled(nopower_bright_enabled);
- }
- if (powerValBrightness) {
- powerValBrightness->setValue(power_bright_val);
- powerValBrightness->setEnabled(power_bright_enabled);
- }
-
-
- if (nopowerPerformance)
- nopowerPerformance->setChecked(nopower_performance_enabled);
- if (powerPerformance)
- powerPerformance->setChecked(power_performance_enabled);
- if (nopowerValPerformance) {
- nopowerValPerformance->setCurrentItem(0);
- nopowerValPerformance->setEnabled(nopower_performance_enabled);
- }
- if (powerValPerformance) {
- powerValPerformance->setCurrentItem(0);
- powerValPerformance->setEnabled(power_performance_enabled);
- }
- if (nopowerThrottle)
- nopowerThrottle->setChecked(nopower_throttle_enabled);
- if (powerThrottle)
- powerThrottle->setChecked(power_throttle_enabled);
- if (nopowerValThrottle) {
- nopowerValThrottle->setCurrentItem(0);
- nopowerValThrottle->setEnabled(nopower_throttle_enabled);
- }
- if (powerValThrottle) {
- powerValThrottle->setCurrentItem(0);
- powerValThrottle->setEnabled(power_throttle_enabled);
- }
- }
- changed(true);
+ load( true );
}
int PowerConfig::getNoPower()
Index: klaptopdaemon/buttons.cpp
===================================================================
--- klaptopdaemon/buttons.cpp (Revision 575808)
+++ klaptopdaemon/buttons.cpp (Revision 575809)
@@ -329,6 +329,13 @@
void ButtonsConfig::load()
{
+ load( false );
+}
+
+void ButtonsConfig::load(bool useDefaults)
+{
+ config->setReadDefaults( useDefaults );
+
config->setGroup("LaptopButtons");
lid = config->readNumEntry("LidSuspend", 0);
power = config->readNumEntry("PowerSuspend", 0);
@@ -407,7 +414,7 @@
powerValThrottle->setCurrentItem(ind);
powerValThrottle->setEnabled(power_throttle_enabled);
}
- changed(false);
+ emit changed( useDefaults );
}
void ButtonsConfig::defaults()
Index: klaptopdaemon/profile.cpp
===================================================================
--- klaptopdaemon/profile.cpp (Revision 575808)
+++ klaptopdaemon/profile.cpp (Revision 575809)
@@ -290,6 +290,13 @@
void ProfileConfig::load()
{
+ load( false );
+}
+
+void ProfileConfig::load(bool useDefaults)
+{
+ config->setReadDefaults( useDefaults );
+
config->setGroup("ProfileDefault");
bool v;
@@ -384,48 +391,12 @@
throttle_val_off->setCurrentItem(ind);
throttle_val_off->setEnabled(v);
}
- changed(false);
+ emit changed( useDefaults );
}
void ProfileConfig::defaults()
{
- if (pon)
- pon->setChecked(0);
- if (son) {
- son->setValue(255);
- son->setEnabled(0);
- }
- if (poff)
- poff->setChecked(0);
- if (soff) {
- soff->setValue(160);
- soff->setEnabled(0);
- }
- if (performance_on)
- performance_on->setChecked(0);
- if (performance_val_on) {
- performance_val_on->setCurrentItem(0);
- performance_val_on->setEnabled(0);
- }
- if (performance_off)
- performance_off->setChecked(0);
- if (performance_val_off) {
- performance_val_off->setCurrentItem(0);
- performance_val_off->setEnabled(0);
- }
- if (throttle_on)
- throttle_on->setChecked(0);
- if (throttle_val_on) {
- throttle_val_on->setCurrentItem(0);
- throttle_val_on->setEnabled(0);
- }
- if (throttle_off)
- throttle_off->setChecked(0);
- if (throttle_val_off) {
- throttle_val_off->setCurrentItem(0);
- throttle_val_off->setEnabled(0);
- }
- changed(true);
+ load( true );
}
Index: klaptopdaemon/warning.h
===================================================================
--- klaptopdaemon/warning.h (Revision 575808)
+++ klaptopdaemon/warning.h (Revision 575809)
@@ -46,6 +46,7 @@
~WarningConfig();
void save( void );
void load();
+ void load(bool useDefaults);
void defaults();
virtual QString quickHelp() const;
@@ -61,7 +62,7 @@
void checkCriticalPercentChanged(bool state);
private:
- void my_load(int x);
+ void my_load(int x, bool useDefaults=false );
KConfig *config;
Index: klaptopdaemon/acpi.cpp
===================================================================
--- klaptopdaemon/acpi.cpp (Revision 575808)
+++ klaptopdaemon/acpi.cpp (Revision 575809)
@@ -232,8 +232,15 @@
void AcpiConfig::load()
{
- config->setGroup("AcpiDefault");
+ load( false );
+}
+void AcpiConfig::load(bool useDefaults)
+{
+ config->setReadDefaults( useDefaults );
+
+ config->setGroup("AcpiDefault");
+
enablestandby = config->readBoolEntry("EnableStandby", false);
enableStandby->setChecked(enablestandby);
enablesuspend = config->readBoolEntry("EnableSuspend", false);
@@ -248,26 +255,13 @@
enablesoftwaresuspend = config->readBoolEntry("EnableHibernate", false);
if (enableSoftwareSuspendHibernate)
enableSoftwareSuspendHibernate->setChecked(enablesoftwaresuspend);
- changed(false);
+
+ emit changed(useDefaults);
}
void AcpiConfig::defaults()
{
- enablestandby = false;
- enableStandby->setChecked(enablestandby);
- enablesuspend = false;
- enableSuspend->setChecked(enablesuspend);
- enablehibernate = false;
- enableHibernate->setChecked(enablehibernate);
- enableperformance = false;
- enablePerformance->setChecked(enableperformance);
- enablethrottle = false;
- enableThrottle->setChecked(enablethrottle);
- enablesoftwaresuspend = false;
- if (enableSoftwareSuspendHibernate)
- enableSoftwareSuspendHibernate->setChecked(enablesoftwaresuspend);
-
- changed(true);
+ load( true );
}
Index: klaptopdaemon/apm.cpp
===================================================================
--- klaptopdaemon/apm.cpp (Revision 575808)
+++ klaptopdaemon/apm.cpp (Revision 575809)
@@ -244,7 +244,13 @@
void ApmConfig::load()
{
- config->setGroup("ApmDefault");
+ load( false );
+}
+
+void ApmConfig::load(bool useDefaults)
+{
+ config->setReadDefaults( useDefaults );
+ config->setGroup("ApmDefault");
enablestandby = config->readBoolEntry("EnableStandby", true);
enableStandby->setChecked(enablestandby);
enablesuspend = config->readBoolEntry("EnableSuspend", true);
@@ -253,20 +259,12 @@
enablesoftwaresuspend = config->readBoolEntry("EnableHibernate", false);
if (enableSoftwareSuspendHibernate)
enableSoftwareSuspendHibernate->setChecked(enablesoftwaresuspend);
- changed(false);
+ emit changed(useDefaults);
}
void ApmConfig::defaults()
{
- enablestandby = true;
- enableStandby->setChecked(enablestandby);
- enablesuspend = true;
- enableSuspend->setChecked(enablesuspend);
- enablesoftwaresuspend = false;
- if (enableSoftwareSuspendHibernate)
- enableSoftwareSuspendHibernate->setChecked(enablesoftwaresuspend);
-
- changed(true);
+ load( true );
}
Index: klaptopdaemon/battery.h
===================================================================
--- klaptopdaemon/battery.h (Revision 575808)
+++ klaptopdaemon/battery.h (Revision 575809)
@@ -50,6 +50,7 @@
void save( void );
void load();
+ void load(bool useDefaults);
void defaults();
virtual QString quickHelp() const;
Index: klaptopdaemon/sony.h
===================================================================
--- klaptopdaemon/sony.h (Revision 575808)
+++ klaptopdaemon/sony.h (Revision 575809)
@@ -47,6 +47,7 @@
void save( void );
void load();
+ void load(bool useDefaults);
void defaults();
virtual QString quickHelp() const;
Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kdeutils.spec 27 Sep 2006 13:35:12 -0000 1.77
+++ kdeutils.spec 28 Sep 2006 20:36:26 -0000 1.78
@@ -27,7 +27,6 @@
Patch1: kdf-3.0.2-label.patch
Patch2: kdeutils-3.5.4-bz#205553.patch
Patch3: kdeutils-3.5.4-suspend.patch
-Patch4: kdeutils-3.5.4-klaptopdaemon-crash.patch
# upstream patches
Patch100: kdeutils-3.5.4-kde#127341.patch
@@ -35,6 +34,8 @@
Patch102: kdeutils-3.5.4-kde#128925.patch
Patch103: kdeutils-3.5.4-kde#134192.patch
Patch104: kdeutils-3.5.4-kde#129161.patch
+Patch105: kdeutils-3.5.4-kde#132929.patch
+Patch106: kdeutils-3.5.4-kde#113622.patch
Requires: kdelibs >= %{kdelibs_epoch}:%{version}
Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -95,7 +96,6 @@
%patch1 -p1 -b .label
%patch2 -p1 -b .bz#205553
%patch3 -p1 -b .suspend
-%patch4 -p1 -b .klaptopdaemon-crash
#upstream patches
%patch100 -p0 -b .kde#127341
@@ -103,6 +103,8 @@
%patch102 -p0 -b .kde#128925
%patch103 -p0 -b .kde#134192
%patch104 -p0 -b .kde#129161
+%patch105 -p0 -b .kde#132929
+%patch106 -p0 -b .kde#113622
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -219,6 +221,8 @@
%changelog
* Wed Sep 27 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
- apply upstream patches
+ fix #132929, Apply default settings in Power Control->Laptop Battery crash
+ fix #113622, kde logout on low battery
fix #129161, kwalletmanager does not show up in systray
* Mon Sep 25 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
--- kdeutils-3.5.4-klaptopdaemon-crash.patch DELETED ---
- Previous message (by thread): rpms/openssl/FC-5 openssl-0.9.8a-cve-2006-2940.patch, NONE, 1.1 openssl-0.9.8b-cve-2006-2937.patch, NONE, 1.1 openssl-0.9.8b-cve-2006-3738.patch, NONE, 1.1 openssl-0.9.8b-cve-2006-4343.patch, NONE, 1.1 openssl.spec, 1.70, 1.71
- Next message (by thread): rpms/kernel/devel/scripts rebase-xen-kernel.sh,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list