Merge lp:~unity-team/unity-control-center/x-sru3 into lp:~unity-team/unity-control-center/16.04

Proposed by Marco Trevisan (Treviño) on 2016-07-05
Status: Merged
Approved by: Sebastien Bacher on 2016-07-05
Approved revision: 12864
Merged at revision: 12863
Proposed branch: lp:~unity-team/unity-control-center/x-sru3
Merge into: lp:~unity-team/unity-control-center/16.04
Diff against target: 93 lines (+33/-4)
3 files modified
debian/changelog (+11/-0)
panels/appearance/cc-appearance-panel.c (+21/-3)
panels/info/cc-info-panel.c (+1/-1)
To merge this branch: bzr merge lp:~unity-team/unity-control-center/x-sru3
Reviewer Review Type Date Requested Status
Sebastien Bacher 2016-07-05 Approve on 2016-07-05
Review via email: mp+299174@code.launchpad.net

Commit message

Releasing Xenial SRU3

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

looks good, thanks

review: Approve

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 2016-07-05 14:39:20 +0000
3+++ debian/changelog 2016-07-05 14:45:16 +0000
4@@ -1,3 +1,14 @@
5+unity-control-center (15.04.0+16.04.20160413-0ubuntu4) UNRELEASED; urgency=medium
6+
7+ [ Trent Lloyd ]
8+ * Fix crash when application supports no mime-type (LP: #1304388)
9+
10+ [ Marco Trevisan (Treviño) ]
11+ * CcAppearancePanel: read COMPIZ_CONFIG_PROFILE value to choose the
12+ right settings path (LP: #1598770)
13+
14+ -- Trent Lloyd <trent.lloyd@canonical.com> Tue, 05 Jul 2016 16:42:41 +0200
15+
16 unity-control-center (15.04.0+16.04.20160413-0ubuntu3) xenial; urgency=medium
17
18 * panels/bluetooth/gnome-bluetooth/wizard/main.c:
19
20=== modified file 'panels/appearance/cc-appearance-panel.c'
21--- panels/appearance/cc-appearance-panel.c 2016-01-28 16:15:49 +0000
22+++ panels/appearance/cc-appearance-panel.c 2016-07-05 14:45:16 +0000
23@@ -99,7 +99,7 @@
24 };
25
26 #define UNITY_GSETTINGS_SCHEMA "org.compiz.unityshell"
27-#define UNITY_PROFILE_PATH "/org/compiz/profiles/unity/plugins/"
28+#define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"
29 #define UNITY_GSETTINGS_PATH UNITY_PROFILE_PATH"unityshell/"
30 #define UNITY_ICONSIZE_KEY "icon-size"
31 #define UNITY_LAUNCHERSENSITIVITY_KEY "edge-responsiveness"
32@@ -1848,6 +1848,19 @@
33
34 /* </hacks> */
35
36+static gchar *
37+compiz_profile_gsettings_path (const gchar *path)
38+{
39+ const gchar *profile = "unity";
40+
41+ if (g_strcmp0 (g_getenv ("COMPIZ_CONFIG_PROFILE"), "ubuntu-lowgfx") == 0)
42+ {
43+ profile = "unity-lowgfx";
44+ }
45+
46+ return g_strdup_printf (path, profile);
47+}
48+
49 static void
50 setup_unity_settings (CcAppearancePanel *self)
51 {
52@@ -1858,6 +1871,7 @@
53 GtkScale* launcher_sensitivity_scale;
54 GSettingsSchema *schema;
55 GSettingsSchemaSource* source;
56+ gchar *settings_path;
57
58 source = g_settings_schema_source_get_default ();
59 schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);
60@@ -1875,14 +1889,18 @@
61 schema = g_settings_schema_source_lookup (source, UNITY_GSETTINGS_SCHEMA, TRUE);
62 if (schema)
63 {
64- priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, UNITY_GSETTINGS_PATH);
65+ settings_path = compiz_profile_gsettings_path (UNITY_GSETTINGS_PATH);
66+ priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, settings_path);
67 g_settings_schema_unref (schema);
68+ g_free (settings_path);
69 }
70 schema = g_settings_schema_source_lookup (source, COMPIZCORE_GSETTINGS_SCHEMA, TRUE);
71 if (schema)
72 {
73- priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, COMPIZCORE_GSETTINGS_PATH);
74+ settings_path = compiz_profile_gsettings_path (COMPIZCORE_GSETTINGS_PATH);
75+ priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, settings_path);
76 g_settings_schema_unref (schema);
77+ g_free (settings_path);
78 }
79
80 if (!priv->unity_settings || !priv->compizcore_settings || !priv->unity_own_settings || !priv->unity_launcher_settings)
81
82=== modified file 'panels/info/cc-info-panel.c'
83--- panels/info/cc-info-panel.c 2016-03-09 22:06:07 +0000
84+++ panels/info/cc-info-panel.c 2016-07-05 14:45:16 +0000
85@@ -813,7 +813,7 @@
86 pattern = g_pattern_spec_new (app_data->extra_type_filter);
87 mime_types = g_app_info_get_supported_types (info);
88
89- for (i = 0; mime_types[i]; i++)
90+ for (i = 0; mime_types && mime_types[i]; i++)
91 {
92 if (!g_pattern_match_string (pattern, mime_types[i]))
93 continue;

Subscribers

People subscribed via source and target branches

to all changes: