Merge lp:~jbicha/unity-control-center/gd-3-28 into lp:unity-control-center

Proposed by Jeremy Bicha on 2018-02-16
Status: Merged
Approved by: Jeremy Bicha on 2018-02-16
Approved revision: no longer in the source branch.
Merged at revision: 12910
Proposed branch: lp:~jbicha/unity-control-center/gd-3-28
Merge into: lp:unity-control-center
Diff against target: 93 lines (+22/-13)
4 files modified
configure.ac (+1/-1)
debian/changelog (+8/-0)
debian/control (+1/-1)
panels/appearance/cc-appearance-item.c (+12/-11)
To merge this branch: bzr merge lp:~jbicha/unity-control-center/gd-3-28
Reviewer Review Type Date Requested Status
Unity Control Center development team 2018-02-16 Pending
Review via email: mp+337861@code.launchpad.net
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
1=== modified file 'configure.ac'
2--- configure.ac 2017-12-07 05:41:33 +0000
3+++ configure.ac 2018-02-16 13:13:23 +0000
4@@ -115,7 +115,7 @@
5 POLKIT_REQUIRED_VERSION=0.103
6 NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
7 LIBNOTIFY_REQUIRED_VERSION=0.7.3
8-GNOME_DESKTOP_REQUIRED_VERSION=3.5.91
9+GNOME_DESKTOP_REQUIRED_VERSION=3.27.3
10 SCHEMAS_REQUIRED_VERSION=3.15.4
11 LIBWACOM_REQUIRED_VERSION=0.7
12 CLUTTER_REQUIRED_VERSION=1.11.3
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2017-12-25 19:10:40 +0000
16+++ debian/changelog 2018-02-16 13:13:23 +0000
17@@ -1,3 +1,11 @@
18+unity-control-center (15.04.0+17.10.20171225-0ubuntu3) bionic; urgency=medium
19+
20+ * Build against latest gnome-desktop3, cherry-picked fix from
21+ gnome-control-center.
22+ * Bump minimum gnome-desktop3 to 3.27.3
23+
24+ -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 12 Feb 2018 21:58:09 -0500
25+
26 unity-control-center (15.04.0+17.10.20171225-0ubuntu1) bionic; urgency=medium
27
28 [ Andrea Azzarone ]
29
30=== modified file 'debian/control'
31--- debian/control 2017-09-30 22:30:57 +0000
32+++ debian/control 2018-02-16 13:13:23 +0000
33@@ -26,7 +26,7 @@
34 libgeonames-dev,
35 libglib2.0-dev (>= 2.31.2),
36 libgnome-bluetooth-dev (>= 3.3.4),
37- libgnome-desktop-3-dev (>= 3.5.91),
38+ libgnome-desktop-3-dev (>= 3.27.3),
39 libgnome-menu-3-dev,
40 libgnomekbd-dev,
41 libgoa-1.0-dev (>= 3.5.90),
42
43=== modified file 'panels/appearance/cc-appearance-item.c'
44--- panels/appearance/cc-appearance-item.c 2014-01-28 22:26:00 +0000
45+++ panels/appearance/cc-appearance-item.c 2018-02-16 13:13:23 +0000
46@@ -93,8 +93,9 @@
47 static void
48 set_bg_properties (CcAppearanceItem *item)
49 {
50- GdkColor pcolor = { 0, 0, 0, 0 };
51- GdkColor scolor = { 0, 0, 0, 0 };
52+ GdkRGBA pcolor = { 0, 0, 0, 0 };
53+ GdkRGBA scolor = { 0, 0, 0, 0 };
54+ GdkColor p, s;
55
56 if (item->priv->uri) {
57 GFile *file;
58@@ -109,13 +110,13 @@
59 }
60
61 if (item->priv->primary_color != NULL) {
62- gdk_color_parse (item->priv->primary_color, &pcolor);
63+ gdk_rgba_parse (&pcolor, item->priv->primary_color);
64 }
65 if (item->priv->secondary_color != NULL) {
66- gdk_color_parse (item->priv->secondary_color, &scolor);
67+ gdk_rgba_parse (&scolor, item->priv->secondary_color);
68 }
69
70- gnome_bg_set_color (item->priv->bg, item->priv->shading, &pcolor, &scolor);
71+ gnome_bg_set_rgba (item->priv->bg, item->priv->shading, &pcolor, &scolor);
72 gnome_bg_set_placement (item->priv->bg, item->priv->placement);
73 }
74
75@@ -904,12 +905,12 @@
76 colors_equal (const char *a,
77 const char *b)
78 {
79- GdkColor color1, color2;
80-
81- gdk_color_parse (a, &color1);
82- gdk_color_parse (b, &color2);
83-
84- return gdk_color_equal (&color1, &color2);
85+ GdkRGBA color1, color2;
86+
87+ gdk_rgba_parse (&color1, a);
88+ gdk_rgba_parse (&color2, b);
89+
90+ return gdk_rgba_equal (&color1, &color2);
91 }
92
93 gboolean

Subscribers

People subscribed via source and target branches