Mailinglist Archive: yast-commit (1212 mails)
| < Previous | Next > |
[yast-commit] r50878 - in /trunk/audit-laf/src: complex.ycp helps.ycp
- From: gs@xxxxxxxxxxxxxxxx
- Date: Tue, 09 Sep 2008 09:37:01 -0000
- Message-id: <20080909093702.1585F386C1@xxxxxxxxxxxxxxxx>
Author: gs
Date: Tue Sep 9 11:37:01 2008
New Revision: 50878
URL: http://svn.opensuse.org/viewcvs/yast?rev=50878&view=rev
Log:
remove unused PollAbort
Modified:
trunk/audit-laf/src/complex.ycp
trunk/audit-laf/src/helps.ycp
Modified: trunk/audit-laf/src/complex.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=50878&r1=50877&r2=50878&view=diff
==============================================================================
--- trunk/audit-laf/src/complex.ycp (original)
+++ trunk/audit-laf/src/complex.ycp Tue Sep 9 11:37:01 2008
@@ -52,17 +52,13 @@
return !AuditLaf::Modified() || Popup::ReallyAbort(true);
}
-boolean PollAbort() {
- return UI::PollInput() == `abort;
-}
-
/**
* Read settings dialog
* @return `abort if aborted and `next otherwise
*/
symbol ReadDialog() {
Wizard::RestoreHelp(HELPS["read"]:"");
- // AuditLaf::SetAbortFunction(PollAbort);
+
if (!Confirm::MustBeRoot()) return `abort;
boolean ret = AuditLaf::Read();
return ret ? `next : `abort;
@@ -74,7 +70,7 @@
*/
symbol WriteDialog() {
Wizard::RestoreHelp(HELPS["write"]:"");
- // AuditLaf::SetAbortFunction(PollAbort);
+
boolean ret = AuditLaf::Write();
return ret ? `next : `abort;
}
Modified: trunk/audit-laf/src/helps.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=50878&r1=50877&r2=50878&view=diff
==============================================================================
--- trunk/audit-laf/src/helps.ycp (original)
+++ trunk/audit-laf/src/helps.ycp Tue Sep 9 11:37:01 2008
@@ -117,7 +117,7 @@
/* rules dialog help 2/5*/
_("<p><b>Please note:</b><br>Locking the rules means they cannot be
changed until next reboot! </p>" ) +
/* rules dialog help 3/5 */
- _("<p>To enable the auditing whithout adding additional rules will cause
the
+ _("<p>To enable the auditing whithout additional rules will cause the
applications which use <i>libaudit</i>, e.g. PAM to log to
/var/log/audit/audit.log (default).</p> ") +
/* rules dialog help 4/5 */
_("<p>This module also allows you to edit the rules manually. Detailed
information
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
Date: Tue Sep 9 11:37:01 2008
New Revision: 50878
URL: http://svn.opensuse.org/viewcvs/yast?rev=50878&view=rev
Log:
remove unused PollAbort
Modified:
trunk/audit-laf/src/complex.ycp
trunk/audit-laf/src/helps.ycp
Modified: trunk/audit-laf/src/complex.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=50878&r1=50877&r2=50878&view=diff
==============================================================================
--- trunk/audit-laf/src/complex.ycp (original)
+++ trunk/audit-laf/src/complex.ycp Tue Sep 9 11:37:01 2008
@@ -52,17 +52,13 @@
return !AuditLaf::Modified() || Popup::ReallyAbort(true);
}
-boolean PollAbort() {
- return UI::PollInput() == `abort;
-}
-
/**
* Read settings dialog
* @return `abort if aborted and `next otherwise
*/
symbol ReadDialog() {
Wizard::RestoreHelp(HELPS["read"]:"");
- // AuditLaf::SetAbortFunction(PollAbort);
+
if (!Confirm::MustBeRoot()) return `abort;
boolean ret = AuditLaf::Read();
return ret ? `next : `abort;
@@ -74,7 +70,7 @@
*/
symbol WriteDialog() {
Wizard::RestoreHelp(HELPS["write"]:"");
- // AuditLaf::SetAbortFunction(PollAbort);
+
boolean ret = AuditLaf::Write();
return ret ? `next : `abort;
}
Modified: trunk/audit-laf/src/helps.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=50878&r1=50877&r2=50878&view=diff
==============================================================================
--- trunk/audit-laf/src/helps.ycp (original)
+++ trunk/audit-laf/src/helps.ycp Tue Sep 9 11:37:01 2008
@@ -117,7 +117,7 @@
/* rules dialog help 2/5*/
_("<p><b>Please note:</b><br>Locking the rules means they cannot be
changed until next reboot! </p>" ) +
/* rules dialog help 3/5 */
- _("<p>To enable the auditing whithout adding additional rules will cause
the
+ _("<p>To enable the auditing whithout additional rules will cause the
applications which use <i>libaudit</i>, e.g. PAM to log to
/var/log/audit/audit.log (default).</p> ") +
/* rules dialog help 4/5 */
_("<p>This module also allows you to edit the rules manually. Detailed
information
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
| < Previous | Next > |