From 390c6947a8b65f74d3cd08a527ee1240a334b246 Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Thu, 12 Jun 2014 21:12:46 +0200 Subject: [PATCH] Refresh patches --- debian/changelog | 1 + debian/patches/assure-quit-keybinding | 9 +++++---- debian/patches/disable-update-check | 14 +++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21c86c7..2a0d699 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ minitube (2.1.3-1) UNRELEASED; urgency=low * New upstream version * Update watchfile to work with new Gitorious + * Refresh patches -- Jakob Haufe Mon, 23 Sep 2013 16:01:31 +0200 diff --git a/debian/patches/assure-quit-keybinding b/debian/patches/assure-quit-keybinding index 81fc52e..13f1f50 100644 --- a/debian/patches/assure-quit-keybinding +++ b/debian/patches/assure-quit-keybinding @@ -4,16 +4,17 @@ Description: Make Ctrl+Q work on normal X11 desktops explicitely add Ctrl+Q back. Author: Jakob Haufe Forwarded: no -Last-Update: 2012-02-16 +Last-Update: 2014-01-25 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp -index bb815c0..5f82732 100644 +index 3392ff2..2e97174 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp -@@ -334,6 +334,9 @@ void MainWindow::createActions() { +@@ -376,7 +376,9 @@ void MainWindow::createActions() { + quitAct = new QAction(tr("&Quit"), this); quitAct->setMenuRole(QAction::QuitRole); - quitAct->setShortcut(QKeySequence(QKeySequence::Quit)); +- quitAct->setShortcut(QKeySequence(QKeySequence::Quit)); + quitAct->setShortcuts(QList() + << QKeySequence(QKeySequence::Quit) + << QKeySequence(Qt::CTRL + Qt::Key_Q)); diff --git a/debian/patches/disable-update-check b/debian/patches/disable-update-check index f828c45..dbc66b9 100644 --- a/debian/patches/disable-update-check +++ b/debian/patches/disable-update-check @@ -2,15 +2,15 @@ Description: Disable update check as it's useless for a packaged version Author: Jakob Haufe diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp -index bb815c0..4304fa3 100644 +index 3392ff2..a18e7f0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp -@@ -146,7 +146,7 @@ MainWindow::MainWindow() : - mouseTimer->setSingleShot(true); - connect(mouseTimer, SIGNAL(timeout()), SLOT(hideMouse())); +@@ -197,7 +197,7 @@ void MainWindow::lazyInit() { -- QTimer::singleShot(0, this, SLOT(checkForUpdate())); -+ //QTimer::singleShot(0, this, SLOT(checkForUpdate())); + JsFunctions::instance(); - } +- checkForUpdate(); ++ //checkForUpdate(); + ChannelAggregator::instance()->start(); + } -- 2.39.5