Fix show two icon when we use kontact.

wilder-work
Laurent Montel 8 years ago
parent 10ab845b8c
commit e727d73937
  1. 1
      src/kmail_part.cpp
  2. 5
      src/kmmainwidget.cpp
  3. 1
      src/kmmainwidget.h
  4. 4
      src/widgets/vacationscriptindicatorwidget.cpp

@ -131,7 +131,6 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
mainWidget->initializeFilterActions();
mainWidget->tagActionManager()->createActions();
mainWidget->folderShortcutActionManager()->createActions();
mainWidget->updateVacationScriptStatus();
mainWidget->populateMessageListStatusFilterCombo();
mainWidget->initializePluginActions();
/*

@ -4338,11 +4338,6 @@ QWidget *KMMainWidget::vacationScriptIndicator() const
return mVacationScriptIndicator;
}
void KMMainWidget::updateVacationScriptStatus()
{
updateVacationScriptStatus(mVacationIndicatorActive);
}
FolderTreeView *KMMainWidget::folderTreeView() const
{
return mFolderTreeWidget->folderTreeView();

@ -138,7 +138,6 @@ public:
static const PtrList *mainWidgetList();
QWidget *vacationScriptIndicator() const;
void updateVacationScriptStatus();
MailCommon::FolderTreeView *folderTreeView() const;

@ -80,6 +80,10 @@ VacationScriptIndicatorWidget::~VacationScriptIndicatorWidget()
void VacationScriptIndicatorWidget::setVacationScriptActive(bool active, const QString &serverName)
{
if (serverName.isEmpty()) {
return;
}
if (active) {
if (!mServerActive.contains(serverName)) {
mServerActive.append(serverName);

Loading…
Cancel
Save