Merge lp:~azzar1/unity-control-center/fix-1716359-xenial into lp:unity-control-center

Proposed by Andrea Azzarone on 2017-10-27
Status: Superseded
Proposed branch: lp:~azzar1/unity-control-center/fix-1716359-xenial
Merge into: lp:unity-control-center
Diff against target: 235 lines (+105/-5) (has conflicts)
4 files modified
debian/changelog (+46/-0)
debian/control (+4/-0)
panels/appearance/cc-appearance-panel.c (+35/-0)
panels/sound/gvc-mixer-dialog.c (+20/-5)
Text conflict in debian/changelog
Text conflict in debian/control
Text conflict in panels/appearance/cc-appearance-panel.c
To merge this branch: bzr merge lp:~azzar1/unity-control-center/fix-1716359-xenial
Reviewer Review Type Date Requested Status
Unity Control Center development team 2017-10-27 Pending
Review via email: mp+332902@code.launchpad.net

This proposal has been superseded by a proposal from 2017-10-27.

Commit message

Use row-activated signal instead of selection-changed. This will avoid that hy u-c-c decides which port the system should use after the user unplugs the headset. PulseAudio will do the job for us.

Description of the change

SRU fix.

To post a comment you must log in.
12868. By Andrea Azzarone on 2017-10-27

Use row-activated signal instead of selection-changed. This will avoid that hy u-c-c decides which port the system should use after the user unplugs the headset. PulseAudio will do the job for us.

Unmerged revisions

12868. By Andrea Azzarone on 2017-10-27

Use row-activated signal instead of selection-changed. This will avoid that hy u-c-c decides which port the system should use after the user unplugs the headset. PulseAudio will do the job for us.

12867. By CI Train Bot Account on 2017-02-14

Releasing 15.04.0+16.04.20170214-0ubuntu1

12866. By Robert Ancell on 2017-02-14

Add AppData (LP: #1639507)

12865. By Iain Lane on 2017-02-14

user-accounts: Reset the AccountsService password mode when setting the password. There's a codepath for directly setting the password when the user is setting their own, but this doesn't set the AS mode back to ACT_USER_PASSWORD_MODE_REGULAR. If you don't change this and you're in ACT_USER_PASSWORD_MODE_NONE, then you end up staying in the nopasswdlogin group. (LP: #1630156)

Approved by: Robert Ancell

12864. By Iain Lane on 2017-02-13

Merge another 16.04 branch under ~unity-team namespace for some reason

12863. By Sebastien Bacher on 2016-07-11

* panels/bluetooth/gnome-bluetooth/wizard/main.c:
  - backport fix for making pairing of old bluetooth keyboard work,
    thanks Kai-Heng Feng and Maurizio Gobbo (lp: #1492443)

12862. By Sebastien Bacher on 2016-07-11

bluetooh: remove leftover "browse" button, the backend used was
removed during the bluez5 update and the panel callbacks were
cleaned out, the button is doing nothing else than confusing users
(LP: #1562822)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-09-30 22:48:51 +0000
3+++ debian/changelog 2017-10-27 11:40:49 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 unity-control-center (15.04.0+17.10.20170930-0ubuntu1) artful; urgency=medium
7
8 [ ventrical ]
9@@ -174,6 +175,51 @@
10
11 -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 14:12:08 +0000
12
13+=======
14+unity-control-center (15.04.0+16.04.20170214-0ubuntu1) xenial; urgency=medium
15+
16+ [ Iain Lane ]
17+ * user-accounts: Reset the AccountsService password mode when setting
18+ the password. There's a codepath for directly setting the password
19+ when the user is setting their own, but this doesn't set the AS mode
20+ back to ACT_USER_PASSWORD_MODE_REGULAR. If you don't change this and
21+ you're in ACT_USER_PASSWORD_MODE_NONE, then you end up staying in
22+ the nopasswdlogin group. (LP: #1630156)
23+
24+ [ Robert Ancell ]
25+ * Add AppData (LP: #1639507)
26+
27+ -- iain@orangesquash.org.uk <iain@orangesquash.org.uk> Tue, 14 Feb 2017 09:17:30 +0000
28+
29+unity-control-center (15.04.0+16.04.20160705-0ubuntu1) xenial; urgency=medium
30+
31+ [ Trent Lloyd ]
32+ * Fix crash when application supports no mime-type (LP: #1304388)
33+
34+ [ Marco Trevisan (Treviño) ]
35+ * CcAppearancePanel: read COMPIZ_CONFIG_PROFILE value to choose the
36+ right settings path (LP: #1598770)
37+
38+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 05 Jul 2016 14:48:55 +0000
39+
40+unity-control-center (15.04.0+16.04.20160413-0ubuntu3) xenial; urgency=medium
41+
42+ * panels/bluetooth/gnome-bluetooth/wizard/main.c:
43+ - backport fix for making pairing of old bluetooth keyboard work,
44+ thanks Kai-Heng Feng and Maurizio Gobbo (lp: #1492443)
45+
46+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 24 May 2016 16:30:41 +0200
47+
48+unity-control-center (15.04.0+16.04.20160413-0ubuntu2) xenial; urgency=medium
49+
50+ * bluetooh: remove leftover "browse" button, the backend used was
51+ removed during the bluez5 update and the panel callbacks were
52+ cleaned out, the button is doing nothing else than confusing users
53+ (LP: #1562822)
54+
55+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 17:48:47 +0200
56+
57+>>>>>>> MERGE-SOURCE
58 unity-control-center (15.04.0+16.04.20160413-0ubuntu1) xenial; urgency=medium
59
60 * remove the migration script, it was only needed for trusty updates
61
62=== modified file 'debian/control'
63--- debian/control 2017-09-30 22:30:57 +0000
64+++ debian/control 2017-10-27 11:40:49 +0000
65@@ -57,9 +57,13 @@
66 libwebkit2gtk-4.0-dev,
67 libgl1-mesa-dev,
68 valac (>= 0.20.0),
69+<<<<<<< TREE
70 indicator-datetime
71 Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/trunk
72 X-Ubuntu-Use-Langpack: yes
73+=======
74+Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/16.04
75+>>>>>>> MERGE-SOURCE
76
77 Package: unity-control-center
78 Architecture: any
79
80=== modified file 'panels/appearance/cc-appearance-panel.c'
81--- panels/appearance/cc-appearance-panel.c 2017-07-18 16:31:27 +0000
82+++ panels/appearance/cc-appearance-panel.c 2017-10-27 11:40:49 +0000
83@@ -106,6 +106,7 @@
84 #endif
85 };
86
87+<<<<<<< TREE
88 #define COMPIZ_GSETTINGS_SCHEMA "org.compiz"
89 #define COMPIZ_CURRENT_PROFILE_KEY "current-profile"
90
91@@ -114,6 +115,10 @@
92
93 #define UNITY_GSETTINGS_SCHEMA COMPIZ_GSETTINGS_SCHEMA ".unityshell"
94 #define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"
95+=======
96+#define UNITY_GSETTINGS_SCHEMA "org.compiz.unityshell"
97+#define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"
98+>>>>>>> MERGE-SOURCE
99 #define UNITY_GSETTINGS_PATH UNITY_PROFILE_PATH"unityshell/"
100 #define UNITY_ICONSIZE_KEY "icon-size"
101 #define UNITY_LAUNCHERSENSITIVITY_KEY "edge-responsiveness"
102@@ -2226,6 +2231,23 @@
103 }
104
105 /* </hacks> */
106+<<<<<<< TREE
107+=======
108+
109+static gchar *
110+compiz_profile_gsettings_path (const gchar *path)
111+{
112+ const gchar *profile = "unity";
113+
114+ if (g_strcmp0 (g_getenv ("COMPIZ_CONFIG_PROFILE"), "ubuntu-lowgfx") == 0)
115+ {
116+ profile = "unity-lowgfx";
117+ }
118+
119+ return g_strdup_printf (path, profile);
120+}
121+
122+>>>>>>> MERGE-SOURCE
123 static void
124 setup_unity_settings (CcAppearancePanel *self)
125 {
126@@ -2236,6 +2258,7 @@
127 GtkScale* launcher_sensitivity_scale;
128 GSettingsSchema *schema;
129 GSettingsSchemaSource* source;
130+ gchar *settings_path;
131
132 source = g_settings_schema_source_get_default ();
133 schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);
134@@ -2259,20 +2282,32 @@
135 schema = g_settings_schema_source_lookup (source, UNITY_GSETTINGS_SCHEMA, TRUE);
136 if (schema)
137 {
138+<<<<<<< TREE
139 priv->unity_compiz_gs = compiz_grouped_gsettings_new (schema,
140 priv->compiz_settings,
141 UNITY_GSETTINGS_PATH,
142 &priv->unity_settings);
143+=======
144+ settings_path = compiz_profile_gsettings_path (UNITY_GSETTINGS_PATH);
145+ priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, settings_path);
146+>>>>>>> MERGE-SOURCE
147 g_settings_schema_unref (schema);
148+ g_free (settings_path);
149 }
150 schema = g_settings_schema_source_lookup (source, COMPIZCORE_GSETTINGS_SCHEMA, TRUE);
151 if (schema)
152 {
153+<<<<<<< TREE
154 priv->compizcore_compiz_gs = compiz_grouped_gsettings_new (schema,
155 priv->compiz_settings,
156 COMPIZCORE_GSETTINGS_PATH,
157 &priv->compizcore_settings);
158+=======
159+ settings_path = compiz_profile_gsettings_path (COMPIZCORE_GSETTINGS_PATH);
160+ priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, settings_path);
161+>>>>>>> MERGE-SOURCE
162 g_settings_schema_unref (schema);
163+ g_free (settings_path);
164 }
165
166 if (!priv->unity_compiz_gs || !priv->compizcore_compiz_gs || !priv->unity_own_settings || !priv->unity_launcher_settings)
167
168=== modified file 'panels/sound/gvc-mixer-dialog.c'
169--- panels/sound/gvc-mixer-dialog.c 2014-11-12 09:51:13 +0000
170+++ panels/sound/gvc-mixer-dialog.c 2017-10-27 11:40:49 +0000
171@@ -1501,14 +1501,21 @@
172
173
174 static void
175-on_input_selection_changed (GtkTreeSelection *selection,
176- GvcMixerDialog *dialog)
177+on_input_selection_changed (GtkTreeView *treeview,
178+ GtkTreePath *path,
179+ GtkTreeViewColumn *column,
180+ gpointer user_data)
181 {
182+ GvcMixerDialog *dialog;
183+ GtkTreeSelection *selection;
184 GtkTreeModel *model;
185 GtkTreeIter iter;
186 gboolean active;
187 guint id;
188
189+ dialog = GVC_MIXER_DIALOG (user_data);
190+ selection = gtk_tree_view_get_selection (treeview);
191+
192 if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {
193 g_debug ("Could not get default input from selection");
194 return;
195@@ -1536,14 +1543,21 @@
196 }
197
198 static void
199-on_output_selection_changed (GtkTreeSelection *selection,
200- GvcMixerDialog *dialog)
201+on_output_selection_changed (GtkTreeView *treeview,
202+ GtkTreePath *path,
203+ GtkTreeViewColumn *column,
204+ gpointer user_data)
205 {
206+ GvcMixerDialog *dialog;
207+ GtkTreeSelection *selection;
208 GtkTreeModel *model;
209 GtkTreeIter iter;
210 gboolean active;
211 guint id;
212
213+ dialog = GVC_MIXER_DIALOG (user_data);
214+ selection = gtk_tree_view_get_selection (treeview);
215+
216 if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {
217 g_debug ("Could not get default output from selection");
218 return;
219@@ -1612,6 +1626,7 @@
220
221 treeview = gtk_tree_view_new ();
222 gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
223+ gtk_tree_view_set_activate_on_single_click (GTK_TREE_VIEW (treeview), TRUE);
224
225 store = gtk_list_store_new (NUM_COLUMNS,
226 G_TYPE_STRING,
227@@ -1641,7 +1656,7 @@
228 name_to_text, NULL, NULL);
229 gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
230
231- g_signal_connect ( selection, "changed",
232+ g_signal_connect (treeview, "row-activated",
233 on_selection_changed, dialog);
234 #if 0
235 renderer = gtk_cell_renderer_text_new ();

Subscribers

People subscribed via source and target branches