aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog813
-rw-r--r--debian/compat1
-rw-r--r--debian/control48
-rw-r--r--debian/copyright37
-rw-r--r--debian/indicator-sound-gtk2.install1
-rw-r--r--debian/indicator-sound.install1
-rw-r--r--debian/patches/lp_945827.patch449
-rw-r--r--debian/patches/lp_960846.patch166
-rw-r--r--debian/patches/series4
-rw-r--r--debian/patches/sound_nua.patch20
-rw-r--r--debian/patches/sound_xubuntu.patch17
-rwxr-xr-xdebian/rules25
-rw-r--r--debian/source/format1
-rw-r--r--debian/watch2
-rw-r--r--src/sound-service-dbus.c10
15 files changed, 1594 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..9371bd2
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,813 @@
+indicator-sound (0.8.5.0-0ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Inconsistency between messaging menu and sound menu pips (LP: #933593)
+ - indicator-sound-service crashed with SIGSEGV in
+ fast_validate() (LP: #949837)
+ - free-memory-read crash in indicator-sound-service's file
+ monitoring (LP: #965848)
+ - minor memory leaks in blacklist handling (LP: #960578)
+ - FIX (LP: FIX)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 30 Mar 2012 14:08:21 -0400
+
+indicator-sound (0.8.4.1-0ubuntu4) precise; urgency=low
+
+ * debian/patches:
+ - sound_xubuntu.patch: added, prefer pavucontrol over xfce4-mixer on
+ Xubuntu. (lp: #961745)
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com> Thu, 22 Mar 2012 00:17:34 +0100
+
+indicator-sound (0.8.4.1-0ubuntu3) precise; urgency=low
+
+ * debian/patches/lp_960846.patch
+ - check that the active playlists container is not null (LP: #960846)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 21 Mar 2012 11:00:15 -0400
+
+indicator-sound (0.8.4.1-0ubuntu2) precise; urgency=low
+
+ * debian/patches/lp_945827.patch
+ - fix for a playlist crasher (LP: #945827)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 20 Mar 2012 16:40:24 -0400
+
+indicator-sound (0.8.4.1-0ubuntu1) precise; urgency=low
+
+ * New upstream release.
+ - fix i18n of indicator-sound's accessible description (LP: #957517)
+ - don't abort isound via g_error() if it can't connect to the
+ bus (LP: #953111)
+ * debian/patches/sound_nua.patch
+ - don't try to free a static string (LP: #957387)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 19 Mar 2012 11:22:00 -0400
+
+indicator-sound (0.8.4.0-0ubuntu1) precise; urgency=low
+
+ * New upstream release.
+ - indicator-sound "Choose Playlist" menu item does nothing when using
+ Rhythmbox (LP: #952550)
+ - crashed with SIGSEGV in g_strdup() (LP: #946607)
+ - crashed with SIGABRT in pa_operation_unref() (LP: #944148)
+ - crashed with signal 5 in g_type_create_instance() (LP: #921755)
+ - slider on unmute resets volume (LP: #921065)
+ - play controls not exposed in HUD (LP: #949032)
+ - unity-panel-service at 100% cpu when opened /w rb without album
+ cover (LP: #806848)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 16 Mar 2012 14:04:30 -0400
+
+indicator-sound (0.8.3.0-0ubuntu2) precise; urgency=low
+
+ * debian/patches/sound_nua.patch
+ - Sound Settings link doesn't work in GNOME Classic (LP: #941704)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 16 Mar 2012 13:39:03 -0400
+
+indicator-sound (0.8.3.0-0ubuntu1) precise; urgency=low
+
+ * New upstream release.
+ - Fixed memory corruption issue (LP: #897218)
+ - crashed with SIGABRT in pa_operation_unref (LP: #908682)
+ - Banshee shown in sound menu after removal until reboot (LP: #771202)
+ - Coverity PASS_BY_VALUE - CID 10620 (LP: #937451)
+ - App icon and name are not aligned (LP: #939929)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 02 Mar 2012 11:26:41 -0500
+
+indicator-sound (0.8.2.0-0ubuntu1) precise; urgency=low
+
+ * New upstream release.
+ - crashed with SIGABRT in pa_cvolume_set (LP: #900117)
+ - Mouse on coverart flushes the sound menu (LP: #927733)
+ - album artwork misaligned and not visible (LP: #933359)
+ - unity-panel-service crashed with SIGSEGV in
+ transport_widget_is_selected (LP: #882109)
+ * -debian/patches/correct_ldflags_use.patch
+ - fixed upstream
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 22 Feb 2012 16:41:12 -0500
+
+indicator-sound (0.8.1.0-0ubuntu1) precise; urgency=low
+
+ * New upstream release.
+ - No easy way to turn the sound menu on/off (lp: #829648)
+ - Avoid spawning notification daemon at startup (lp: #912150)
+ - Creation of album-art-cache folder (lp: #799383)
+ - schema id & path are inconsistent with other indicators (lp: #914377)
+ * debian/patches/correct_ldflags_use.patch:
+ - typo fix in ldflags use
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 14 Feb 2012 19:46:41 +0100
+
+indicator-sound (0.8.0.0-0ubuntu4) precise; urgency=low
+
+ * debian/patches/sound_nua.patch
+ - open the new sound-nua panel in gnome-control-center
+ * debian/patches/dbusmenu_05_90.patch
+ - fixed FTBFS with dbusmenu 0.5.90
+ * debian/control
+ - bump build depends for dbusmenu to >= 0.5.90
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 09 Feb 2012 16:49:15 -0500
+
+indicator-sound (0.8.0.0-0ubuntu3) precise; urgency=low
+
+ * rebuild for libindicator7
+ * debian/rules
+ - build with no-error=deprecated-declarations
+ * -debian/patches/disable_Werror.patch
+ - disabled in debian/rules instead
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 25 Jan 2012 10:00:00 -0500
+
+indicator-sound (0.8.0.0-0ubuntu2) precise; urgency=low
+
+ * Add lazy_init.patch: Avoid spawning notification daemon right at startup,
+ instead initialize it lazily when actually doing a notification. Improves
+ boot speed. (LP: #912150)
+ * Add disable_Werror.patch: Build without -Werror, to avoid build failure
+ due to deprecated declarations. (LP: #912160)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 05 Jan 2012 09:29:36 +0100
+
+indicator-sound (0.8.0.0-0ubuntu1) precise; urgency=low
+
+ * New upstream release.
+ * debian/control
+ - removed build depends for libgconf2-dev
+ * debian/patches/fix-864405.patch
+ - dropped, merged upstream
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 01 Dec 2011 14:33:34 -0500
+
+indicator-sound (0.7.9.1-0ubuntu2) precise; urgency=low
+
+ * debian/patches/fix-864405.patch:
+ - Clicking on left 25% of "Pause/Play" circle clicks "Previous".
+ (LP: #864405)
+
+ -- Omer Akram <om26er@ubuntu.com> Mon, 28 Nov 2011 23:03:20 +0500
+
+indicator-sound (0.7.9.1-0ubuntu1) precise; urgency=low
+
+ * New upstream release.
+ - indicator-sound-service crashed with SIGABRT in raise() (LP: #840986)
+ - don't let the menu grow wide enough to push off the screen (LP: #873006)
+ - bump the limit for number of playlists to 20 (LP: #835384)
+ - indicator-sound-service crashed with SIGSEGV (LP: #864732)
+ - Music player icon is not top-aligned (LP: #874454)
+ * debian/control
+ - build with valac-0.14
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 28 Oct 2011 09:45:22 -0400
+
+indicator-sound (0.7.9-0ubuntu1) oneiric-proposed; urgency=low
+
+ * New upstream release.
+ - Protect against source indexes that are lower than 0 (LP: #850662)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 13 Oct 2011 13:53:21 -0400
+
+indicator-sound (0.7.8-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release.
+ - indicator-sound interferes with gnome-settings-daemon (LP: #855557)
+ * debian/patches/01_fix_FTBFS.patch
+ - Dropped, fixed upstream
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 28 Sep 2011 14:34:38 -0400
+
+indicator-sound (0.7.7.0-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release
+ * add 01_fix_FTBFS.patch for needed -lm link
+
+ -- Didier Roche <didrocks@ubuntu.com> Tue, 13 Sep 2011 10:20:29 +0200
+
+indicator-sound (0.7.6.1-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release.
+ - theming fix for the spinner
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 24 Aug 2011 16:09:29 -0400
+
+indicator-sound (0.7.6-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release.
+ - mute action crashes the panel (LP: #828114)
+ - Clicking music player does not dismiss the menu (LP: #818293)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 18 Aug 2011 14:19:06 -0400
+
+indicator-sound (0.7.5-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release.
+ - Don't allow starting programs via the greeter indicators (LP: #811853)
+ - support libunity's Track and Player specific items (LP: #824050)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 10 Aug 2011 12:51:49 -0400
+
+indicator-sound (0.7.4.1-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release.
+ - menu resizes on reopen (LP: #809275)
+ - pulse indication of SoundMenu play button not strong
+ enough (LP: #742251)
+ * debian/rules
+ - Moved autoreconf to the top
+ * New upstream release.
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 29 Jul 2011 13:21:41 -0400
+
+indicator-sound (0.7.3-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release.
+ - libindicator scroll signals (LP: #804618)
+ - metadatawidget collapse (LP: #806439)
+ * debian/control
+ - Bumped build depends for libindicator to 0.3.90
+ * debian/patches/gtk3_define.patch
+ - dropped
+ * configure.ac
+ - Fixup pkgconfig check for libindicator-0.4
+ * debian/rules
+ - Added autoreconf.mk
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 07 Jul 2011 15:37:27 -0400
+
+indicator-sound (0.7.2-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release.
+ - "Sound Preferences..." should be "Sound Settings" (LP: #785571)
+ - Not obvious what track info menu item does (LP: #699899)
+ * debian/patches/lp_750823.patch
+ - Dropped patch, merged upstream
+ * debian/patches/gtk3_define.patch
+ - Wrap another gtk3 block in an ifdef
+ * debian/control
+ - Updated standards version to 3.9.2
+ - Cleaned up description to quiet lintian
+ - Added quilt build dep
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 28 Jun 2011 10:51:51 -0400
+
+indicator-sound (0.7.0-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release.
+ - Displayed cover don't keep the original ratio (LP: #654196)
+ - show record level control PULSE_PROP_media.role=production (LP: #736049)
+ - Volume notification is based on previous volume; should be based on
+ the new volume (LP: #748831)
+ - [gnome3] Sound Preferences link doesn't work (LP: #759390)
+ * debian/patches/lp_759390.patch
+ - dropped, merged upstream
+ * debian/control
+ - renamed the libnotify4-dev build depends to libnotify-dev
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 19 May 2011 15:38:19 -0400
+
+indicator-sound (0.6.6.1-0ubuntu3) natty; urgency=low
+
+ * debian/patches/lp_750823.patch
+ - Place timeout in the mpris controller to accommodate flaky mpris dbus
+ behaviour, it can be seen sometimes that the players emit a property
+ changed on the metadata property but the actual value of the property
+ which the service then tries to use is the old value (LP: #750823)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 18 Apr 2011 15:08:13 -0400
+
+indicator-sound (0.6.6.1-0ubuntu2) natty; urgency=low
+
+ * debian/patches/lp_759390.patch
+ - Sound Preferences link doesn't work in gnome3 (LP: #759390)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 15 Apr 2011 17:12:32 -0400
+
+indicator-sound (0.6.6.1-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Fix crash with SIGABRT (LP: #738051) (LP: #744304)
+ - ensure that if the service crashes the indicator will not show
+ multiple sliders
+
+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 04 Apr 2011 10:02:19 -0400
+
+indicator-sound (0.6.5.1-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Don't change the banshee id yet, that will change in 0.9.6
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 23 Mar 2011 13:46:06 -0400
+
+indicator-sound (0.6.5-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Media player should be automatically started up when play button is
+ pressed (LP: #714750)
+ - volume goes to zero when using some players like banshee or
+ rhythmbox (LP: #730925)
+ - handle banshee id change (LP: #737447)
+ - filter out video playlists (LP: #739273)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 23 Mar 2011 12:03:02 -0400
+
+indicator-sound (0.6.4-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Harmonize mute behaviour of both VOIP and volume slider (LP: #731870)
+ - keyboard handling for voip slider not working (LP: #732500)
+ - "Choose Playlist" needs to be marked for translation (LP: #736372)
+ - show record level control on PULSE_PROP_media.role=production
+ (LP: #736049)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 17 Mar 2011 14:08:17 -0400
+
+indicator-sound (0.6.3-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Broken images on playlist items (LP: #727325)
+ - wrong icon for audio-input slider (LP: #723254)
+ - blacklist dbus api lacks query functionality (LP: #730526)
+ - volume goes to zero when using some players like banshee,
+ rhythmbox (LP: #730925)
+ - holding the FW or RW button should have an effect (LP: #694258)
+ - With new notify-osd the volume notification on scroll doesn't work as
+ expected (LP: #729849)
+ * debian/control
+ - Bumped build depends for dbusmenu to >= 0.3.101
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 11 Mar 2011 12:47:26 -0500
+
+indicator-sound (0.6.2-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Fixed crashed with SIGSEGV in pa_context_connect() (LP: #717453)
+ - Fixed crashed with SIGSEGV in pa_pdispatch_run() (LP: #723096)
+ - Fixed crashed with SIGSEGV (LP: #723096)
+ - Fixed crashed with SIGSEGV (LP: #717557)
+ - Fixed crashed with SIGSEGV in g_variant_builder_add_value()
+ (LP: #717999)
+ - Sound Menu Play lists show Favorites item twice in menu and icons for
+ all playlists not found (LP: #728263)
+ - Players are raised too quickly (LP: #723278)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 04 Mar 2011 13:07:40 -0500
+
+indicator-sound (0.6.1-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Icon-only menu titles don't have accessible names (LP: #691677)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 24 Feb 2011 11:19:57 -0500
+
+indicator-sound (0.6.0-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - New voip slider will be displayed in the sound menu while in a call
+ - [Conexant CX20561(Hermosa)] No indicator that input is muted (LP: #683689)
+ - Ctrl+arrow jumps sound to max volume in indicator (LP: #669167)
+ - Fixed build with latest dbusmenu (LP: #717340)
+ - Ported to libnotify >= 0.7.0
+ * debian/control
+ - Changed build depends for libnotify-dev to libnotify4-dev
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 18 Feb 2011 13:20:44 -0500
+
+indicator-sound (0.5.9-0ubuntu2) natty; urgency=low
+
+ * debian/control
+ - bump build depends for libindicator-dev to >= 0.3.19
+ - bump build depends for libdbusmenu-glib-dev to >= 0.3.97
+ - added build depends on dh-autoreconf
+ * src/Makefile.am
+ - Hand Dbusmenu-Glib-0.4 rename to Dbusmenu-0.4
+ * debian/rules
+ - include autoreconf.mk to handle the Dbusmenu rename
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 17 Feb 2011 15:21:33 -0500
+
+indicator-sound (0.5.9-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - crashed with SIGSEGV in pa_cvolume_valid () (LP: #705009)
+ - The players list should be customizable (LP: #685725)
+ - Allow players to set their own title (LP: #709367)
+ - refactor pulse manager (LP: #709371)
+ - listen for playlist changed signal (LP: #715277)
+ - playlist name not updated corrrectly (LP: #715694)
+ - Not enough feedback when changing the volume (LP: #669163)
+ - indicator-sound volume does not detect sink change (LP: #700361)
+ * debian/control
+ - Added new build depends libnotify-dev
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 10 Feb 2011 11:52:59 -0500
+
+indicator-sound (0.5.8-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Media buttons inconsistent with system-wide button behavior (LP: #651006)
+ - update to deal with dbusmenu api chages (LP: #709181)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 28 Jan 2011 09:28:10 -0500
+
+indicator-sound (0.5.7-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Music control buttons flicker (LP: #684755)
+ - Sound Menu should re-read playlists from MPRIS apps when
+ PropertiesChanged is postec (LP: #707042)
+ - Spotify crashes the service (LP: #707367)
+ - Refactor service dbus code plus state handling (LP: #708793)
+ - changing the volume is impossible while muted (LP: #558784)
+ - Banshee icon changes to coloured icon once in use (LP: #692648)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 27 Jan 2011 15:57:41 -0500
+
+indicator-sound (0.5.6-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Port the sound indicator to the new dbusmenu (LP: #701145)
+ * debian/control
+ - Bumped build depends for dbusmenu to >= 0.3.91
+ - Dropped unneeded build depends for libindicate-dev and dh-autoreconf
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 14 Jan 2011 10:53:50 -0600
+
+indicator-sound (0.5.5-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - unity-panel-service crashed with SIGSEGV in cairo_translate (LP: #683184)
+ - Add MPRIS Playlist support (LP: #692644)
+ - only first word of application name is shown (LP: #695385)
+ - The players list should be customizable (LP: #685725)
+ - gio-unix-2.0 checks (LP: #694828)
+ - Desktop file loading should not manually use full path (LP: #693824)
+ - Banshee mpris interface crashes (LP: #701692)
+ * debian/control
+ - Added build depends for libxml2-dev
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 11 Jan 2011 16:44:40 -0600
+
+indicator-sound (0.5.3-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Libindicate removed from registration process (LP: #691189)
+ - Vala code now using Gdbus exclusively for mpris interaction
+ - Fixed memory leak with album art resizing (LP: #689686)
+ - Gconf removed and Gsettings schema added (LP: #656405)
+ - registration process now uses gsettings
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 16 Dec 2010 15:03:15 -0500
+
+indicator-sound (0.5.2-0ubuntu2) natty; urgency=low
+
+ * debian/control
+ - Bump build depends for libdbusmenu-* to >= 0.3.90
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 09 Dec 2010 11:44:02 -0500
+
+indicator-sound (0.5.2-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - updated to accommodate vala 0.10 to vala 0.12 api changes
+ - grey scale icon for default music player
+ - button and key handling improvements
+ * debian/control
+ - Changed build depends from valac-0.10 to valac, it builds now with
+ the 0.12 series
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 18 Nov 2010 11:13:32 -0500
+
+indicator-sound (0.5.1-0ubuntu1) natty; urgency=low
+
+ * New upstream release.
+ - Includes a lot of Design updates collected at UDS.
+ * album art border, now rectangular with a simple top and bottom 1 pixel
+ border. top dark and bottom light.
+ * Empty album art image now has darker background rather than same
+ colour as menu background
+ * Application icon now uses application image as opposed to generic
+ image used in maverick
+ * Banshee is now the default player.
+ * spacing between metadata and transport widget has been resolved plus
+ the spacing between the transport and the separator below it.
+ * debian/control
+ - Bump standards version to 3.9.1
+ - Changed build depends to valac-0.10, until it is ported to valac-0.12
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 12 Nov 2010 10:14:49 -0500
+
+indicator-sound (0.5.0.1-0ubuntu1) maverick-proposed; urgency=low
+
+ * New upstream release.
+ - Fixed a regression, which would show the metadata widget when the
+ player has no current track (LP: #674016)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 12 Nov 2010 09:40:47 -0500
+
+indicator-sound (0.5.0-0ubuntu1) maverick-proposed; urgency=low
+
+ * New upstream release.
+ - Buttons' hover image stays after dragging (LP: #643395)
+ - Sound indicator works incorrect with playing status (LP: #656947)
+ - sound applet volume slider has no effect if pulseaudio is
+ restarted (LP: #662296)
+ - Default music player should be present in the menu from a clean
+ install (LP: #664743)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 04 Nov 2010 17:03:08 -0400
+
+indicator-sound (0.4.9-0ubuntu1) maverick-proposed; urgency=low
+
+ * New upstream release.
+ - fixes tranlation mpris name regression (LP: #654140)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 14 Oct 2010 10:40:13 -0400
+
+indicator-sound (0.4.8-0ubuntu1) maverick-proposed; urgency=low
+
+ * New upstream release.
+ - indicator-sound-service eating CPU on second user login (LP: #581173)
+ - Right border of transport control is different colour while using
+ Ambiance (LP: #632774)
+ - Incorrect ellipsing (LP: #637580)
+ - always show unmuted at startup (LP: #648238)
+ - click or enter on metadata widget does not copy contents to
+ clipboard (LP: #651246)
+ - Sound menu has two Rhythmbox elements when using
+ translations (LP: #654140)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 07 Oct 2010 10:08:19 -0400
+
+indicator-sound (0.4.7-0ubuntu2) maverick; urgency=low
+
+ * Rebuild for libindicator ABI change (LP: #637692)
+ * debian/control: depends on latest libindicator-dev
+
+ -- Didier Roche <didrocks@ubuntu.com> Wed, 22 Sep 2010 18:40:25 +0200
+
+indicator-sound (0.4.7-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ - Media Buttons should trigger action only on button release (LP: #624610)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 15 Sep 2010 18:02:13 -0400
+
+indicator-sound (0.4.6-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ - indicator crashes in the event of the service crashing (LP: #638891)
+ - metadata widget should remain hidden if there is no track
+ data (LP: #637031)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 15 Sep 2010 08:47:49 -0400
+
+indicator-sound (0.4.5-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ - service crashes on last fm playback with rb (LP: #633654)
+ - sound_icon for indicator-sound missing for ubuntu-light (LP: #628896)
+ - indicator-sound-service crashed with signal 5 in dbusmenu_menuitem_handle_event() (LP: #633897)
+ - mpris2 playback status behaving as if it were static (LP: #631893)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 14 Sep 2010 15:13:50 -0400
+
+indicator-sound (0.4.4-0ubuntu1) maverick; urgency=low
+
+ * New upstream release, fix crash in gtk_range_get_value() (lp: #615277)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 10 Sep 2010 17:49:49 +0200
+
+indicator-sound (0.4.3-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 08 Sep 2010 17:53:33 +0200
+
+indicator-sound (0.4.2-0ubuntu1) maverick; urgency=low
+
+ * New upstream release fixing those issues
+ - Media Buttons should trigger action only on button release (lp: #624610)
+ - Mouse wheel no longer works to change volume (lp: #620858)
+ - Crashes if Rhythmbox is playing from Last.FM (lp: #627505)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 08 Sep 2010 12:32:24 +0200
+
+indicator-sound (0.4.1-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 26 Aug 2010 11:38:07 +0200
+
+indicator-sound (0.4.0-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 18 Aug 2010 15:51:03 +0200
+
+indicator-sound (0.3.9-0ubuntu2) maverick; urgency=low
+
+ * Backport upstream commit to fix the indicator crashing when rhythmbox starts
+ (lp: #612299)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 02 Aug 2010 12:08:57 +0200
+
+indicator-sound (0.3.9-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ - Scrub bar should now work properly.
+ - Spacing between all UI widgets should be fixed.
+ - Playlist menuitem in place (for now this is just a mock up item, will
+ complete once there is a client with which I can test against)
+ - Transport bar has been visually tweaked.
+ * debian/control
+ - build depend on libido-0.1-dev (>= 0.1.11)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 29 Jul 2010 11:26:41 -0400
+
+indicator-sound (0.3.8-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - update ido requirement
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 22 Jul 2010 21:12:10 +0200
+
+indicator-sound (0.3.6-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 12 Jul 2010 17:45:06 +0200
+
+indicator-sound (0.3.5-0ubuntu1) maverick; urgency=low
+
+ * New upstream release:
+ -New transport widget integrated
+ -New title widget integrated which allows the user
+ to launch familiar app directly from the menu
+ - UI tidied
+ - Each player that registers with the menu will be stored in the
+ cache file allowing the menu to show the application even if it has
+ not been launched.
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 08 Jul 2010 19:32:29 +0200
+
+indicator-sound (0.3.4-0ubuntu1) maverick; urgency=low
+
+ * New upstream version:
+ - Album art now positioned correctly
+ - Track title, artist name and album name now the correct size,
+ weight and position
+ - Text truncated with an ellipsis if it is over the an estimated acceptable
+ width (no guidance given by design).
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 28 Jun 2010 17:20:03 +0200
+
+indicator-sound (0.3.3-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ - Fixes menu flicker when playing a song with artwork
+ displayed (LP: #598438)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 25 Jun 2010 11:19:15 -0400
+
+indicator-sound (0.3.2-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ - MPRIS transport status updates reflecting in UI
+ If externally a registered player transport is changed (play/stop)
+ the menu should reflect that
+ - The first time a player registers its desktop file path should be
+ stored ~.cache/indicators/sound/familiar-players-db.keyfile (provided
+ the application indicator has a desktop file set.
+ - Album art dynamically updated
+ - Album title dynamically updated
+ - Track title dynamically updated
+ - Artist name dynamically updated
+ - Play/pause transport control should be working from the menu
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 24 Jun 2010 13:55:01 -0400
+
+indicator-sound (0.3.1-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ * debian/control
+ - bumped build-dep version of libdbusmenu-glib-dev to (>= 0.3.1)
+ - Added build-dep for libindicate-dev (>= 0.4.1)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 17 Jun 2010 16:50:31 -0400
+
+indicator-sound (0.2.3-0ubuntu1) lucid-proposed; urgency=low
+
+ * New upstream version:
+ - "Changing left/right balance in sound-preferences changes the output
+ volume slider when indicator-applet is running" (lp: #532095)
+ - update the mute animation on theme changes (lp: #568586)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 29 Apr 2010 11:53:37 +0200
+
+indicator-sound (0.2.2-0ubuntu1) lucid; urgency=low
+
+ * New upstream version
+ - Animation for mute-blocking state greatly improved
+ - Handles sink removal far better
+ - improves scrolling action icon on panel
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 31 Mar 2010 18:12:47 +0200
+
+indicator-sound (0.2.2-0ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 31 Mar 2010 17:49:12 +0200
+
+indicator-sound (0.2.1-0ubuntu1) lucid; urgency=low
+
+ * New upstream release.
+ - can't change audio using mouse wheel (LP: #521046)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 18 Mar 2010 15:07:24 -0400
+
+indicator-sound (0.1.3.1-0ubuntu2) lucid; urgency=low
+
+ * Backport upstream changes to fix those issues:
+ - "Wrong i18n for menu entries", thank Luca Ferretti (lp: #538704)
+ - "display a mute icon until volume is changed since update" (lp: #537977)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 15 Mar 2010 15:51:35 +0100
+
+indicator-sound (0.1.3.1-0ubuntu1) lucid; urgency=low
+
+ * New upstream version:
+ - clear looks seg fault fix (lp: #537891)
+ - slider resizing properly (lp: #533208)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 12 Mar 2010 20:29:25 +0100
+
+indicator-sound (0.1.3-0ubuntu1) lucid; urgency=low
+
+ * New upstream version:
+ - icon sizing fixed.
+ - correct icon names loaded with fallback mechanism
+ - no sink handling improved - now handles going from no sink to one sink
+ back to no sink properly
+ - Mute blocking state implemented with animation on title image.
+ - smoother sliding due new signals emitted from the 0.1.4 of ido
+ * debian/control:
+ - updated libindicator requirement
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 11 Mar 2010 18:53:58 +0100
+
+indicator-sound (0.1.2-0ubuntu1) lucid; urgency=low
+
+ * New upstream version:
+ - Stability of the service should now be much improved. The backend sound
+ service should now be able to handle Pulseaudio not being up or flapping.
+ (lp: #529324)
+ - Arrow keys should be working properly allowing users to move between
+ indicators. (lp: #525733)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 04 Mar 2010 13:32:10 +0100
+
+indicator-sound (0.1.1-0ubuntu2) lucid; urgency=low
+
+ * Backporting trunk commit to fix keyboard controls (lp: #521088)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 18 Feb 2010 19:13:03 +0100
+
+indicator-sound (0.1.1-0ubuntu1) lucid; urgency=low
+
+ * New upstream version
+ - resolve the UI keyboard controls which were lacking (lp: #521088)
+ - the volume control should now be far smoother
+ - included is the ability to dynamically swap output devices
+ using gnome volume control
+ - use of new icons from the new humanity theme.
+ - update volume slider in the right direction on mouse scroll (lp: #521090)
+ * debian/control:
+ - updated ido requirement
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 18 Feb 2010 17:46:11 +0100
+
+indicator-sound (0.1.0-0ubuntu2) lucid; urgency=low
+
+ * Backport trunk change to fix audiosink detection and volume controls
+ not working for some users (lp: #521286, #521930)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 15 Feb 2010 16:44:01 +0100
+
+indicator-sound (0.1.0-0ubuntu1) lucid; urgency=low
+
+ * debian/control:
+ - depends on pulseaudio
+ - don't set lib section, the applet is not a library
+ * debian/rules:
+ - build using --as-needed to avoid unnecessary depends
+
+ [ Ken VanDine ]
+ * Initial release
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 12 Feb 2010 11:13:22 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..296f82e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,48 @@
+Source: indicator-sound
+Section: sound
+Priority: extra
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com>
+Build-Depends: debhelper (>= 7),
+ cdbs (>= 0.4.41),
+ quilt,
+ autotools-dev,
+ libglib2.0-dev (>= 2.22.3),
+ libgtk2.0-dev (>= 2.12.0),
+ libgtk-3-dev,
+ libdbusmenu-glib-dev (>= 0.5.90),
+ libdbusmenu-gtk-dev (>= 0.5.90),
+ libdbusmenu-gtk3-dev (>= 0.5.90),
+ libindicator-dev (>= 0.3.90),
+ libindicator3-dev (>= 0.3.90),
+ libpulse-dev (>= 0.9.18),
+ libpulse-mainloop-glib0 (>= 0.9.18),
+ libido-0.1-dev (>= 0.1.11),
+ libido3-0.1-dev (>= 0.2.90),
+ libgee-dev,
+ libxml2-dev,
+ libnotify-dev,
+ valac-0.14,
+ dh-autoreconf
+Standards-Version: 3.9.2
+Homepage: https://launchpad.net/indicator-sound
+
+Package: indicator-sound
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ pulseaudio
+Description: System sound indicator.
+ System sound indicator which provides easy control of the PulseAudio sound
+ daemon.
+
+Package: indicator-sound-gtk2
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ indicator-sound (= ${binary:Version}),
+ pulseaudio
+Replaces: indicator-sound (<< 0.7.1)
+Description: System sound indicator.
+ System sound indicator which provides easy control of the PulseAudio sound
+ daemon.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..09ddeab
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,37 @@
+This package was debianized by:
+
+ Conor Curran <conor.curran@canonical.com> on Fri, 22 Jan 2010 11:36:32 +0000
+
+It was downloaded from:
+
+ https://launchpad.net/indicator-sound
+
+Upstream Author(s):
+
+ Conor Curran <conor.curran@canonical.com>
+
+Copyright:
+
+ Copyright (C) 2010 Canonical Ltd
+
+License:
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Conor Curran <conor.curran@canonical.com>
+
+On Debian systems, the complete text of the GNU General
+Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/indicator-sound-gtk2.install b/debian/indicator-sound-gtk2.install
new file mode 100644
index 0000000..8d1fc9f
--- /dev/null
+++ b/debian/indicator-sound-gtk2.install
@@ -0,0 +1 @@
+debian/tmp/gtk2/usr/lib/indicators /usr/lib/
diff --git a/debian/indicator-sound.install b/debian/indicator-sound.install
new file mode 100644
index 0000000..19a45de
--- /dev/null
+++ b/debian/indicator-sound.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/usr /
diff --git a/debian/patches/lp_945827.patch b/debian/patches/lp_945827.patch
new file mode 100644
index 0000000..c92ab33
--- /dev/null
+++ b/debian/patches/lp_945827.patch
@@ -0,0 +1,449 @@
+=== modified file 'src/metadata-widget.c'
+--- old/src/metadata-widget.c 2012-03-19 14:58:53 +0000
++++ new/src/metadata-widget.c 2012-03-20 20:19:44 +0000
+@@ -228,7 +228,7 @@
+ GtkWidget* player_label;
+ player_label = gtk_label_new ("");
+ gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0);
+- gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)4);
++ gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)3);
+ gtk_widget_set_size_request (player_label, 150, 24);
+ priv->player_label = player_label;
+
+
+=== modified file 'src/mpris2-controller.c'
+--- old/src/mpris2-controller.c 2012-03-16 17:50:43 +0000
++++ new/src/mpris2-controller.c 2012-03-20 20:25:46 +0000
+@@ -151,6 +151,7 @@
+ typedef struct _PlaylistsMenuitemClass PlaylistsMenuitemClass;
+ #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+ typedef struct _Mpris2ControllerFetchPlaylistsData Mpris2ControllerFetchPlaylistsData;
++#define _active_playlist_container_free0(var) ((var == NULL) ? NULL : (var = (active_playlist_container_free (var), NULL)))
+
+ struct _Mpris2Controller {
+ GObject parent_instance;
+@@ -218,7 +219,7 @@
+ void (*set_Orderings) (MprisPlaylists* self, gchar** value, int value_length1);
+ guint32 (*get_PlaylistCount) (MprisPlaylists* self);
+ void (*set_PlaylistCount) (MprisPlaylists* self, guint32 value);
+- void (*get_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value);
++ ActivePlaylistContainer* (*get_ActivePlaylist) (MprisPlaylists* self);
+ void (*set_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value);
+ };
+
+@@ -281,8 +282,12 @@
+ PlaylistDetails* _tmp9_;
+ gint _tmp9__length1;
+ PlayerController* _tmp10_;
+- gboolean _tmp11_;
+- gboolean* _tmp12_;
++ GAppInfo* _tmp11_;
++ GAppInfo* _tmp12_;
++ const gchar* _tmp13_;
++ PlayerController* _tmp14_;
++ gboolean _tmp15_;
++ gboolean* _tmp16_;
+ GError * _inner_error_;
+ };
+
+@@ -382,8 +387,10 @@
+ static void mpris2_controller_fetch_playlists_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
+ static void _vala_PlaylistDetails_array_free (PlaylistDetails* array, gint array_length);
+ void playlists_menuitem_update (PlaylistsMenuitem* self, PlaylistDetails* playlists, int playlists_length1);
++GAppInfo* player_controller_get_app_info (PlayerController* self);
+ static gboolean* _bool_dup (gboolean* self);
+-void mpris_playlists_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result);
++static gboolean mpris2_controller_validate_playlists_details (Mpris2Controller* self);
++ActivePlaylistContainer* mpris_playlists_get_ActivePlaylist (MprisPlaylists* self);
+ void playlists_menuitem_active_playlist_update (PlaylistsMenuitem* self, PlaylistDetails* detail);
+ void mpris2_controller_activate_playlist (Mpris2Controller* self, const char* path);
+ void mpris_playlists_ActivatePlaylist (MprisPlaylists* self, const char* playlist_id, GAsyncReadyCallback _callback_, gpointer _user_data_);
+@@ -580,7 +587,7 @@
+ }
+ _tmp31_ = _tmp26_;
+ if (_tmp31_) {
+- g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, _mpris2_controller_fetch_active_playlist_gsource_func, g_object_ref (self), g_object_unref);
++ g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _mpris2_controller_fetch_active_playlist_gsource_func, g_object_ref (self), g_object_unref);
+ }
+ _tmp32_ = changed_properties;
+ _tmp33_ = g_hash_table_lookup (_tmp32_, "PlaylistCount");
+@@ -1206,13 +1213,18 @@
+ playlists_menuitem_update (_data_->_tmp8_, _data_->_tmp9_, _data_->_tmp9__length1);
+ _g_object_unref0 (_data_->playlists_item);
+ } else {
+- g_warning ("mpris2-controller.vala:243: Playlists are on but its returning no cur" \
+-"rent_playlists");
+ _data_->_tmp10_ = _data_->self->priv->_owner;
+- _data_->_tmp11_ = FALSE;
+- _data_->_tmp12_ = __bool_dup0 (&_data_->_tmp11_);
+- _g_free0 (_data_->_tmp10_->use_playlists);
+- _data_->_tmp10_->use_playlists = _data_->_tmp12_;
++ _data_->_tmp11_ = player_controller_get_app_info (_data_->_tmp10_);
++ _data_->_tmp12_ = _data_->_tmp11_;
++ _data_->_tmp13_ = NULL;
++ _data_->_tmp13_ = g_app_info_get_name (_data_->_tmp12_);
++ g_warning ("mpris2-controller.vala:243: Playlists are on but %s is returning no c" \
++"urrent_playlists ?", _data_->_tmp13_);
++ _data_->_tmp14_ = _data_->self->priv->_owner;
++ _data_->_tmp15_ = FALSE;
++ _data_->_tmp16_ = __bool_dup0 (&_data_->_tmp15_);
++ _g_free0 (_data_->_tmp14_->use_playlists);
++ _data_->_tmp14_->use_playlists = _data_->_tmp16_;
+ }
+ _data_->current_playlists = (_vala_PlaylistDetails_array_free (_data_->current_playlists, _data_->current_playlists_length1), NULL);
+ if (_data_->_state_ == 0) {
+@@ -1225,50 +1237,121 @@
+ }
+
+
+-static gboolean mpris2_controller_fetch_active_playlist (Mpris2Controller* self) {
++static gboolean mpris2_controller_validate_playlists_details (Mpris2Controller* self) {
+ gboolean result = FALSE;
+ MprisPlaylists* _tmp0_;
+- ActivePlaylistContainer _tmp1_;
+- ActivePlaylistContainer _tmp2_;
+- ActivePlaylistContainer _tmp3_;
++ ActivePlaylistContainer* _tmp1_;
++ ActivePlaylistContainer* _tmp2_;
++ ActivePlaylistContainer* _tmp3_;
+ gboolean _tmp4_;
+ gboolean _tmp5_;
+- PlayerController* _tmp6_;
+- GeeArrayList* _tmp7_;
+- gpointer _tmp8_ = NULL;
+- PlaylistsMenuitem* playlists_item;
+- PlaylistsMenuitem* _tmp9_;
+- MprisPlaylists* _tmp10_;
+- ActivePlaylistContainer _tmp11_;
+- ActivePlaylistContainer _tmp12_;
+- ActivePlaylistContainer _tmp13_;
+- PlaylistDetails* _tmp14_;
+- PlaylistDetails _tmp15_;
++ MprisPlaylists* _tmp6_;
++ ActivePlaylistContainer* _tmp7_;
++ ActivePlaylistContainer* _tmp8_;
++ ActivePlaylistContainer* _tmp9_;
++ PlaylistDetails* _tmp10_;
++ gboolean _tmp11_;
++ gboolean _tmp12_ = FALSE;
++ MprisPlaylists* _tmp13_;
++ ActivePlaylistContainer* _tmp14_;
++ ActivePlaylistContainer* _tmp15_;
++ ActivePlaylistContainer* _tmp16_;
++ PlaylistDetails* _tmp17_;
++ const char* _tmp18_;
++ gboolean _tmp19_;
++ gboolean _tmp26_;
+ g_return_val_if_fail (self != NULL, FALSE);
+ _tmp0_ = self->priv->_playlists;
+- mpris_playlists_get_ActivePlaylist (_tmp0_, &_tmp1_);
++ _tmp1_ = mpris_playlists_get_ActivePlaylist (_tmp0_);
+ _tmp2_ = _tmp1_;
+ _tmp3_ = _tmp2_;
+- _tmp4_ = _tmp3_.valid;
++ _tmp4_ = (*_tmp3_).valid;
+ _tmp5_ = _tmp4_ == FALSE;
+- active_playlist_container_destroy (&_tmp3_);
++ _active_playlist_container_free0 (_tmp3_);
+ if (_tmp5_) {
+ result = FALSE;
+ return result;
+ }
+- _tmp6_ = self->priv->_owner;
+- _tmp7_ = _tmp6_->custom_items;
+- _tmp8_ = gee_abstract_list_get ((GeeAbstractList*) _tmp7_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS);
+- playlists_item = IS_PLAYLISTS_MENUITEM ((PlayerItem*) _tmp8_) ? ((PlaylistsMenuitem*) ((PlayerItem*) _tmp8_)) : NULL;
+- _tmp9_ = playlists_item;
+- _tmp10_ = self->priv->_playlists;
+- mpris_playlists_get_ActivePlaylist (_tmp10_, &_tmp11_);
+- _tmp12_ = _tmp11_;
+- _tmp13_ = _tmp12_;
+- _tmp14_ = _tmp13_.details;
+- _tmp15_ = *_tmp14_;
+- playlists_menuitem_active_playlist_update (_tmp9_, &_tmp15_);
+- active_playlist_container_destroy (&_tmp13_);
++ _tmp6_ = self->priv->_playlists;
++ _tmp7_ = mpris_playlists_get_ActivePlaylist (_tmp6_);
++ _tmp8_ = _tmp7_;
++ _tmp9_ = _tmp8_;
++ _tmp10_ = (*_tmp9_).details;
++ _tmp11_ = _tmp10_ == NULL;
++ _active_playlist_container_free0 (_tmp9_);
++ if (_tmp11_) {
++ result = FALSE;
++ return result;
++ }
++ _tmp13_ = self->priv->_playlists;
++ _tmp14_ = mpris_playlists_get_ActivePlaylist (_tmp13_);
++ _tmp15_ = _tmp14_;
++ _tmp16_ = _tmp15_;
++ _tmp17_ = (*_tmp16_).details;
++ _tmp18_ = (*_tmp17_).path;
++ _tmp19_ = _tmp18_ == NULL;
++ _active_playlist_container_free0 (_tmp16_);
++ if (_tmp19_) {
++ _tmp12_ = TRUE;
++ } else {
++ MprisPlaylists* _tmp20_;
++ ActivePlaylistContainer* _tmp21_;
++ ActivePlaylistContainer* _tmp22_;
++ ActivePlaylistContainer* _tmp23_;
++ PlaylistDetails* _tmp24_;
++ const gchar* _tmp25_;
++ _tmp20_ = self->priv->_playlists;
++ _tmp21_ = mpris_playlists_get_ActivePlaylist (_tmp20_);
++ _tmp22_ = _tmp21_;
++ _tmp23_ = _tmp22_;
++ _tmp24_ = (*_tmp23_).details;
++ _tmp25_ = (*_tmp24_).name;
++ _tmp12_ = _tmp25_ == NULL;
++ _active_playlist_container_free0 (_tmp23_);
++ }
++ _tmp26_ = _tmp12_;
++ if (_tmp26_) {
++ result = FALSE;
++ return result;
++ }
++ result = TRUE;
++ return result;
++}
++
++
++static gboolean mpris2_controller_fetch_active_playlist (Mpris2Controller* self) {
++ gboolean result = FALSE;
++ gboolean _tmp0_ = FALSE;
++ PlayerController* _tmp1_;
++ GeeArrayList* _tmp2_;
++ gpointer _tmp3_ = NULL;
++ PlaylistsMenuitem* playlists_item;
++ PlaylistsMenuitem* _tmp4_;
++ MprisPlaylists* _tmp5_;
++ ActivePlaylistContainer* _tmp6_;
++ ActivePlaylistContainer* _tmp7_;
++ ActivePlaylistContainer* _tmp8_;
++ PlaylistDetails* _tmp9_;
++ PlaylistDetails _tmp10_;
++ g_return_val_if_fail (self != NULL, FALSE);
++ _tmp0_ = mpris2_controller_validate_playlists_details (self);
++ if (_tmp0_ == FALSE) {
++ result = FALSE;
++ return result;
++ }
++ _tmp1_ = self->priv->_owner;
++ _tmp2_ = _tmp1_->custom_items;
++ _tmp3_ = gee_abstract_list_get ((GeeAbstractList*) _tmp2_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS);
++ playlists_item = IS_PLAYLISTS_MENUITEM ((PlayerItem*) _tmp3_) ? ((PlaylistsMenuitem*) ((PlayerItem*) _tmp3_)) : NULL;
++ _tmp4_ = playlists_item;
++ _tmp5_ = self->priv->_playlists;
++ _tmp6_ = mpris_playlists_get_ActivePlaylist (_tmp5_);
++ _tmp7_ = _tmp6_;
++ _tmp8_ = _tmp7_;
++ _tmp9_ = (*_tmp8_).details;
++ _tmp10_ = *_tmp9_;
++ playlists_menuitem_active_playlist_update (_tmp4_, &_tmp10_);
++ _active_playlist_container_free0 (_tmp8_);
+ result = FALSE;
+ _g_object_unref0 (playlists_item);
+ return result;
+@@ -1298,7 +1381,7 @@
+ _tmp2_ = path;
+ _tmp3_ = e;
+ _tmp4_ = _tmp3_->message;
+- g_warning ("mpris2-controller.vala:264: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_);
++ g_warning ("mpris2-controller.vala:280: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_);
+ _g_error_free0 (e);
+ }
+ __finally13:
+
+=== modified file 'src/mpris2-controller.vala'
+--- old/src/mpris2-controller.vala 2012-03-02 16:26:40 +0000
++++ new/src/mpris2-controller.vala 2012-03-20 20:19:44 +0000
+@@ -92,7 +92,7 @@
+ }
+ Variant? playlist_v = changed_properties.lookup("ActivePlaylist");
+ if ( playlist_v != null && this.owner.use_playlists == true ){
+- Timeout.add (300, this.fetch_active_playlist);
++ Timeout.add (500, this.fetch_active_playlist);
+ }
+ Variant? playlist_count_v = changed_properties.lookup("PlaylistCount");
+ if ( playlist_count_v != null && this.owner.use_playlists == true ){
+@@ -240,14 +240,30 @@
+ playlists_item.update(current_playlists);
+ }
+ else{
+- warning(" Playlists are on but its returning no current_playlists" );
++ warning(" Playlists are on but %s is returning no current_playlists ?",
++ this.owner.app_info.get_name());
+ this.owner.use_playlists = false;
+ }
+ }
+
++ private bool validate_playlists_details()
++ {
++ if (this.playlists.ActivePlaylist.valid == false){
++ return false;
++ }
++ if (this.playlists.ActivePlaylist.details == null){
++ return false;
++ }
++ if (this.playlists.ActivePlaylist.details.path == null ||
++ this.playlists.ActivePlaylist.details.name == null){
++ return false;
++ }
++ return true;
++ }
++
+ private bool fetch_active_playlist()
+ {
+- if (this.playlists.ActivePlaylist.valid == false){
++ if (this.validate_playlists_details() == false){
+ return false;
+ }
+ PlaylistsMenuitem playlists_item = this.owner.custom_items[PlayerController.widget_order.PLAYLISTS] as PlaylistsMenuitem;
+
+=== modified file 'src/mpris2-interfaces.c'
+--- old/src/mpris2-interfaces.c 2012-03-16 17:59:34 +0000
++++ new/src/mpris2-interfaces.c 2012-03-20 20:25:53 +0000
+@@ -70,6 +70,7 @@
+ #define TYPE_MPRIS_PLAYLISTS_PROXY (mpris_playlists_proxy_get_type ())
+ typedef GDBusProxy MprisPlaylistsProxy;
+ typedef GDBusProxyClass MprisPlaylistsProxyClass;
++#define _active_playlist_container_free0(var) ((var == NULL) ? NULL : (var = (active_playlist_container_free (var), NULL)))
+
+ struct _MprisRootIface {
+ GTypeInterface parent_iface;
+@@ -128,7 +129,7 @@
+ void (*set_Orderings) (MprisPlaylists* self, gchar** value, int value_length1);
+ guint32 (*get_PlaylistCount) (MprisPlaylists* self);
+ void (*set_PlaylistCount) (MprisPlaylists* self, guint32 value);
+- void (*get_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value);
++ ActivePlaylistContainer* (*get_ActivePlaylist) (MprisPlaylists* self);
+ void (*set_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value);
+ };
+
+@@ -263,7 +264,7 @@
+ void mpris_playlists_set_Orderings (MprisPlaylists* self, gchar** value, int value_length1);
+ guint32 mpris_playlists_get_PlaylistCount (MprisPlaylists* self);
+ void mpris_playlists_set_PlaylistCount (MprisPlaylists* self, guint32 value);
+-void mpris_playlists_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result);
++ActivePlaylistContainer* mpris_playlists_get_ActivePlaylist (MprisPlaylists* self);
+ void mpris_playlists_set_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* value);
+ static void g_cclosure_user_marshal_VOID__BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+ static void mpris_playlists_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters);
+@@ -276,7 +277,7 @@
+ static void mpris_playlists_dbus_proxy_set_Orderings (MprisPlaylists* self, gchar** value, int value_length1);
+ static guint32 mpris_playlists_dbus_proxy_get_PlaylistCount (MprisPlaylists* self);
+ static void mpris_playlists_dbus_proxy_set_PlaylistCount (MprisPlaylists* self, guint32 value);
+-static void mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result);
++static ActivePlaylistContainer* mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self);
+ static void mpris_playlists_dbus_proxy_set_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* value);
+ static void mpris_playlists_proxy_mpris_playlists_interface_init (MprisPlaylistsIface* iface);
+ static void _dbus_mpris_playlists_ActivatePlaylist (MprisPlaylists* self, GVariant* parameters, GDBusMethodInvocation* invocation);
+@@ -1879,9 +1880,9 @@
+ }
+
+
+-void mpris_playlists_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result) {
+- g_return_if_fail (self != NULL);
+- MPRIS_PLAYLISTS_GET_INTERFACE (self)->get_ActivePlaylist (self, result);
++ActivePlaylistContainer* mpris_playlists_get_ActivePlaylist (MprisPlaylists* self) {
++ g_return_val_if_fail (self != NULL, NULL);
++ return MPRIS_PLAYLISTS_GET_INTERFACE (self)->get_ActivePlaylist (self);
+ }
+
+
+@@ -2211,8 +2212,9 @@
+ }
+
+
+-static void mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result) {
++static ActivePlaylistContainer* mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self) {
+ GVariant *_inner_reply;
++ ActivePlaylistContainer* _result;
+ ActivePlaylistContainer _tmp39_;
+ GVariantIter _tmp40_;
+ GVariant* _tmp41_;
+@@ -2233,7 +2235,7 @@
+ _arguments = g_variant_builder_end (&_arguments_builder);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+ if (!_reply) {
+- return;
++ return NULL;
+ }
+ g_variant_get (_reply, "(v)", &_inner_reply);
+ g_variant_unref (_reply);
+@@ -2255,9 +2257,9 @@
+ g_variant_unref (_tmp47_);
+ _tmp39_.details = g_memdup (&_tmp43_, sizeof (PlaylistDetails));
+ g_variant_unref (_tmp42_);
+- *result = _tmp39_;
++ _result = g_memdup (&_tmp39_, sizeof (ActivePlaylistContainer));
+ g_variant_unref (_inner_reply);
+- return;
++ return _result;
+ }
+
+
+@@ -2462,20 +2464,20 @@
+
+
+ static GVariant* _dbus_mpris_playlists_get_ActivePlaylist (MprisPlaylists* self) {
+- ActivePlaylistContainer result = {0};
++ ActivePlaylistContainer* result;
+ GVariantBuilder _tmp62_;
+ GVariantBuilder _tmp63_;
+ GVariant* _reply;
+- mpris_playlists_get_ActivePlaylist (self, &result);
++ result = mpris_playlists_get_ActivePlaylist (self);
+ g_variant_builder_init (&_tmp62_, G_VARIANT_TYPE_TUPLE);
+- g_variant_builder_add_value (&_tmp62_, g_variant_new_boolean (result.valid));
++ g_variant_builder_add_value (&_tmp62_, g_variant_new_boolean ((*result).valid));
+ g_variant_builder_init (&_tmp63_, G_VARIANT_TYPE_TUPLE);
+- g_variant_builder_add_value (&_tmp63_, g_variant_new_object_path ((*result.details).path));
+- g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*result.details).name));
+- g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*result.details).icon_path));
++ g_variant_builder_add_value (&_tmp63_, g_variant_new_object_path ((*(*result).details).path));
++ g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*(*result).details).name));
++ g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*(*result).details).icon_path));
+ g_variant_builder_add_value (&_tmp62_, g_variant_builder_end (&_tmp63_));
+ _reply = g_variant_builder_end (&_tmp62_);
+- active_playlist_container_destroy (&result);
++ _active_playlist_container_free0 (result);
+ return _reply;
+ }
+
+@@ -2534,7 +2536,7 @@
+
+
+ static void _dbus_mpris_playlists_set_ActivePlaylist (MprisPlaylists* self, GVariant* _value) {
+- ActivePlaylistContainer value = {0};
++ ActivePlaylistContainer* value = NULL;
+ ActivePlaylistContainer _tmp67_;
+ GVariantIter _tmp68_;
+ GVariant* _tmp69_;
+@@ -2561,9 +2563,9 @@
+ g_variant_unref (_tmp75_);
+ _tmp67_.details = g_memdup (&_tmp71_, sizeof (PlaylistDetails));
+ g_variant_unref (_tmp70_);
+- value = _tmp67_;
++ value = g_memdup (&_tmp67_, sizeof (ActivePlaylistContainer));
+ mpris_playlists_set_ActivePlaylist (self, &value);
+- active_playlist_container_destroy (&value);
++ _active_playlist_container_free0 (value);
+ }
+
+
+
+=== modified file 'src/mpris2-interfaces.vala'
+--- old/src/mpris2-interfaces.vala 2012-03-16 17:59:34 +0000
++++ new/src/mpris2-interfaces.vala 2012-03-20 20:19:44 +0000
+@@ -65,7 +65,7 @@
+ //properties
+ public abstract string[] Orderings{owned get; set;}
+ public abstract uint32 PlaylistCount{owned get; set;}
+- public abstract ActivePlaylistContainer ActivePlaylist {owned get; set;}
++ public abstract ActivePlaylistContainer? ActivePlaylist {owned get; set;}
+
+ //methods
+ public abstract async void ActivatePlaylist(ObjectPath playlist_id) throws IOError;
+
diff --git a/debian/patches/lp_960846.patch b/debian/patches/lp_960846.patch
new file mode 100644
index 0000000..ec8db91
--- /dev/null
+++ b/debian/patches/lp_960846.patch
@@ -0,0 +1,166 @@
+=== modified file 'src/mpris2-controller.vala'
+Index: indicator-sound-0.8.4.1/src/mpris2-controller.vala
+===================================================================
+--- indicator-sound-0.8.4.1.orig/src/mpris2-controller.vala 2012-03-21 10:53:40.041652304 -0400
++++ indicator-sound-0.8.4.1/src/mpris2-controller.vala 2012-03-21 10:53:40.053652304 -0400
+@@ -248,6 +248,9 @@
+
+ private bool validate_playlists_details()
+ {
++ if (this.playlists.ActivePlaylist == null){
++ return false;
++ }
+ if (this.playlists.ActivePlaylist.valid == false){
+ return false;
+ }
+Index: indicator-sound-0.8.4.1/src/mpris2-controller.c
+===================================================================
+--- indicator-sound-0.8.4.1.orig/src/mpris2-controller.c 2012-03-21 10:53:40.037652304 -0400
++++ indicator-sound-0.8.4.1/src/mpris2-controller.c 2012-03-21 10:54:46.433654489 -0400
+@@ -1244,73 +1244,88 @@
+ ActivePlaylistContainer* _tmp2_;
+ ActivePlaylistContainer* _tmp3_;
+ gboolean _tmp4_;
+- gboolean _tmp5_;
+- MprisPlaylists* _tmp6_;
++ MprisPlaylists* _tmp5_;
++ ActivePlaylistContainer* _tmp6_;
+ ActivePlaylistContainer* _tmp7_;
+ ActivePlaylistContainer* _tmp8_;
+- ActivePlaylistContainer* _tmp9_;
+- PlaylistDetails* _tmp10_;
+- gboolean _tmp11_;
+- gboolean _tmp12_ = FALSE;
+- MprisPlaylists* _tmp13_;
++ gboolean _tmp9_;
++ gboolean _tmp10_;
++ MprisPlaylists* _tmp11_;
++ ActivePlaylistContainer* _tmp12_;
++ ActivePlaylistContainer* _tmp13_;
+ ActivePlaylistContainer* _tmp14_;
+- ActivePlaylistContainer* _tmp15_;
+- ActivePlaylistContainer* _tmp16_;
+- PlaylistDetails* _tmp17_;
+- const char* _tmp18_;
+- gboolean _tmp19_;
+- gboolean _tmp26_;
++ PlaylistDetails* _tmp15_;
++ gboolean _tmp16_;
++ gboolean _tmp17_ = FALSE;
++ MprisPlaylists* _tmp18_;
++ ActivePlaylistContainer* _tmp19_;
++ ActivePlaylistContainer* _tmp20_;
++ ActivePlaylistContainer* _tmp21_;
++ PlaylistDetails* _tmp22_;
++ const char* _tmp23_;
++ gboolean _tmp24_;
++ gboolean _tmp31_;
+ g_return_val_if_fail (self != NULL, FALSE);
+ _tmp0_ = self->priv->_playlists;
+ _tmp1_ = mpris_playlists_get_ActivePlaylist (_tmp0_);
+ _tmp2_ = _tmp1_;
+ _tmp3_ = _tmp2_;
+- _tmp4_ = (*_tmp3_).valid;
+- _tmp5_ = _tmp4_ == FALSE;
++ _tmp4_ = _tmp3_ == NULL;
+ _active_playlist_container_free0 (_tmp3_);
+- if (_tmp5_) {
++ if (_tmp4_) {
+ result = FALSE;
+ return result;
+ }
+- _tmp6_ = self->priv->_playlists;
+- _tmp7_ = mpris_playlists_get_ActivePlaylist (_tmp6_);
++ _tmp5_ = self->priv->_playlists;
++ _tmp6_ = mpris_playlists_get_ActivePlaylist (_tmp5_);
++ _tmp7_ = _tmp6_;
+ _tmp8_ = _tmp7_;
+- _tmp9_ = _tmp8_;
+- _tmp10_ = (*_tmp9_).details;
+- _tmp11_ = _tmp10_ == NULL;
+- _active_playlist_container_free0 (_tmp9_);
+- if (_tmp11_) {
++ _tmp9_ = (*_tmp8_).valid;
++ _tmp10_ = _tmp9_ == FALSE;
++ _active_playlist_container_free0 (_tmp8_);
++ if (_tmp10_) {
++ result = FALSE;
++ return result;
++ }
++ _tmp11_ = self->priv->_playlists;
++ _tmp12_ = mpris_playlists_get_ActivePlaylist (_tmp11_);
++ _tmp13_ = _tmp12_;
++ _tmp14_ = _tmp13_;
++ _tmp15_ = (*_tmp14_).details;
++ _tmp16_ = _tmp15_ == NULL;
++ _active_playlist_container_free0 (_tmp14_);
++ if (_tmp16_) {
+ result = FALSE;
+ return result;
+ }
+- _tmp13_ = self->priv->_playlists;
+- _tmp14_ = mpris_playlists_get_ActivePlaylist (_tmp13_);
+- _tmp15_ = _tmp14_;
+- _tmp16_ = _tmp15_;
+- _tmp17_ = (*_tmp16_).details;
+- _tmp18_ = (*_tmp17_).path;
+- _tmp19_ = _tmp18_ == NULL;
+- _active_playlist_container_free0 (_tmp16_);
+- if (_tmp19_) {
+- _tmp12_ = TRUE;
++ _tmp18_ = self->priv->_playlists;
++ _tmp19_ = mpris_playlists_get_ActivePlaylist (_tmp18_);
++ _tmp20_ = _tmp19_;
++ _tmp21_ = _tmp20_;
++ _tmp22_ = (*_tmp21_).details;
++ _tmp23_ = (*_tmp22_).path;
++ _tmp24_ = _tmp23_ == NULL;
++ _active_playlist_container_free0 (_tmp21_);
++ if (_tmp24_) {
++ _tmp17_ = TRUE;
+ } else {
+- MprisPlaylists* _tmp20_;
+- ActivePlaylistContainer* _tmp21_;
+- ActivePlaylistContainer* _tmp22_;
+- ActivePlaylistContainer* _tmp23_;
+- PlaylistDetails* _tmp24_;
+- const gchar* _tmp25_;
+- _tmp20_ = self->priv->_playlists;
+- _tmp21_ = mpris_playlists_get_ActivePlaylist (_tmp20_);
+- _tmp22_ = _tmp21_;
+- _tmp23_ = _tmp22_;
+- _tmp24_ = (*_tmp23_).details;
+- _tmp25_ = (*_tmp24_).name;
+- _tmp12_ = _tmp25_ == NULL;
+- _active_playlist_container_free0 (_tmp23_);
++ MprisPlaylists* _tmp25_;
++ ActivePlaylistContainer* _tmp26_;
++ ActivePlaylistContainer* _tmp27_;
++ ActivePlaylistContainer* _tmp28_;
++ PlaylistDetails* _tmp29_;
++ const gchar* _tmp30_;
++ _tmp25_ = self->priv->_playlists;
++ _tmp26_ = mpris_playlists_get_ActivePlaylist (_tmp25_);
++ _tmp27_ = _tmp26_;
++ _tmp28_ = _tmp27_;
++ _tmp29_ = (*_tmp28_).details;
++ _tmp30_ = (*_tmp29_).name;
++ _tmp17_ = _tmp30_ == NULL;
++ _active_playlist_container_free0 (_tmp28_);
+ }
+- _tmp26_ = _tmp12_;
+- if (_tmp26_) {
++ _tmp31_ = _tmp17_;
++ if (_tmp31_) {
+ result = FALSE;
+ return result;
+ }
+@@ -1381,7 +1396,7 @@
+ _tmp2_ = path;
+ _tmp3_ = e;
+ _tmp4_ = _tmp3_->message;
+- g_warning ("mpris2-controller.vala:280: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_);
++ g_warning ("mpris2-controller.vala:283: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_);
+ _g_error_free0 (e);
+ }
+ __finally13:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..19a2a69
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+sound_nua.patch
+sound_xubuntu.patch
+lp_945827.patch
+lp_960846.patch
diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch
new file mode 100644
index 0000000..869ae24
--- /dev/null
+++ b/debian/patches/sound_nua.patch
@@ -0,0 +1,20 @@
+=== modified file 'src/sound-service-dbus.c'
+--- old/src/sound-service-dbus.c 2012-03-16 17:59:34 +0000
++++ new/src/sound-service-dbus.c 2012-03-19 14:54:30 +0000
+@@ -227,8 +227,14 @@
+ gpointer user_data)
+ {
+ GError * error = NULL;
++ gchar* cmd;
++ if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
++ cmd = "gnome-control-center sound-nua";
++ else
++ cmd = "gnome-control-center sound";
++
+ if (!g_spawn_command_line_async("gnome-volume-control --page=applications", &error) &&
+- !g_spawn_command_line_async("gnome-control-center sound", &error) &&
++ !g_spawn_command_line_async(cmd, &error) &&
+ !g_spawn_command_line_async("xfce4-mixer", &error))
+ {
+ g_warning("Unable to show dialog: %s", error->message);
+
diff --git a/debian/patches/sound_xubuntu.patch b/debian/patches/sound_xubuntu.patch
new file mode 100644
index 0000000..bbf3db2
--- /dev/null
+++ b/debian/patches/sound_xubuntu.patch
@@ -0,0 +1,17 @@
+Description: Use pavucontrol on Xubuntu by default
+ Xfce4-mixer uses gstreamer0.10-pulseaudio, which doesn't provide full access
+ to all audio channels, only to 'Master'.
+Author: Lionel Le Folgoc <mrpouit@ubuntu.com>
+Last-Update: 2012-03-21
+
+--- indicator-sound-0.8.4.1.orig/src/sound-service-dbus.c
++++ indicator-sound-0.8.4.1/src/sound-service-dbus.c
+@@ -230,6 +230,8 @@ show_sound_settings_dialog (DbusmenuMenu
+ gchar* cmd;
+ if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
+ cmd = "gnome-control-center sound-nua";
++ else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
++ cmd = "pavucontrol";
+ else
+ cmd = "gnome-control-center sound";
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..f6ead0e
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+
+DEB_BUILDDIR = build
+DEB_MAKE_FLAVORS = gtk2 gtk3
+
+include /usr/share/cdbs/1/rules/autoreconf.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+
+DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
+DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
+
+DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
+DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
+
+CFLAGS += -Wno-error=deprecated-declarations
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+
+debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
+debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
+
+common-install-arch::
+ find debian/tmp -name \*.la -delete
+ find debian/tmp -name \*.a -delete
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..079f994
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/indicator-sound/+download .*/indicator-sound-([0-9.]+)\.tar\.gz
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 5e004cb..c503220 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -227,8 +227,16 @@ show_sound_settings_dialog (DbusmenuMenuitem *mi,
gpointer user_data)
{
GError * error = NULL;
+ gchar* cmd;
+ if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
+ cmd = "gnome-control-center sound-nua";
+ else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
+ cmd = "pavucontrol";
+ else
+ cmd = "gnome-control-center sound";
+
if (!g_spawn_command_line_async("gnome-volume-control --page=applications", &error) &&
- !g_spawn_command_line_async("gnome-control-center sound", &error) &&
+ !g_spawn_command_line_async(cmd, &error) &&
!g_spawn_command_line_async("xfce4-mixer", &error))
{
g_warning("Unable to show dialog: %s", error->message);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 05:07:23 +0000