[Pkg-owncloud-commits] [owncloud-client] 40/164: Activity view: Always add date

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 366f3f68b842f41cf653e109bf34298426de2be0
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Feb 19 10:45:29 2015 +0100

    Activity view: Always add date
    
    Fixes #2223
---
 src/gui/protocolwidget.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index 2440c36..baab619 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -161,17 +161,13 @@ QString ProtocolWidget::timeString(QDateTime dt, QLocale::FormatType format) con
 {
     QLocale loc = QLocale::system();
     QString timeStr;
-    QDate today = QDate::currentDate();
 
     if( format == QLocale::NarrowFormat ) {
-        if( dt.date().day() == today.day() ) {
-            timeStr = loc.toString(dt.time(), QLocale::NarrowFormat);
-        } else {
-            timeStr = loc.toString(dt, QLocale::NarrowFormat);
-        }
+        timeStr = loc.toString(dt, QLocale::NarrowFormat);
     } else {
         timeStr = loc.toString(dt, format);
     }
+
     return timeStr;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git