Merge lp:~donadigo/wingpanel-indicator-sound/artists-strv-unowned into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

Proposed by Adam Bieńkowski
Status: Merged
Approved by: Djax
Approved revision: 129
Merged at revision: 129
Proposed branch: lp:~donadigo/wingpanel-indicator-sound/artists-strv-unowned
Merge into: lp:~wingpanel-devs/wingpanel-indicator-sound/trunk
Diff against target: 26 lines (+2/-3)
2 files modified
src/CMakeLists.txt (+1/-1)
src/Widgets/MprisGui.vala (+1/-2)
To merge this branch: bzr merge lp:~donadigo/wingpanel-indicator-sound/artists-strv-unowned
Reviewer Review Type Date Requested Status
WingPanel Devs Pending
Review via email: mp+310193@code.launchpad.net

Commit message

* Make artists arrary unowned

Description of the change

This branch applies the patch from ricotz:
https://paste.debian.net/plain/893308

To post a comment you must log in.
129. By Rico Tzschichholz

Make artists array unowned and bump vala version to 0.26

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2015-06-25 22:03:56 +0000
+++ src/CMakeLists.txt 2016-11-07 15:14:30 +0000
@@ -8,7 +8,7 @@
88
9find_package (Vala REQUIRED)9find_package (Vala REQUIRED)
10include (ValaVersion)10include (ValaVersion)
11ensure_vala_version ("0.22.0" MINIMUM)11ensure_vala_version ("0.26.0" MINIMUM)
1212
13include (ValaPrecompile)13include (ValaPrecompile)
14# Add all your vala files and requires packages to the List below to include them in the build14# Add all your vala files and requires packages to the List below to include them in the build
1515
=== modified file 'src/Widgets/MprisGui.vala'
--- src/Widgets/MprisGui.vala 2016-11-06 18:57:14 +0000
+++ src/Widgets/MprisGui.vala 2016-11-07 15:14:30 +0000
@@ -443,8 +443,7 @@
443 title_label.set_markup ("<b>%s</b>".printf (Markup.escape_text (title)));443 title_label.set_markup ("<b>%s</b>".printf (Markup.escape_text (title)));
444444
445 if ("xesam:artist" in metadata && metadata["xesam:artist"].is_of_type (VariantType.STRING_ARRAY)) {445 if ("xesam:artist" in metadata && metadata["xesam:artist"].is_of_type (VariantType.STRING_ARRAY)) {
446 /* get_strv causes a segfault from multiple free's on vala's side. */446 (unowned string)[] artists = metadata["xesam:artist"].get_strv ();
447 string[] artists = metadata["xesam:artist"].dup_strv ();
448 artist_label.set_text (_("by ")+string.joinv (", ", artists));447 artist_label.set_text (_("by ")+string.joinv (", ", artists));
449 } else {448 } else {
450 if (client.player.playback_status == "Playing") {449 if (client.player.playback_status == "Playing") {

Subscribers

People subscribed via source and target branches

to all changes: