Merge ~azzar1/ubuntu/+source/gnome-shell:fix-warning-in-volume-patch into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master

Proposed by Andrea Azzarone on 2019-04-17
Status: Merged
Merged at revision: 4c53a3cb11460c492fd25a847bb4347e334e3b42
Proposed branch: ~azzar1/ubuntu/+source/gnome-shell:fix-warning-in-volume-patch
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Diff against target: 31 lines (+5/-4)
1 file modified
debian/patches/volume-Add-back-sound-feedback-on-scroll.patch (+5/-4)
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2019-04-17 Pending
Review via email: mp+366211@code.launchpad.net

Commit message

d/p/volume-Add-back-sound-feedback-on-scroll.patch: Add missing import

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch b/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
index 930a67f..38ebdf1 100644
--- a/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
+++ b/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
@@ -34,8 +34,8 @@ Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/53
34Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/5134Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/51
35---35---
36 js/ui/slider.js | 2 --36 js/ui/slider.js | 2 --
37 js/ui/status/volume.js | 19 ++++++++++++++++++-37 js/ui/status/volume.js | 21 +++++++++++++++++++--
38 2 files changed, 18 insertions(+), 3 deletions(-)38 2 files changed, 19 insertions(+), 4 deletions(-)
3939
40diff --git a/js/ui/slider.js b/js/ui/slider.js40diff --git a/js/ui/slider.js b/js/ui/slider.js
41index f9fa732..69f72ce 10064441index f9fa732..69f72ce 100644
@@ -52,13 +52,14 @@ index f9fa732..69f72ce 100644
52 }52 }
53 return Clutter.EVENT_PROPAGATE;53 return Clutter.EVENT_PROPAGATE;
54diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js54diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
55index d555b42..f8e4140 10064455index d555b42..88344e7 100644
56--- a/js/ui/status/volume.js56--- a/js/ui/status/volume.js
57+++ b/js/ui/status/volume.js57+++ b/js/ui/status/volume.js
58@@ -1,6 +1,7 @@58@@ -1,6 +1,7 @@
59 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-59 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
60 60
61 const { Clutter, Gio, Gvc, St } = imports.gi;61-const { Clutter, Gio, Gvc, St } = imports.gi;
62+const { Clutter, Gio, GLib, Gvc, St } = imports.gi;
62+const Mainloop = imports.mainloop;63+const Mainloop = imports.mainloop;
63 const Signals = imports.signals;64 const Signals = imports.signals;
64 65

Subscribers

People subscribed via source and target branches