~ubuntu-branches/ubuntu/quantal/minitube/quantal

Committer: Package Import Robot
Author(s): Jakob Haufe
Date: 2011-12-07 02:50:04 UTC
mfrom: (1.2.8)
mto: This revision was merged to the branch mainline in revision 11.
Revision ID: package-import@ubuntu.com-20111207025004-pnau0mqh9qyc9wte

http://bugs.debian.org/650622

http://bugs.debian.org/647212

* New upstream version (Closes: #650622, #647212)
* Recreate debian/patches/disable-update-check
* Recreate debian/patches/proper-tempfiles

files added:
.pc/disable-update-check/src/MainWindow.cpp

.pc/proper-tempfiles/src/temporary.cpp

.pc/proper-tempfiles/src/temporary.h

locale/ca.ts

locale/fr.ts

locale/it.ts

locale/nb.ts

locale/pl.ts

locale/pt.ts

locale/ru.ts

locale/te.ts

locale/tr.ts

src/temporary.cpp

src/temporary.h

files removed:
.pc/disable-update-check/src/SearchView.cpp

.pc/proper-tempfiles/src/MediaView.cpp

.pc/proper-tempfiles/src/MediaView.h

locale/bg.ts

locale/bg_BG.ts

locale/en_US.ts

locale/fa.ts

locale/fi.ts

locale/fr_FR.ts

locale/hr_HR.ts

locale/it_IT.ts

locale/ja_JP.ts

locale/km.ts

locale/nb_NO.ts

locale/nl_NL.ts

locale/pt_PT.ts

locale/ro_RO.ts

locale/ru_RU.ts

locale/th.ts

locale/tr_TR.ts

src/faderwidget

src/faderwidget/FaderWidget.cpp

src/faderwidget/FaderWidget.h

files modified:
.gitignore

CHANGES

INSTALL

TODO

debian/changelog

debian/patches/disable-update-check

debian/patches/proper-tempfiles

debian/watch

empty.ts

locale/ar.ts

locale/ca_ES.ts

locale/cs_CZ.ts

locale/da.ts

locale/de_DE.ts

locale/el.ts

locale/el_GR.ts

locale/es.ts

locale/es_AR.ts

locale/es_ES.ts

locale/fi_FI.ts

locale/gl.ts

locale/he_IL.ts

locale/hr.ts

locale/hu.ts

locale/hu_HU.ts

locale/ia.ts

locale/id.ts

locale/id_ID.ts

locale/jv.ts

locale/locale.pri

locale/lv.ts

locale/nl.ts

locale/pl_PL.ts

locale/pt_BR.ts

locale/ro.ts

locale/sl.ts

locale/sq.ts

locale/sr.ts

locale/sv_SE.ts

locale/uk.ts

locale/uk_UA.ts

locale/zh_CN.ts

minitube.pro

src/AboutView.cpp

src/AboutView.h

src/ListModel.cpp

src/MainWindow.cpp

src/MainWindow.h

src/MediaView.cpp

src/MediaView.h

src/SearchView.cpp

src/SearchView.h

src/constants.cpp

src/constants.h

src/downloaditem.cpp

src/downloadmanager.cpp

src/global.h

src/iconloader/qticonloader.cpp

src/main.cpp

src/networkaccess.cpp

src/networkaccess.h

src/playlist/PrettyItemDelegate.cpp

src/playlist/PrettyItemDelegate.h

src/qtsingleapplication/qtlocalpeer.cpp

src/searchlineedit.cpp

src/searchparams.cpp

src/searchparams.h

src/updatechecker.cpp

src/urllineedit.cpp

src/videoareawidget.cpp

src/youtubesearch.cpp

src/youtubestreamreader.cpp

Show diffs side-by-side

added added

removed removed

src/ListModel.cpp

203

204

// save keyword

205

QString query = searchParams->keywords();

206

if (!query.isEmpty()) {

206

if (!query.isEmpty() && !searchParams->isTransient()) {

207

if (query.startsWith("http://")) {

208

// Save the video title

209

query += "|" + videos.first()->title();

219

220

// save channel

221

QString channel = searchParams->author();

222

if (!channel.isEmpty()) {

222

if (!channel.isEmpty() && !searchParams->isTransient()) {

223

QSettings settings;

224

QStringList channels = settings.value(recentChannelsKey).toStringList();

225

channels.removeAll(channel);

Older »