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

[Andrea Azzarone]

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.

SRU fix.

[lp:~azzar1/unity-control-center/fix-1716359-xenial]

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)

=== 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 @@
+<<<<<<< TREE
 unity-control-center (15.04.0+17.10.20170930-0ubuntu1) artful; urgency=medium
 
   [ ventrical ]
@@ -174,6 +175,51 @@
 
  -- Sebastien Bacher <[e-mail]>  Thu, 12 May 2016 14:12:08 +0000
 
+=======
+unity-control-center (15.04.0+16.04.20170214-0ubuntu1) xenial; urgency=medium
+
+  [ Iain Lane ]
+  * 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)
+
+  [ Robert Ancell ]
+  * Add AppData (LP: #1639507)
+
+ -- [e-mail] <[e-mail]>  Tue, 14 Feb 2017 09:17:30 +0000
+
+unity-control-center (15.04.0+16.04.20160705-0ubuntu1) xenial; urgency=medium
+
+  [ Trent Lloyd ]
+  * Fix crash when application supports no mime-type (LP: #1304388)
+
+  [ Marco Trevisan (Treviño) ]
+  * CcAppearancePanel: read COMPIZ_CONFIG_PROFILE value to choose the
+    right settings path (LP: #1598770)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 05 Jul 2016 14:48:55 +0000
+
+unity-control-center (15.04.0+16.04.20160413-0ubuntu3) xenial; urgency=medium
+
+  * 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)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 24 May 2016 16:30:41 +0200
+
+unity-control-center (15.04.0+16.04.20160413-0ubuntu2) xenial; urgency=medium
+
+  * 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)
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 12 May 2016 17:48:47 +0200
+
+>>>>>>> MERGE-SOURCE
 unity-control-center (15.04.0+16.04.20160413-0ubuntu1) xenial; urgency=medium
 
   * remove the migration script, it was only needed for trusty updates

=== 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 @@
                libwebkit2gtk-4.0-dev,
                libgl1-mesa-dev,
                valac (>= 0.20.0),
+<<<<<<< TREE
                indicator-datetime
 Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/trunk
 X-Ubuntu-Use-Langpack: yes
+=======
+Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/16.04
+>>>>>>> MERGE-SOURCE
 
 Package: unity-control-center
 Architecture: any

=== 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 @@
 #endif
 };
 
+<<<<<<< TREE
 #define COMPIZ_GSETTINGS_SCHEMA "org.compiz"
 #define COMPIZ_CURRENT_PROFILE_KEY "current-profile"
 
@@ -114,6 +115,10 @@
 
 #define UNITY_GSETTINGS_SCHEMA COMPIZ_GSETTINGS_SCHEMA ".unityshell"
 #define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"
+=======
+#define UNITY_GSETTINGS_SCHEMA "org.compiz.unityshell"
+#define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"
+>>>>>>> MERGE-SOURCE
 #define UNITY_GSETTINGS_PATH UNITY_PROFILE_PATH"unityshell/"
 #define UNITY_ICONSIZE_KEY "icon-size"
 #define UNITY_LAUNCHERSENSITIVITY_KEY "edge-responsiveness"
@@ -2226,6 +2231,23 @@
 }
 
 /* </hacks> */
+<<<<<<< TREE
+=======
+
+static gchar *
+compiz_profile_gsettings_path (const gchar *path)
+{
+  const gchar *profile = "unity";
+
+  if (g_strcmp0 (g_getenv ("COMPIZ_CONFIG_PROFILE"), "ubuntu-lowgfx") == 0)
+    {
+      profile = "unity-lowgfx";
+    }
+
+  return g_strdup_printf (path, profile);
+}
+
+>>>>>>> MERGE-SOURCE
 static void
 setup_unity_settings (CcAppearancePanel *self)
 {
@@ -2236,6 +2258,7 @@
   GtkScale* launcher_sensitivity_scale;
   GSettingsSchema *schema;
   GSettingsSchemaSource* source;
+  gchar *settings_path;
 
   source = g_settings_schema_source_get_default ();
   schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);
@@ -2259,20 +2282,32 @@
   schema = g_settings_schema_source_lookup (source, UNITY_GSETTINGS_SCHEMA, TRUE);
   if (schema)
     {
+<<<<<<< TREE
       priv->unity_compiz_gs = compiz_grouped_gsettings_new (schema,
                                                             priv->compiz_settings,
                                                             UNITY_GSETTINGS_PATH,
                                                             &priv->unity_settings);
+=======
+      settings_path = compiz_profile_gsettings_path (UNITY_GSETTINGS_PATH);
+      priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, settings_path);
+>>>>>>> MERGE-SOURCE
       g_settings_schema_unref (schema);
+      g_free (settings_path);
     }
   schema = g_settings_schema_source_lookup (source, COMPIZCORE_GSETTINGS_SCHEMA, TRUE);
   if (schema)
     {
+<<<<<<< TREE
       priv->compizcore_compiz_gs = compiz_grouped_gsettings_new (schema,
                                                                  priv->compiz_settings,
                                                                  COMPIZCORE_GSETTINGS_PATH,
                                                                  &priv->compizcore_settings);
+=======
+      settings_path = compiz_profile_gsettings_path (COMPIZCORE_GSETTINGS_PATH);
+      priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, settings_path);
+>>>>>>> MERGE-SOURCE
       g_settings_schema_unref (schema);
+      g_free (settings_path);
     }
 
   if (!priv->unity_compiz_gs || !priv->compizcore_compiz_gs || !priv->unity_own_settings || !priv->unity_launcher_settings)

=== 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 @@
 
 
 static void
-on_input_selection_changed (GtkTreeSelection *selection,
-                             GvcMixerDialog   *dialog)
+on_input_selection_changed (GtkTreeView *treeview,
+                            GtkTreePath *path,
+                            GtkTreeViewColumn *column,
+                            gpointer user_data)
 {
+        GvcMixerDialog *dialog;
+        GtkTreeSelection *selection;
         GtkTreeModel *model;
         GtkTreeIter   iter;
         gboolean      active;
         guint         id;
 
+        dialog = GVC_MIXER_DIALOG (user_data);
+        selection = gtk_tree_view_get_selection (treeview);
+
         if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {
                 g_debug ("Could not get default input from selection");
                 return;
@@ -1536,14 +1543,21 @@
 }
 
 static void
-on_output_selection_changed (GtkTreeSelection *selection,
-                             GvcMixerDialog   *dialog)
+on_output_selection_changed (GtkTreeView *treeview,
+                             GtkTreePath *path,
+                             GtkTreeViewColumn *column,
+                             gpointer user_data)
 {
+        GvcMixerDialog *dialog;
+        GtkTreeSelection *selection;
         GtkTreeModel *model;
         GtkTreeIter   iter;
         gboolean      active;
         guint         id;
 
+        dialog = GVC_MIXER_DIALOG (user_data);
+        selection = gtk_tree_view_get_selection (treeview);
+
         if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {
                 g_debug ("Could not get default output from selection");
                 return;
@@ -1612,6 +1626,7 @@
 
         treeview = gtk_tree_view_new ();
         gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
+        gtk_tree_view_set_activate_on_single_click (GTK_TREE_VIEW (treeview), TRUE);
 
         store = gtk_list_store_new (NUM_COLUMNS,
                                     G_TYPE_STRING,
@@ -1641,7 +1656,7 @@
                                                  name_to_text, NULL, NULL);
         gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
 
-        g_signal_connect ( selection, "changed",
+        g_signal_connect (treeview, "row-activated",
                           on_selection_changed, dialog);
 #if 0
         renderer = gtk_cell_renderer_text_new ();