# HG changeset patch
# User Chris Cannam
# Date 1300285368 0
# Node ID 39a616befdbd156ca5f0089f64e0ab82a6312373
# Parent  b422d1bcfb3c3fb4d7e592c19d97243817b90e85# Parent  293d91cf44deafc5eed1b4a84a041828fae76d6a
Merge from branch "bug_90"

diff -r b422d1bcfb3c -r 39a616befdbd filestatuswidget.cpp
--- a/filestatuswidget.cpp	Wed Mar 16 12:18:50 2011 +0000
+++ b/filestatuswidget.cpp	Wed Mar 16 14:22:48 2011 +0000
@@ -251,8 +251,21 @@
 void FileStatusWidget::itemDoubleClicked(QListWidgetItem *item)
 {
     QStringList files;
-    files << item->text();
-    emit annotateFiles(files);
+    QString file = item->text();
+    files << file;
+
+    switch (m_fileStates.stateOf(file)) {
+
+    case FileStates::Modified:
+    case FileStates::InConflict:
+        emit diffFiles(files);
+        break;
+
+    case FileStates::Clean:
+    case FileStates::Missing:
+        emit annotateFiles(files);
+        break;
+    }
 }
 
 void FileStatusWidget::itemSelectionChanged()