ALT Linux repositórios
Group :: Ferramentas de texto
RPM: kdiff3
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: kdiff3-0.9.95_avoid_equal_files_dialog.diff
Download
Download
--- /usr/pic1/software/orig_kdiff3/src-QT4/pdiff.cpp 2009-02-08 11:35:53.000000000 -0800
+++ /usr/pic1/software/kdiff3-0.9.95/src-QT4/pdiff.cpp 2009-12-03 11:03:17.000000000 -0800
@@ -542,7 +542,7 @@
}
if ( !totalInfo.isEmpty() )
- KMessageBox::information( this, totalInfo );
+ slotStatusMsg( totalInfo );
}
if ( bVisibleMergeResultWindow && (!m_sd1.isText() || !m_sd2.isText() || !m_sd3.isText()) )
@@ -1138,7 +1138,6 @@
}
slotUpdateAvailabilities();
- slotStatusMsg(i18n("Ready."));
}
void KDiff3App::slotFileOpen2(QString fn1, QString fn2, QString fn3, QString ofn,
@@ -1210,7 +1209,6 @@
}
}
}
- slotStatusMsg(i18n("Ready."));
}