Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KMail
Commits
1d6b44ab
Commit
1d6b44ab
authored
Dec 25, 2019
by
Laurent Montel
😁
Browse files
GIT_SILENT: coding style
parent
886ef299
Changes
2
Hide whitespace changes
Inline
Side-by-side
agents/followupreminderagent/followupremindernoanswerdialog.cpp
View file @
1d6b44ab
...
...
@@ -38,7 +38,6 @@
static
const
char
s_fdo_notifications_service
[]
=
"org.freedesktop.Notifications"
;
static
const
char
s_fdo_notifications_path
[]
=
"/org/freedesktop/Notifications"
;
FollowUpReminderNoAnswerDialog
::
FollowUpReminderNoAnswerDialog
(
QWidget
*
parent
)
:
QDialog
(
parent
)
{
...
...
@@ -67,9 +66,9 @@ FollowUpReminderNoAnswerDialog::FollowUpReminderNoAnswerDialog(QWidget *parent)
QDBusConnection
dbusConn
=
QDBusConnection
::
sessionBus
();
if
(
dbusConn
.
interface
()
->
isServiceRegistered
(
QString
::
fromLatin1
(
s_fdo_notifications_service
)))
{
OrgFreedesktopDBusPropertiesInterface
*
propsIface
=
new
OrgFreedesktopDBusPropertiesInterface
(
QString
::
fromLatin1
(
s_fdo_notifications_service
),
QString
::
fromLatin1
(
s_fdo_notifications_path
),
dbusConn
,
this
);
QString
::
fromLatin1
(
s_fdo_notifications_service
),
QString
::
fromLatin1
(
s_fdo_notifications_path
),
dbusConn
,
this
);
connect
(
propsIface
,
&
OrgFreedesktopDBusPropertiesInterface
::
PropertiesChanged
,
this
,
&
FollowUpReminderNoAnswerDialog
::
slotDBusNotificationsPropertiesChanged
);
}
...
...
@@ -87,9 +86,9 @@ void FollowUpReminderNoAnswerDialog::wakeUp()
QDBusConnection
dbusConn
=
QDBusConnection
::
sessionBus
();
if
(
dbusConn
.
interface
()
->
isServiceRegistered
(
QString
::
fromLatin1
(
s_fdo_notifications_service
)))
{
OrgFreedesktopNotificationsInterface
iface
(
QString
::
fromLatin1
(
s_fdo_notifications_service
),
QString
::
fromLatin1
(
s_fdo_notifications_path
),
dbusConn
);
QString
::
fromLatin1
(
s_fdo_notifications_service
),
QString
::
fromLatin1
(
s_fdo_notifications_path
),
dbusConn
);
if
(
iface
.
inhibited
())
{
return
;
}
...
...
@@ -98,9 +97,7 @@ void FollowUpReminderNoAnswerDialog::wakeUp()
}
void
FollowUpReminderNoAnswerDialog
::
slotDBusNotificationsPropertiesChanged
(
const
QString
&
interface
,
const
QVariantMap
&
changedProperties
,
const
QStringList
&
invalidatedProperties
)
const
QString
&
interface
,
const
QVariantMap
&
changedProperties
,
const
QStringList
&
invalidatedProperties
)
{
Q_UNUSED
(
interface
);
// always "org.freedesktop.Notifications"
Q_UNUSED
(
invalidatedProperties
);
...
...
src/kmmainwidget.cpp
View file @
1d6b44ab
...
...
@@ -344,6 +344,7 @@ QWidget *KMMainWidget::dkimWidgetInfo() const
}
return
nullptr
;
}
#endif
void
KMMainWidget
::
restoreCollectionFolderViewConfig
()
...
...
@@ -4102,7 +4103,9 @@ void KMMainWidget::slotIntro()
void
KMMainWidget
::
slotShowStartupFolder
()
{
connect
(
MailCommon
::
FilterManager
::
instance
(),
&
FilterManager
::
filtersChanged
,
this
,
[
this
]()
{
initializeFilterActions
(
true
);
});
this
,
[
this
]()
{
initializeFilterActions
(
true
);
});
// Plug various action lists. This can't be done in the constructor, as that is called before
// the main window or Kontact calls createGUI().
// This function however is called with a single shot timer.
...
...
Write
Preview
Supports
Markdown
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