Attachment #1596 for bug #985

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 985
Collapse All | Expand All




#include <tdesu/su.h>
#include "sudlg.h"

TDEsuDialog::TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, int timeout)
     : KPasswordDialog(Password, enableKeep, 0, icon)
{
    TDEConfig* config = TDEGlobal::config();

    }
    setPrompt(prompt);
    setKeepWarning(i18n("<qt>The stored password will be:<br> * Kept for up to %1 minutes<br> * Destroyed on logout").arg(timeout/60));

    if( withIgnoreButton )
	setButtonText(User1, i18n("&Ignore"));
}


TDEsuDialog::~TDEsuDialog()
{
}

bool TDEsuDialog::checkPassword(const char *password)
{
    SuProcess proc;
    proc.setUser(m_User);

    }
}

void TDEsuDialog::slotUser1()
{
    done(AsUser);
}





#include <kpassdlg.h>

class TDEsuDialog
    : public KPasswordDialog
{
    Q_OBJECT

public:
    TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , int timeout=-1);
    ~TDEsuDialog();

    enum ResultCodes { AsUser = 10 };
    




    { "r", I18N_NOOP("Use realtime scheduling"), 0 },
    { "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },
    { "comment <comment>", I18N_NOOP("Ignored"), "" },
    { "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 },
    { "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},
    { "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},
    TDECmdLineLastOption

    bool keep = !args->isSet("n") && have_daemon;
    bool terminal = args->isSet("t");
    bool new_dcop = args->isSet("newdcop");
    bool withIgnoreButton = args->isSet("ignorebutton");
    
    QCStringList env;
    TQCString options;

        TDEStartupInfoData data;
        data.setSilent( TDEStartupInfoData::Yes );
        TDEStartupInfo::sendChange( id, data );
        TDEsuDialog dlg(user, auth_user, keep && !terminal,icon, timeout);
	if (prompt)
	    dlg.addLine(i18n("Command:"), command);
        if ((priority != 50) || (scheduler != SuProcess::SchedNormal))

		dlg.addLine(i18n("Priority:"), prio);
        }
        int ret = dlg.exec();
        if (ret == TDEsuDialog::Rejected)
        {
            TDEStartupInfo::sendFinish( id );
            exit(0);
        }
        if (ret == TDEsuDialog::AsUser)
            change_uid = false;
        password = dlg.password();
        keep = dlg.keep();

Return to bug 985

Lines 14-20 Link Here

(-)tdebase/tdesu/tdesu/sudlg.cpp (-7 / +4 lines)
14	#include <tdesu/su.h>	14	#include <tdesu/su.h>
15	#include "sudlg.h"	15	#include "sudlg.h"
16		16
17	KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)	17	TDEsuDialog::TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, int timeout)
18	: KPasswordDialog(Password, enableKeep, 0, icon)	18	: KPasswordDialog(Password, enableKeep, 0, icon)
19	{	19	{
20	TDEConfig* config = TDEGlobal::config();	20	TDEConfig* config = TDEGlobal::config();
Lines 42-58 Link Here
42	}	42	}
43	setPrompt(prompt);	43	setPrompt(prompt);
44	setKeepWarning(i18n("<qt>The stored password will be:<br> * Kept for up to %1 minutes<br> * Destroyed on logout").arg(timeout/60));	44	setKeepWarning(i18n("<qt>The stored password will be:<br> * Kept for up to %1 minutes<br> * Destroyed on logout").arg(timeout/60));
45
46	if( withIgnoreButton )
47	setButtonText(User1, i18n("&Ignore"));
48	}	45	}
49		46
50		47
51	KDEsuDialog::~KDEsuDialog()	48	TDEsuDialog::~TDEsuDialog()
52	{	49	{
53	}	50	}
54		51
55	bool KDEsuDialog::checkPassword(const char *password)	52	bool TDEsuDialog::checkPassword(const char *password)
56	{	53	{
57	SuProcess proc;	54	SuProcess proc;
58	proc.setUser(m_User);	55	proc.setUser(m_User);
Lines 94-100 Link Here
94	}	91	}
95	}	92	}
96		93
97	void KDEsuDialog::slotUser1()	94	void TDEsuDialog::slotUser1()
98	{	95	{
99	done(AsUser);	96	done(AsUser);
100	}	97	}

Lines 9-22 Link Here

(-)tdebase/tdesu/tdesu/sudlg.h (-3 / +3 lines)
9		9
10	#include <kpassdlg.h>	10	#include <kpassdlg.h>
11		11
12	class KDEsuDialog	12	class TDEsuDialog
13	: public KPasswordDialog	13	: public KPasswordDialog
14	{	14	{
15	Q_OBJECT	15	Q_OBJECT
16		16
17	public:	17	public:
18	KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);	18	TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , int timeout=-1);
19	~KDEsuDialog();	19	~TDEsuDialog();
20		20
21	enum ResultCodes { AsUser = 10 };	21	enum ResultCodes { AsUser = 10 };
22		22

Lines 64-70 Link Here

(-)tdebase/tdesu/tdesu/tdesu.cpp (-5 / +3 lines)
64	{ "r", I18N_NOOP("Use realtime scheduling"), 0 },	64	{ "r", I18N_NOOP("Use realtime scheduling"), 0 },
65	{ "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },	65	{ "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },
66	{ "comment <comment>", I18N_NOOP("Ignored"), "" },	66	{ "comment <comment>", I18N_NOOP("Ignored"), "" },
67	{ "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 },
68	{ "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},	67	{ "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},
69	{ "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},	68	{ "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},
70	TDECmdLineLastOption	69	TDECmdLineLastOption
Lines 268-274 Link Here
268	bool keep = !args->isSet("n") && have_daemon;	267	bool keep = !args->isSet("n") && have_daemon;
269	bool terminal = args->isSet("t");	268	bool terminal = args->isSet("t");
270	bool new_dcop = args->isSet("newdcop");	269	bool new_dcop = args->isSet("newdcop");
271	bool withIgnoreButton = args->isSet("ignorebutton");
272		270
273	QCStringList env;	271	QCStringList env;
274	TQCString options;	272	TQCString options;
Lines 352-358 Link Here
352	TDEStartupInfoData data;	350	TDEStartupInfoData data;
353	data.setSilent( TDEStartupInfoData::Yes );	351	data.setSilent( TDEStartupInfoData::Yes );
354	TDEStartupInfo::sendChange( id, data );	352	TDEStartupInfo::sendChange( id, data );
355	KDEsuDialog dlg(user, auth_user, keep && !terminal,icon, withIgnoreButton, timeout);	353	TDEsuDialog dlg(user, auth_user, keep && !terminal,icon, timeout);
356	if (prompt)	354	if (prompt)
357	dlg.addLine(i18n("Command:"), command);	355	dlg.addLine(i18n("Command:"), command);
358	if ((priority != 50) \|\| (scheduler != SuProcess::SchedNormal))	356	if ((priority != 50) \|\| (scheduler != SuProcess::SchedNormal))
Lines 365-376 Link Here
365	dlg.addLine(i18n("Priority:"), prio);	363	dlg.addLine(i18n("Priority:"), prio);
366	}	364	}
367	int ret = dlg.exec();	365	int ret = dlg.exec();
368	if (ret == KDEsuDialog::Rejected)	366	if (ret == TDEsuDialog::Rejected)
369	{	367	{
370	TDEStartupInfo::sendFinish( id );	368	TDEStartupInfo::sendFinish( id );
371	exit(0);	369	exit(0);
372	}	370	}
373	if (ret == KDEsuDialog::AsUser)	371	if (ret == TDEsuDialog::AsUser)
374	change_uid = false;	372	change_uid = false;
375	password = dlg.password();	373	password = dlg.password();
376	keep = dlg.keep();	374	keep = dlg.keep();