[repo.or.cz] nomnom.git branch next updated: v0.2.0-2-g587399e

[<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  587399e1d3bbee37e0ec72644d2186aabadca5e2 (commit)
       via  366924d88ba3fbd04c6ed27fa1e63a03208f0a9b (commit)
      from  d9050e2badf01d3aa3d768148aa70a19b771c350 (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/587399e1d3bbee37e0ec72644d2186aabadca5e2

commit 587399e1d3bbee37e0ec72644d2186aabadca5e2
Author: Toni Gundogdu <le...@gm...>
Date:   Fri Oct 21 22:10:52 2011 +0300

    Use VN instead of (PACKAGE_)VERSION

diff --git a/src/i/MainWindow.cpp b/src/i/MainWindow.cpp
index 652e2af..bff7733 100644
--- a/src/i/MainWindow.cpp
+++ b/src/i/MainWindow.cpp
@@ -139,7 +139,7 @@ void MainWindow::createContextMenu()
 
 void MainWindow::createTrayIcon()
 {
-  systray = new nn::NSysTray(this, QString("<b>NomNom</b> %1").arg(VERSION));
+  systray = new nn::NSysTray(this, QString("<b>NomNom</b> %1").arg(VN));
 
   connect(systray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
           this, SLOT(activated(QSystemTrayIcon::ActivationReason)));
@@ -625,7 +625,7 @@ void MainWindow::onSettings()
 
 void MainWindow::onAbout()
 {
-  nn::NAboutDialog *d = new nn::NAboutDialog(VERSION, WWW, this);
+  nn::NAboutDialog *d = new nn::NAboutDialog(VN, WWW, this);
   d->exec();
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 88d9360..0a2a8e2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -114,7 +114,7 @@ static bool print_locale()
 
 static bool print_version()
 {
-  std::clog << PACKAGE_VERSION << std::endl;
+  std::clog << VN << std::endl;
 }
 
 static bool print_help()
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
   QCoreApplication::setOrganizationName  (APPNAME);
   QCoreApplication::setOrganizationDomain(APPDOMAIN);
   QCoreApplication::setApplicationName   (APPNAME);
-  QCoreApplication::setApplicationVersion(PACKAGE_VERSION);
+  QCoreApplication::setApplicationVersion(VN);
 #undef APPNAME
 #undef APPDOMAIN
 

http://repo.or.cz/w/nomnom.git/commit/366924d88ba3fbd04c6ed27fa1e63a03208f0a9b

commit 366924d88ba3fbd04c6ed27fa1e63a03208f0a9b
Author: Toni Gundogdu <le...@gm...>
Date:   Fri Oct 21 22:07:04 2011 +0300

    Remove outdated examples/NomNom.conf

diff --git a/Makefile.am b/Makefile.am
index 4c6c9cd..6e004c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 ACLOCAL_AMFLAGS=-I m4
 
 EXTRA_DIST=- examples/NomNom.conf   nomnom.desktop.in   README.packagers   nomnom.xpm diff --git a/examples/NomNom.conf b/examples/NomNom.conf
deleted file mode 100644
index 6ca24bc..0000000
--- a/examples/NomNom.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[SharedPreferences]
-quviPath=/usr/bin/quvi --category-http %u
-curlPath=/usr/bin/curl -L -C - -o %f %u
-playerPath=/usr/bin/xdg-open %u
-umphPath=/usr/bin/umph
-filenameFormat=%t.%s
-regexp=/(\w|\s)/g

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

Summary of changes:
 Makefile.am          |    1 -
 examples/NomNom.conf |    7 -------
 src/i/MainWindow.cpp |    4 ++--
 src/main.cpp         |    4 ++--
 4 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 examples/NomNom.conf


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")