Author: varkoly Date: Mon Jul 20 12:49:00 2009 New Revision: 58118 URL: http://svn.opensuse.org/viewcvs/yast?rev=58118&view=rev Log: bnc#491113 - fetchmail demon is started though disabled in runlevel editor when configuring email via network services Modified: trunk/mail/package/yast2-mail.changes trunk/mail/src/Mail.ycp trunk/mail/src/ui.ycp Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?rev=58118&r1=58117&r2=58118&view=diff ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Mon Jul 20 12:49:00 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 20 12:31:04 CEST 2009 - varkoly@suse.de + +- bnc#491113 - fetchmail demon is started though disabled in runlevel + editor when configuring email via network services + +------------------------------------------------------------------- Mon Jul 20 10:41:06 CEST 2009 - varkoly@suse.de - bnc#488677 - yast2-mail "Advanced config" overwrites mailman settings Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=58118&r1=58117&r2=58118&view=diff ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Mon Jul 20 12:49:00 2009 @@ -133,16 +133,10 @@ /** * When should fetchmail run: * <dl> - * <dt> `manual <dd> - * <dt> `ppp <dd> for a ppp conection, /etc/ppp/ip-{up,down}.d - * <dt> `network <dd> for any network connection, - * /etc/sysconfig/network/if-{up,down}.d - * </dl> - * #22903 - * Unused yet! - * #37139, just enable rcfetchmail. + * <dt> "manual" <dd> + * <dt> "daemon" <dd> */ - global symbol fetchmail_mode = `manual; + global string fetchmail_mode = "manual"; /** *List of maps: @@ -333,7 +327,7 @@ * @return Whether rcfetchmail should run */ define boolean RunFetchmailGlobally () ``{ - return size (fetchmail) > 0; + return ( fetchmail_mode == "daemon" && size (fetchmail) > 0 ); } /** @@ -544,9 +538,10 @@ { return false; } - // read 4 - // TODO - fetchmail_mode = `manual; + if( Service::Enabled ("fetchmail") ) + { + fetchmail_mode = "daemon"; + } // if we are testing as non-root, it will fail, that's OK map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/id --user"); Modified: trunk/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/ui.ycp?rev=58118&r1=58117&r2=58118&view=diff ============================================================================== --- trunk/mail/src/ui.ycp (original) +++ trunk/mail/src/ui.ycp Mon Jul 20 12:49:00 2009 @@ -479,6 +479,9 @@ `HSpacing (1), // pushbutton `Bottom (`PushButton (`id (`downloading), `opt (`key_F7), _("&Details..."))) + ), + `HBox ( + `Left(`ComboBox (`id (`fm_start),_("Start &fetchmail"),["manual","daemon"])) ) ); // frame label: mail downloading (fetchmail) @@ -533,6 +536,7 @@ WJ_GetWidget (`delivery_mode); // initialize the widget (set the current value) CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); + UI::ChangeWidget(`id(`fm_start),`Value, Mail::fetchmail_mode); // nothing entered in the dowloading items - don't save them boolean fm_empty = true; @@ -557,9 +561,9 @@ } else if (ret == `next || contains (buttons, ret)) { + Mail::fetchmail_mode = (string) UI::QueryWidget(`id (`fm_start), `Value); // input validation // For consistency, all querywidgets are done here - if (WJ_Validate (widgets)) { fm_empty = -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org