Diffstat (limited to 'libopie2/opiesecurity/multiauthcommon.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiesecurity/multiauthcommon.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libopie2/opiesecurity/multiauthcommon.cpp b/libopie2/opiesecurity/multiauthcommon.cpp index e563193..2760760 100644 --- a/libopie2/opiesecurity/multiauthcommon.cpp +++ b/libopie2/opiesecurity/multiauthcommon.cpp | |||
@@ -1,12 +1,14 @@ | |||
1 | #include "multiauthplugininterface.h" | 1 | #include "multiauthplugininterface.h" |
2 | #include "multiauthcommon.h" | 2 | #include "multiauthcommon.h" |
3 | 3 | ||
4 | /* Opie */ | 4 | /* Opie */ |
5 | #include <opie2/odebug.h> | 5 | #include <opie2/odebug.h> |
6 | #include <opie2/oapplication.h> | 6 | #include <opie2/oapplication.h> |
7 | #include <opie2/ocontactaccessbackend_vcard.h> | ||
8 | #include <opie2/ocontactaccess.h> | ||
7 | 9 | ||
8 | /* Qt */ | 10 | /* Qt */ |
9 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
10 | #include <qpe/qlibrary.h> | 12 | #include <qpe/qlibrary.h> |
11 | #include <qpe/qcom.h> | 13 | #include <qpe/qcom.h> |
12 | #include <qtextview.h> | 14 | #include <qtextview.h> |
@@ -16,25 +18,25 @@ | |||
16 | #include <unistd.h> | 18 | #include <unistd.h> |
17 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
18 | 20 | ||
19 | namespace Opie { | 21 | namespace Opie { |
20 | namespace Security { | 22 | namespace Security { |
21 | 23 | ||
22 | SecOwnerDlg::SecOwnerDlg( QWidget *parent, const char * name, Contact c, | 24 | SecOwnerDlg::SecOwnerDlg( QWidget *parent, const char * name, const QString& c, |
23 | bool modal, bool fullscreen = FALSE ) | 25 | bool modal, bool fullscreen = FALSE ) |
24 | : QDialog( parent, name, modal, | 26 | : QDialog( parent, name, modal, |
25 | fullscreen ? | 27 | fullscreen ? |
26 | WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop : 0 ) | 28 | WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop : 0 ) |
27 | { | 29 | { |
28 | if ( fullscreen ) { | 30 | if ( fullscreen ) { |
29 | QRect desk = qApp->desktop()->geometry(); | 31 | QRect desk = qApp->desktop()->geometry(); |
30 | setGeometry( 0, 0, desk.width(), desk.height() ); | 32 | setGeometry( 0, 0, desk.width(), desk.height() ); |
31 | } | 33 | } |
32 | // set up contents. | 34 | // set up contents. |
33 | QString text("<H3>" + tr("Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner") + "</H3>"); | 35 | QString text("<H3>" + tr("Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner") + "</H3>"); |
34 | text += c.toRichText(); | 36 | text += c; |
35 | tv = new QTextView(this); | 37 | tv = new QTextView(this); |
36 | tv->setText(text); | 38 | tv->setText(text); |
37 | 39 | ||
38 | tv->viewport()->installEventFilter(this); | 40 | tv->viewport()->installEventFilter(this); |
39 | } | 41 | } |
40 | 42 | ||
@@ -60,17 +62,18 @@ namespace Internal { | |||
60 | int runPlugins() { | 62 | int runPlugins() { |
61 | 63 | ||
62 | SecOwnerDlg *oi = 0; | 64 | SecOwnerDlg *oi = 0; |
63 | // see if there is contact information. | 65 | // see if there is contact information. |
64 | QString vfilename = Global::applicationFileName("addressbook", | 66 | QString vfilename = Global::applicationFileName("addressbook", |
65 | "businesscard.vcf"); | 67 | "businesscard.vcf"); |
66 | if (QFile::exists(vfilename)) { | 68 | Opie::OPimContactAccess acc( "multiauth", vfilename, |
67 | Contact c; | 69 | new Opie::OPimContactAccessBackend_VCard( "multiauth", vfilename ) ); |
68 | c = Contact::readVCard( vfilename )[0]; | 70 | if ( acc.load() ) { |
69 | 71 | Opie::OPimContact contact = acc.allRecords()[0]; | |
70 | oi = new SecOwnerDlg(0, 0, c, TRUE, TRUE); | 72 | if ( !contact.isEmpty() ) |
73 | oi = new SecOwnerDlg(0, 0, contact.toRichText(), TRUE, TRUE); | ||
71 | } | 74 | } |
72 | 75 | ||
73 | Config config("Security"); | 76 | Config config("Security"); |
74 | config.setGroup("Plugins"); | 77 | config.setGroup("Plugins"); |
75 | QStringList plugins = config.readListEntry("IncludePlugins", ','); | 78 | QStringList plugins = config.readListEntry("IncludePlugins", ','); |
76 | /* if there are no configured plugins, we simply return 0 to | 79 | /* if there are no configured plugins, we simply return 0 to |
@@ -183,13 +186,13 @@ int runPlugins() { | |||
183 | } | 186 | } |
184 | } else { | 187 | } else { |
185 | owarn << "Could not recognize plugin " << QString( path + "/" + *libIt ) << oendl; | 188 | owarn << "Could not recognize plugin " << QString( path + "/" + *libIt ) << oendl; |
186 | delete lib; | 189 | delete lib; |
187 | } // end if plugin recognized | 190 | } // end if plugin recognized |
188 | } //end for | 191 | } //end for |
189 | if(oi) delete oi; | 192 | delete oi; |
190 | return 1; | 193 | return 1; |
191 | } | 194 | } |
192 | 195 | ||
193 | } | 196 | } |
194 | } | 197 | } |
195 | } | 198 | } |