summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-05-05 14:37:29 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2013-05-05 14:37:29 -0500
commit7c1c86a1a8b4a0f34737cd3ed8f335b9c5498510 (patch)
tree341876733768e35677a3728555ed26327458ee97
parentd720ec70a7b70ec971df2dae59b9fc820fd04288 (diff)
downloadkpowersave-7c1c86a1a8b4a0f34737cd3ed8f335b9c5498510.tar.gz
kpowersave-7c1c86a1a8b4a0f34737cd3ed8f335b9c5498510.zip
Fix typos.
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.package2
-rw-r--r--NEWS2
-rw-r--r--src/dbusHAL.cpp36
-rw-r--r--src/dbusHAL.h10
-rw-r--r--src/hardware.cpp6
6 files changed, 33 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index cdfe434..ea98c4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -204,17 +204,17 @@
* src/hardware.cpp: If the desktop session (if detected
via ConsoleKit) get inactive call releasePolicyPowerIface()
- and if the session is active again try to aquire the
+ and if the session is active again try to acquire the
org.freedesktop.Policy.Power interface again.
This should happen:
- the session get inactive:
- release org.freedesktop.Policy.Power:
powersaved or if there is an other desktop session
- an other KPowersave instance can aquire the name and
+ an other KPowersave instance can acquire the name and
handle powermanagement.
- the session get active again:
- - the current active KPowersave instance aquire the
+ - the current active KPowersave instance acquire the
interface/name from powersaved (if there is an other
KPowersave instance holding the name it should release
the name ...) and handle powermanagement again.
@@ -230,7 +230,7 @@
2007-08-20 Danny Kukawka <danny.kukawka@web.de>
- * src/dbusHAL.[cpp,h]: Split up the code to aquire the
+ * src/dbusHAL.[cpp,h]: Split up the code to acquire the
org.freedesktop.Policy.Power name service to a new own
function. Added new function to release the service
name again. Call now dbus_bus_release_name() if close()
@@ -2011,7 +2011,7 @@
2006-11-19 Danny Kukawka <danny.kukawka@web.de>
* TODO: removed done issues
- * src/dbusHAL.[cpp,h]: Added code to claim/aquire the
+ * src/dbusHAL.[cpp,h]: Added code to claim/acquire the
org.freedesktop.Policy.Power interface from D-Bus to stop
the powersave daemon/client and to be allowed to handle
the powermanagement policy.
diff --git a/ChangeLog.package b/ChangeLog.package
index 5d4750e..c4040f1 100644
--- a/ChangeLog.package
+++ b/ChangeLog.package
@@ -84,7 +84,7 @@ Mon Aug 20 18:10:39 CEST 2007 - dkukawka@suse.de
- added code to check if the current desktop session is avtive
and handle if the session get inactive (for more see Changelog
of the pacakge)
- - added code to release/aquire org.freedesktop.Policy.Power if
+ - added code to release/acquire org.freedesktop.Policy.Power if
the session get inactive/active to allow powersaved or other
active KPowersave instances to handle powermanagement
- fixed parameter types for call of SetPowerSave() on HAL
diff --git a/NEWS b/NEWS
index c89641b..8f3568f 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ Major changes since the last version/release:
the user is privileged (for HAL >= 0.5.10 and related PolicyKit versions)
- added code to check if the current desktop session is avtive and handle
if the session get inactive (via ConsoleKit)
- - added code to release/aquire org.freedesktop.Policy.Power if the session
+ - added code to release/acquire org.freedesktop.Policy.Power if the session
get inactive/active to allow powersaved or other active KPowersave
instances to handle powermanagement
- prepared KPowersave to work also with HAL >= 0.5.10 (handle renamed
diff --git a/src/dbusHAL.cpp b/src/dbusHAL.cpp
index 712ab76..3188669 100644
--- a/src/dbusHAL.cpp
+++ b/src/dbusHAL.cpp
@@ -43,7 +43,7 @@ dbusHAL::dbusHAL(){
dbus_is_connected = false;
hal_is_connected = false;
- aquiredPolicyPower = false;
+ acquiredPolicyPower = false;
hal_ctx = NULL;
// add pointer to this for filter_function()
@@ -93,11 +93,11 @@ bool dbusHAL::isConnectedToHAL() {
* This function return information if the org.freedesktop.Policy.Power
* interface was claimed.
* \return boolean with the status of claim the interface
- * \retval true if aquired
+ * \retval true if acquired
* \retval false if not
*/
-bool dbusHAL::aquiredPolicyPowerInterface() {
- return aquiredPolicyPower;
+bool dbusHAL::acquiredPolicyPowerInterface() {
+ return acquiredPolicyPower;
}
/*!
@@ -161,7 +161,7 @@ bool dbusHAL::initDBUS(){
return false;
}
- aquirePolicyPowerIface();
+ acquirePolicyPowerIface();
dbus_connection_set_exit_on_disconnect( dbus_connection, false );
@@ -205,12 +205,12 @@ bool dbusHAL::initDBUS(){
}
/*!
- * This function aquire the org.freedesktop.Policy.Power interface
+ * This function acquire the org.freedesktop.Policy.Power interface
* \return boolean with the result of the operation
- * \retval true if successful aquired the interface
+ * \retval true if successful acquired the interface
* \retval false if unsuccessful
*/
-bool dbusHAL::aquirePolicyPowerIface(){
+bool dbusHAL::acquirePolicyPowerIface(){
kdDebugFuncIn(trace);
if (dbus_connection == NULL) {
@@ -222,26 +222,26 @@ bool dbusHAL::aquirePolicyPowerIface(){
DBUS_NAME_FLAG_REPLACE_EXISTING, NULL)) {
case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
kdDebug() << "Acquired org.freedesktop.Policy.Power interface" << endl;
- aquiredPolicyPower = true;
+ acquiredPolicyPower = true;
break;
case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
- kdWarning() << "Queued to aquire org.freedesktop.Policy.Power interface" << endl;
- aquiredPolicyPower = false;
+ kdWarning() << "Queued to acquire org.freedesktop.Policy.Power interface" << endl;
+ acquiredPolicyPower = false;
break;
default:
- kdWarning() << "Unknown error while aquire org.freedesktop.Policy.Power interface" << endl;
- aquiredPolicyPower = false;
+ kdWarning() << "Unknown error while acquire org.freedesktop.Policy.Power interface" << endl;
+ acquiredPolicyPower = false;
break;
}
kdDebugFuncOut(trace);
- return aquiredPolicyPower;
+ return acquiredPolicyPower;
}
/*!
* This function release the org.freedesktop.Policy.Power interface
* \return boolean with the result of the operation
- * \retval true if successful aquired the interface
+ * \retval true if successful acquired the interface
* \retval false if unsuccessful
*/
bool dbusHAL::releasePolicyPowerIface(){
@@ -268,7 +268,7 @@ bool dbusHAL::releasePolicyPowerIface(){
case DBUS_RELEASE_NAME_REPLY_RELEASED:
kdDebug() << "Released org.freedesktop.Policy.Power interface" << endl;
retval = true;
- aquiredPolicyPower = false;
+ acquiredPolicyPower = false;
break;
case DBUS_RELEASE_NAME_REPLY_NOT_OWNER:
kdWarning() << "Couldn't release org.freedesktop.Policy.Power, not the owner" << endl;
@@ -1072,9 +1072,9 @@ void dbusHAL::emitMsgReceived( msg_type type, TQString message, TQString string
if (type == POLICY_POWER_OWNER_CHANGED) {
if (message.startsWith("NOW_OWNER"))
- aquiredPolicyPower = true;
+ acquiredPolicyPower = true;
else
- aquiredPolicyPower = false;
+ acquiredPolicyPower = false;
}
emit msgReceived_withStringString( type, message, string );
diff --git a/src/dbusHAL.h b/src/dbusHAL.h
index d3a3754..3b52045 100644
--- a/src/dbusHAL.h
+++ b/src/dbusHAL.h
@@ -106,10 +106,10 @@ private:
/*!
* This boolean represent information if KPowersave could claim the
* org.freedesktop.Policy.Power interface from the D-Bus
- * \li true: if aquired
+ * \li true: if acquired
* \li false: if not
*/
- bool aquiredPolicyPower;
+ bool acquiredPolicyPower;
/* D-Bus helper functions */
//! to initialise the connection to D-Bus
@@ -142,8 +142,8 @@ public:
//! to close the connection to D-Bus and HAL
bool close();
- //! to aquire the org.freedesktop.Policy.Power interface
- bool aquirePolicyPowerIface();
+ //! to acquire the org.freedesktop.Policy.Power interface
+ bool acquirePolicyPowerIface();
//! to release the org.freedesktop.Policy.Power interface
bool releasePolicyPowerIface();
//! to check if the org.freedesktop.Policy.Power interface has an owner
@@ -155,7 +155,7 @@ public:
//! to get information if KPowersave is connected to HAL
bool isConnectedToHAL();
//! to get info about claim org.freedesktop.Policy.Power interface
- bool aquiredPolicyPowerInterface();
+ bool acquiredPolicyPowerInterface();
//! return the current HAL context
LibHalContext *get_HAL_context();
diff --git a/src/hardware.cpp b/src/hardware.cpp
index ab65969..756eac0 100644
--- a/src/hardware.cpp
+++ b/src/hardware.cpp
@@ -1383,11 +1383,11 @@ void HardwareInfo::emitS2diskButtonPressed() {
*/
void HardwareInfo::emitSessionActiveState() {
if (sessionIsActive) {
- if (!dbus_HAL->aquiredPolicyPowerInterface()) {
- dbus_HAL->aquirePolicyPowerIface();
+ if (!dbus_HAL->acquiredPolicyPowerInterface()) {
+ dbus_HAL->acquirePolicyPowerIface();
}
} else {
- if (dbus_HAL->aquiredPolicyPowerInterface()) {
+ if (dbus_HAL->acquiredPolicyPowerInterface()) {
dbus_HAL->releasePolicyPowerIface();
}
}