[repo.or.cz] nomnom.git branch next updated: 0.1.4-23-g7b17446

[<nom...@li...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.

The branch, next has been updated
       via  7b174464bfc6553dce9f480879f2b05298933eff (commit)
       via  04cd7a41d9996707e4c6247c906c35df4648d678 (commit)
      from  49cc661bc8b553d62b73bed771b121f00c341cb1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/7b174464bfc6553dce9f480879f2b05298933eff

commit 7b174464bfc6553dce9f480879f2b05298933eff
Author: Toni Gundogdu <le...@gm...>
Date:   Wed Oct 12 12:12:52 2011 +0300

    Use umph returned output as error message
    
     * If "error:" was not matched

diff --git a/src/feed/nfeedprogressdialog.cpp b/src/feed/nfeedprogressdialog.cpp
index 1774c49..c82fb4c 100644
--- a/src/feed/nfeedprogressdialog.cpp
+++ b/src/feed/nfeedprogressdialog.cpp
@@ -130,7 +130,7 @@ void NFeedProgressDialog::finished(int ec, QProcess::ExitStatus es)
           if (rx.indexIn(_buffer) != -1)
             _errmsg = rx.cap(1).simplified();
           else
-            _errmsg = tr("Unknown error occurred");
+            _errmsg = _buffer;
         }
     }
   cancel();

http://repo.or.cz/w/nomnom.git/commit/04cd7a41d9996707e4c6247c906c35df4648d678

commit 04cd7a41d9996707e4c6247c906c35df4648d678
Author: Toni Gundogdu <le...@gm...>
Date:   Wed Oct 12 12:04:35 2011 +0300

    Prompt for parsing a feed if the list is empty

diff --git a/src/feed/nfeeddialog.cpp b/src/feed/nfeeddialog.cpp
index 45c6745..980458c 100644
--- a/src/feed/nfeeddialog.cpp
+++ b/src/feed/nfeeddialog.cpp
@@ -77,8 +77,16 @@ void NFeedDialog::done(int n)
     {
       if (_selected.isEmpty())
         {
-          _toolbox->setCurrentIndex(1);
-          m_info(this, tr("Please select an item from the list"));
+          if (feedItems.count() == 0)
+            {
+              _toolbox->setCurrentIndex(0);
+              m_info(this, tr("Please read a feed"));
+            }
+          else
+            {
+              _toolbox->setCurrentIndex(1);
+              m_info(this, tr("Please select an item from the list"));
+            }
           return;
         }
     }

-----------------------------------------------------------------------

Summary of changes:
 src/feed/nfeeddialog.cpp         |   12 ++++++++++--
 src/feed/nfeedprogressdialog.cpp |    2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)


repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
-- 
nomnom.git ("The graphical media download tool")