Merge lp://staging/~yuningdodo/rhythmbox/cleanup_open_location_thread into lp://staging/rhythmbox
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~yuningdodo/rhythmbox/cleanup_open_location_thread | ||||
| Merge into: | lp://staging/rhythmbox | ||||
| Prerequisite: | lp://staging/ubuntu/quantal/rhythmbox | ||||
| Diff against target: |
13 lines (+3/-0) (has conflicts) 1 file modified
shell/rb-shell-player.c (+3/-0) Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file ChangeLog. Moved existing file to ChangeLog.moved. Conflict adding file DOCUMENTERS. Moved existing file to DOCUMENTERS.moved. Conflict adding file INTERNALS. Moved existing file to INTERNALS.moved. Conflict adding file MAINTAINERS. Moved existing file to MAINTAINERS.moved. Conflict adding file MAINTAINERS.old. Moved existing file to MAINTAINERS.old.moved. Conflict adding file Makefile.am. Moved existing file to Makefile.am.moved. Conflict adding file NEWS. Moved existing file to NEWS.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file THANKS. Moved existing file to THANKS.moved. Conflict adding file autogen.sh. Moved existing file to autogen.sh.moved. Conflict adding file backends. Moved existing file to backends.moved. Conflict adding file bindings. Moved existing file to bindings.moved. Conflict adding file configure.ac. Moved existing file to configure.ac.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding file help. Moved existing file to help.moved. Conflict adding file lib. Moved existing file to lib.moved. Conflict adding file macros. Moved existing file to macros.moved. Conflict adding file metadata. Moved existing file to metadata.moved. Conflict adding file plugins. Moved existing file to plugins.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file podcast. Moved existing file to podcast.moved. Conflict adding file remote. Moved existing file to remote.moved. Conflict adding file rhythmbox.pc.in. Moved existing file to rhythmbox.pc.in.moved. Conflict adding file rhythmdb. Moved existing file to rhythmdb.moved. Conflict adding file shell. Moved existing file to shell.moved. Conflict adding file sources. Moved existing file to sources.moved. Conflict adding file tests. Moved existing file to tests.moved. Conflict adding file widgets. Moved existing file to widgets.moved. |
||||
| To merge this branch: | bzr merge lp://staging/~yuningdodo/rhythmbox/cleanup_open_location_thread | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jeremy Bícha (community) | Disapprove | ||
| Jonathan Matthew | Pending | ||
|
Review via email:
|
|||
Description of the change
Hi,
rhythmbox may miss some cleanup in the "open location" thread, which should be the cause of bug #795765.
I am trying to fix this, please have a review, and let me improve it.
Thanks
Ning
| Yu Ning (yuningdodo) wrote | # |
Unmerged revisions
- 220. By Yu Ning
-
Destroy parser_cancelable after parsing finished.
If we do not destroy it then we can not resume a paused play.
(LP: #795765)
- 219. By Michael Terry
-
[ Martin Pitt ]
* debian/source_ rhythmbox. py: Fix package name, it's rhythmbox-ubuntuone
now.[ Jeremy Bicha ]
* debian/rhythmbox. gsettings- override:
- Dropped, override moved to ubuntu-settings[ Michael Terry ]
* debian/patches/ git_crash_ during_ monitor. patch:
- Backport git patches to guard against crashing due to monitoring
files outside library (by moving a g_strfreev and also just stopping
monitoring such files at all). LP: #1029333 - 218. By Sebastien Bacher
-
debian/
patches/ git_scale_ click.patch: git patch, drop hack which was
breaking "click to jump" behaviour with gtk 3.5 (lp: #953757) - 217. By Iain Lane
-
[ Sebastien Bacher ]
* debian/patches/ 09_keywords. patch:
- backport upstream patch to set keywords in the desktop entry,
it makes easier to find totem in the unity dash or gnome-shell
(lp: #1029964)[ Iain Lane ]
* debian/*.prs, debian/patches/ 10_encoding_ use_ubuntu_ profiles. patch: Add an
OGG and MP3 preset with improved defaults to use when encoding. Patch
rhythmbox.gep to work with user-supplied custom settings (LP: #945987)
* debian/patches/ dont_free_ consumed_ floating_ gvariant. patch: Take patch from
upstream bug#680842 (by Ryan Lortie) to not crash when opening preferences
dialog by trying to free an already consumed value. (LP: #1030295)
* Add Breaks and Replaces on versions of transmageddon which shipped the
.prs files we are now shipping in -data. - 216. By Jamie Strandboge
-
* SECURITY UPDATE: fix insecure directory for python module import in
context plugin
- debian/patches/ 08_CVE- 2012-3355. patch: update context plugin to use
tempfile.mkdtemp( ) instead of /tmp/context. Patch thanks to
Andreas Henriksson.
- CVE-2012-3355 - 215. By Iain Lane
-
* Resynchronise with Debian, remaining changes:
- debian/source_ rhythmbox. py: Add apport hook
- debian/control, debian/*.install:
+ Move some core plug-ins into main rhythmbox package.
o audiocd, generic-player, iradio, mmkeys, power-manager, rb
+ Split out the zeitgeist plug-in to a separate package.
+ Split out the magnatune store plug-in to a separate package.
+ Split out the visualizer plug-in to a separate package.
- debian/patches/ 00git_musicbrai nz5.patch:
+ Build against musicbrainz5
- debian/patches/ 02_use_ escaped_ podcast_ uri.patch
+ Handle podcasts that have sound files with the same basename
- debian/patches/ 03_magnatune_ partner. patch:
+ Change magnatune partner ID to 'ubuntu'.
- debian/patches/ 04_pause_ button. patch
+ Turn 'Play' button into 'Play/Pause'.
- debian/patches/ 05_hide_ on_quit. patch
+ Hide (not quit) if RB is playing when closed.
- debian/patches/ 07_quicklists. patch
+ Add quicklists.
- debian/rhythmbox. gsettings- override
+ Enable a selection of plugins by default.
* debian/control
- Enable the visualizer plugin since libmx is now in main.
- Add a versioned Replaces for librhythmbox-core6 to -core5 due to the
previous uploads inadvertantly shipping the new SONAMEd library in an old
named package.
* debian/rules: Don't try to make shlibs for packages which only ship plugins. - 214. By Robert Ancell
-
* debian/control:
- Build-depends on libmusicbrainz5-dev
* debian/patches/ 00git_musicbrai nz5.patch:
- Build against musicbrainz5 - 213. By Iain Lane
-
* New upstream release 2.97 (LP: #1008406)
- New more compact header layout, including album art
- Deprecated artdisplay plugin
- Fixed buffering for network streams
- Configurable encoding settings for the library, using GStreamer presets or
simple quality settings
- Doesn't preserve mtime on metadata updates
- Fixed audio CD extraction speed
- New podcast subscription interface, including iTunes and Miroguide
searching and auditioning before subscription
* Drop all git backported packages; in this release.
* Drop debian/patches/ 06_manual_ connect_ daap_host. patch: upstream and not
in series.
* Refresh other patches.
* Add BD on libxml2-dev, as required by configure.
* Adjust packaging for removal of artdisplay. - 212. By Bryce Harrington
-
No change rebuild
- 211. By Bryce Harrington
-
Only prompt user to specify type of bug if it isn't a crash.
I.e., if there is no stacktrace present.
For Ubuntu, we need this to be a separate patch instead of modifying the source code directly.
I have converted your patch into a quilt patch in debian/patches/ and uploaded to the Quantal SRU queue. I plan to test on Precise as well and upload there too.
Are you willing and able to submit this patch to GNOME? https:/