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
=== modified file 'debian/changelog'
--- debian/changelog 2017-09-30 22:48:51 +0000
+++ debian/changelog 2017-10-27 11:40:49 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1unity-control-center (15.04.0+17.10.20170930-0ubuntu1) artful; urgency=medium2unity-control-center (15.04.0+17.10.20170930-0ubuntu1) artful; urgency=medium
23
3 [ ventrical ]4 [ ventrical ]
@@ -174,6 +175,51 @@
174175
175 -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 14:12:08 +0000176 -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 14:12:08 +0000
176177
178=======
179unity-control-center (15.04.0+16.04.20170214-0ubuntu1) xenial; urgency=medium
180
181 [ Iain Lane ]
182 * user-accounts: Reset the AccountsService password mode when setting
183 the password. There's a codepath for directly setting the password
184 when the user is setting their own, but this doesn't set the AS mode
185 back to ACT_USER_PASSWORD_MODE_REGULAR. If you don't change this and
186 you're in ACT_USER_PASSWORD_MODE_NONE, then you end up staying in
187 the nopasswdlogin group. (LP: #1630156)
188
189 [ Robert Ancell ]
190 * Add AppData (LP: #1639507)
191
192 -- iain@orangesquash.org.uk <iain@orangesquash.org.uk> Tue, 14 Feb 2017 09:17:30 +0000
193
194unity-control-center (15.04.0+16.04.20160705-0ubuntu1) xenial; urgency=medium
195
196 [ Trent Lloyd ]
197 * Fix crash when application supports no mime-type (LP: #1304388)
198
199 [ Marco Trevisan (Treviño) ]
200 * CcAppearancePanel: read COMPIZ_CONFIG_PROFILE value to choose the
201 right settings path (LP: #1598770)
202
203 -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 05 Jul 2016 14:48:55 +0000
204
205unity-control-center (15.04.0+16.04.20160413-0ubuntu3) xenial; urgency=medium
206
207 * panels/bluetooth/gnome-bluetooth/wizard/main.c:
208 - backport fix for making pairing of old bluetooth keyboard work,
209 thanks Kai-Heng Feng and Maurizio Gobbo (lp: #1492443)
210
211 -- Sebastien Bacher <seb128@ubuntu.com> Tue, 24 May 2016 16:30:41 +0200
212
213unity-control-center (15.04.0+16.04.20160413-0ubuntu2) xenial; urgency=medium
214
215 * bluetooh: remove leftover "browse" button, the backend used was
216 removed during the bluez5 update and the panel callbacks were
217 cleaned out, the button is doing nothing else than confusing users
218 (LP: #1562822)
219
220 -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 17:48:47 +0200
221
222>>>>>>> MERGE-SOURCE
177unity-control-center (15.04.0+16.04.20160413-0ubuntu1) xenial; urgency=medium223unity-control-center (15.04.0+16.04.20160413-0ubuntu1) xenial; urgency=medium
178224
179 * remove the migration script, it was only needed for trusty updates225 * remove the migration script, it was only needed for trusty updates
180226
=== modified file 'debian/control'
--- debian/control 2017-09-30 22:30:57 +0000
+++ debian/control 2017-10-27 11:40:49 +0000
@@ -57,9 +57,13 @@
57 libwebkit2gtk-4.0-dev,57 libwebkit2gtk-4.0-dev,
58 libgl1-mesa-dev,58 libgl1-mesa-dev,
59 valac (>= 0.20.0),59 valac (>= 0.20.0),
60<<<<<<< TREE
60 indicator-datetime61 indicator-datetime
61Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/trunk62Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/trunk
62X-Ubuntu-Use-Langpack: yes63X-Ubuntu-Use-Langpack: yes
64=======
65Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/16.04
66>>>>>>> MERGE-SOURCE
6367
64Package: unity-control-center68Package: unity-control-center
65Architecture: any69Architecture: any
6670
=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c 2017-07-18 16:31:27 +0000
+++ panels/appearance/cc-appearance-panel.c 2017-10-27 11:40:49 +0000
@@ -106,6 +106,7 @@
106#endif106#endif
107};107};
108108
109<<<<<<< TREE
109#define COMPIZ_GSETTINGS_SCHEMA "org.compiz"110#define COMPIZ_GSETTINGS_SCHEMA "org.compiz"
110#define COMPIZ_CURRENT_PROFILE_KEY "current-profile"111#define COMPIZ_CURRENT_PROFILE_KEY "current-profile"
111112
@@ -114,6 +115,10 @@
114115
115#define UNITY_GSETTINGS_SCHEMA COMPIZ_GSETTINGS_SCHEMA ".unityshell"116#define UNITY_GSETTINGS_SCHEMA COMPIZ_GSETTINGS_SCHEMA ".unityshell"
116#define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"117#define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"
118=======
119#define UNITY_GSETTINGS_SCHEMA "org.compiz.unityshell"
120#define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"
121>>>>>>> MERGE-SOURCE
117#define UNITY_GSETTINGS_PATH UNITY_PROFILE_PATH"unityshell/"122#define UNITY_GSETTINGS_PATH UNITY_PROFILE_PATH"unityshell/"
118#define UNITY_ICONSIZE_KEY "icon-size"123#define UNITY_ICONSIZE_KEY "icon-size"
119#define UNITY_LAUNCHERSENSITIVITY_KEY "edge-responsiveness"124#define UNITY_LAUNCHERSENSITIVITY_KEY "edge-responsiveness"
@@ -2226,6 +2231,23 @@
2226}2231}
22272232
2228/* </hacks> */2233/* </hacks> */
2234<<<<<<< TREE
2235=======
2236
2237static gchar *
2238compiz_profile_gsettings_path (const gchar *path)
2239{
2240 const gchar *profile = "unity";
2241
2242 if (g_strcmp0 (g_getenv ("COMPIZ_CONFIG_PROFILE"), "ubuntu-lowgfx") == 0)
2243 {
2244 profile = "unity-lowgfx";
2245 }
2246
2247 return g_strdup_printf (path, profile);
2248}
2249
2250>>>>>>> MERGE-SOURCE
2229static void2251static void
2230setup_unity_settings (CcAppearancePanel *self)2252setup_unity_settings (CcAppearancePanel *self)
2231{2253{
@@ -2236,6 +2258,7 @@
2236 GtkScale* launcher_sensitivity_scale;2258 GtkScale* launcher_sensitivity_scale;
2237 GSettingsSchema *schema;2259 GSettingsSchema *schema;
2238 GSettingsSchemaSource* source;2260 GSettingsSchemaSource* source;
2261 gchar *settings_path;
22392262
2240 source = g_settings_schema_source_get_default ();2263 source = g_settings_schema_source_get_default ();
2241 schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);2264 schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);
@@ -2259,20 +2282,32 @@
2259 schema = g_settings_schema_source_lookup (source, UNITY_GSETTINGS_SCHEMA, TRUE);2282 schema = g_settings_schema_source_lookup (source, UNITY_GSETTINGS_SCHEMA, TRUE);
2260 if (schema)2283 if (schema)
2261 {2284 {
2285<<<<<<< TREE
2262 priv->unity_compiz_gs = compiz_grouped_gsettings_new (schema,2286 priv->unity_compiz_gs = compiz_grouped_gsettings_new (schema,
2263 priv->compiz_settings,2287 priv->compiz_settings,
2264 UNITY_GSETTINGS_PATH,2288 UNITY_GSETTINGS_PATH,
2265 &priv->unity_settings);2289 &priv->unity_settings);
2290=======
2291 settings_path = compiz_profile_gsettings_path (UNITY_GSETTINGS_PATH);
2292 priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, settings_path);
2293>>>>>>> MERGE-SOURCE
2266 g_settings_schema_unref (schema);2294 g_settings_schema_unref (schema);
2295 g_free (settings_path);
2267 }2296 }
2268 schema = g_settings_schema_source_lookup (source, COMPIZCORE_GSETTINGS_SCHEMA, TRUE);2297 schema = g_settings_schema_source_lookup (source, COMPIZCORE_GSETTINGS_SCHEMA, TRUE);
2269 if (schema)2298 if (schema)
2270 {2299 {
2300<<<<<<< TREE
2271 priv->compizcore_compiz_gs = compiz_grouped_gsettings_new (schema,2301 priv->compizcore_compiz_gs = compiz_grouped_gsettings_new (schema,
2272 priv->compiz_settings,2302 priv->compiz_settings,
2273 COMPIZCORE_GSETTINGS_PATH,2303 COMPIZCORE_GSETTINGS_PATH,
2274 &priv->compizcore_settings);2304 &priv->compizcore_settings);
2305=======
2306 settings_path = compiz_profile_gsettings_path (COMPIZCORE_GSETTINGS_PATH);
2307 priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, settings_path);
2308>>>>>>> MERGE-SOURCE
2275 g_settings_schema_unref (schema);2309 g_settings_schema_unref (schema);
2310 g_free (settings_path);
2276 }2311 }
22772312
2278 if (!priv->unity_compiz_gs || !priv->compizcore_compiz_gs || !priv->unity_own_settings || !priv->unity_launcher_settings)2313 if (!priv->unity_compiz_gs || !priv->compizcore_compiz_gs || !priv->unity_own_settings || !priv->unity_launcher_settings)
22792314
=== modified file 'panels/sound/gvc-mixer-dialog.c'
--- panels/sound/gvc-mixer-dialog.c 2014-11-12 09:51:13 +0000
+++ panels/sound/gvc-mixer-dialog.c 2017-10-27 11:40:49 +0000
@@ -1501,14 +1501,21 @@
15011501
15021502
1503static void1503static void
1504on_input_selection_changed (GtkTreeSelection *selection,1504on_input_selection_changed (GtkTreeView *treeview,
1505 GvcMixerDialog *dialog)1505 GtkTreePath *path,
1506 GtkTreeViewColumn *column,
1507 gpointer user_data)
1506{1508{
1509 GvcMixerDialog *dialog;
1510 GtkTreeSelection *selection;
1507 GtkTreeModel *model;1511 GtkTreeModel *model;
1508 GtkTreeIter iter;1512 GtkTreeIter iter;
1509 gboolean active;1513 gboolean active;
1510 guint id;1514 guint id;
15111515
1516 dialog = GVC_MIXER_DIALOG (user_data);
1517 selection = gtk_tree_view_get_selection (treeview);
1518
1512 if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {1519 if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {
1513 g_debug ("Could not get default input from selection");1520 g_debug ("Could not get default input from selection");
1514 return;1521 return;
@@ -1536,14 +1543,21 @@
1536}1543}
15371544
1538static void1545static void
1539on_output_selection_changed (GtkTreeSelection *selection,1546on_output_selection_changed (GtkTreeView *treeview,
1540 GvcMixerDialog *dialog)1547 GtkTreePath *path,
1548 GtkTreeViewColumn *column,
1549 gpointer user_data)
1541{1550{
1551 GvcMixerDialog *dialog;
1552 GtkTreeSelection *selection;
1542 GtkTreeModel *model;1553 GtkTreeModel *model;
1543 GtkTreeIter iter;1554 GtkTreeIter iter;
1544 gboolean active;1555 gboolean active;
1545 guint id;1556 guint id;
15461557
1558 dialog = GVC_MIXER_DIALOG (user_data);
1559 selection = gtk_tree_view_get_selection (treeview);
1560
1547 if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {1561 if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {
1548 g_debug ("Could not get default output from selection");1562 g_debug ("Could not get default output from selection");
1549 return;1563 return;
@@ -1612,6 +1626,7 @@
16121626
1613 treeview = gtk_tree_view_new ();1627 treeview = gtk_tree_view_new ();
1614 gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);1628 gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
1629 gtk_tree_view_set_activate_on_single_click (GTK_TREE_VIEW (treeview), TRUE);
16151630
1616 store = gtk_list_store_new (NUM_COLUMNS,1631 store = gtk_list_store_new (NUM_COLUMNS,
1617 G_TYPE_STRING,1632 G_TYPE_STRING,
@@ -1641,7 +1656,7 @@
1641 name_to_text, NULL, NULL);1656 name_to_text, NULL, NULL);
1642 gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);1657 gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
16431658
1644 g_signal_connect ( selection, "changed",1659 g_signal_connect (treeview, "row-activated",
1645 on_selection_changed, dialog);1660 on_selection_changed, dialog);
1646#if 01661#if 0
1647 renderer = gtk_cell_renderer_text_new ();1662 renderer = gtk_cell_renderer_text_new ();

Subscribers

People subscribed via source and target branches