Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Unmaintained
KDE Pim
Commits
1dc2bea0
Commit
1dc2bea0
authored
Dec 16, 2014
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
not necessary to put in a static method
parent
c0193473
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
19 deletions
+11
-19
kmail/kmlaunchexternalcomponent.cpp
kmail/kmlaunchexternalcomponent.cpp
+9
-1
kmail/kmmainwidget.cpp
kmail/kmmainwidget.cpp
+2
-2
kmail/util.cpp
kmail/util.cpp
+0
-14
kmail/util.h
kmail/util.h
+0
-2
No files found.
kmail/kmlaunchexternalcomponent.cpp
View file @
1dc2bea0
...
...
@@ -121,5 +121,13 @@ void KMLaunchExternalComponent::slotImport()
void
KMLaunchExternalComponent
::
slotAccountWizard
()
{
KMail
::
Util
::
launchAccountWizard
(
mParentWidget
);
QStringList
lst
;
lst
.
append
(
QLatin1String
(
"--type"
)
);
lst
.
append
(
QLatin1String
(
"message/rfc822"
)
);
const
QString
path
=
KStandardDirs
::
findExe
(
QLatin1String
(
"accountwizard"
)
);
if
(
!
QProcess
::
startDetached
(
path
,
lst
)
)
KMessageBox
::
error
(
mParentWidget
,
i18n
(
"Could not start the account wizard. "
"Please check your installation."
),
i18n
(
"Unable to start account wizard"
)
);
}
kmail/kmmainwidget.cpp
View file @
1dc2bea0
...
...
@@ -325,10 +325,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
i18n
(
"Unable to start import wizard"
)
);
}
}
else
{
KMail
::
Util
::
launch
AccountWizard
(
this
);
mLaunchExternalComponent
->
slot
AccountWizard
();
}
}
else
{
KMail
::
Util
::
launch
AccountWizard
(
this
);
mLaunchExternalComponent
->
slot
AccountWizard
();
}
}
// must be the last line of the constructor:
...
...
kmail/util.cpp
View file @
1dc2bea0
...
...
@@ -85,20 +85,6 @@ Akonadi::Item::Id KMail::Util::putRepliesInSameFolder( const Akonadi::Item& item
return
-
1
;
}
void
KMail
::
Util
::
launchAccountWizard
(
QWidget
*
w
)
{
QStringList
lst
;
lst
.
append
(
QLatin1String
(
"--type"
)
);
lst
.
append
(
QLatin1String
(
"message/rfc822"
)
);
const
QString
path
=
KStandardDirs
::
findExe
(
QLatin1String
(
"accountwizard"
)
);
if
(
!
QProcess
::
startDetached
(
path
,
lst
)
)
KMessageBox
::
error
(
w
,
i18n
(
"Could not start the account wizard. "
"Please check your installation."
),
i18n
(
"Unable to start account wizard"
)
);
}
bool
KMail
::
Util
::
handleClickedURL
(
const
KUrl
&
url
,
const
QSharedPointer
<
MailCommon
::
FolderCollection
>
&
folder
)
{
if
(
url
.
protocol
()
==
QLatin1String
(
"mailto"
)
)
{
...
...
kmail/util.h
View file @
1dc2bea0
...
...
@@ -79,8 +79,6 @@ KMime::Types::Mailbox::List mailingListsFromMessage( const Akonadi::Item& item )
*/
Akonadi
::
Item
::
Id
putRepliesInSameFolder
(
const
Akonadi
::
Item
&
item
);
void
launchAccountWizard
(
QWidget
*
);
/**
* Handles a clicked URL, but only in case the viewer didn't handle it.
* Currently only support mailto.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment