diff -Nru unity-control-center-15.04.0+17.10.20171225/debian/bzr-builder.manifest unity-control-center-15.04.0+18.04.20180216/debian/bzr-builder.manifest --- unity-control-center-15.04.0+17.10.20171225/debian/bzr-builder.manifest 2018-02-24 16:17:19.000000000 +0000 +++ unity-control-center-15.04.0+18.04.20180216/debian/bzr-builder.manifest 2018-03-12 14:15:38.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version 15.04.0+17.10.20171225-0ubuntu2+201802241617 -lp:~khurshid-alam/unity-control-center/sharing-panel revid:khurshid.alam@linuxmail.org-20180222121007-s5fp83cjcckgnc6p +# bzr-builder format 0.3 deb-version {debversion}+201803121415 +lp:~khurshid-alam/unity-control-center/sharing-panel revid:khurshid.alam@linuxmail.org-20180312140628-rsnrcib4gttusg2w diff -Nru unity-control-center-15.04.0+17.10.20171225/debian/changelog unity-control-center-15.04.0+18.04.20180216/debian/changelog --- unity-control-center-15.04.0+17.10.20171225/debian/changelog 2018-02-24 16:17:19.000000000 +0000 +++ unity-control-center-15.04.0+18.04.20180216/debian/changelog 2018-03-12 14:15:38.000000000 +0000 @@ -1,8 +1,24 @@ -unity-control-center (15.04.0+17.10.20171225-0ubuntu2+201802241617~ubuntu18.04.1) bionic; urgency=low +unity-control-center (15.04.0+18.04.20180216-0ubuntu1+201803121415~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Khurshid Alam Sat, 24 Feb 2018 16:17:19 +0000 + -- Khurshid Alam Mon, 12 Mar 2018 14:15:38 +0000 + +unity-control-center (15.04.0+18.04.20180216-0ubuntu1) bionic; urgency=medium + + [ Khurshid Alam ] + * Import gnome online-accounts panel into unity-control-center (LP: + #1747897) + + -- Jeremy Bicha Fri, 16 Feb 2018 13:08:03 +0000 + +unity-control-center (15.04.0+17.10.20171225-0ubuntu3) bionic; urgency=medium + + * Build against latest gnome-desktop3, cherry-picked fix from + gnome-control-center. + * Bump minimum gnome-desktop3 to 3.27.3 + + -- Jeremy Bicha Mon, 12 Feb 2018 21:58:09 -0500 unity-control-center (15.04.0+17.10.20171225-0ubuntu1) bionic; urgency=medium diff -Nru unity-control-center-15.04.0+17.10.20171225/panels/appearance/cc-appearance-item.c unity-control-center-15.04.0+18.04.20180216/panels/appearance/cc-appearance-item.c --- unity-control-center-15.04.0+17.10.20171225/panels/appearance/cc-appearance-item.c 2018-02-24 16:17:16.000000000 +0000 +++ unity-control-center-15.04.0+18.04.20180216/panels/appearance/cc-appearance-item.c 2018-03-12 14:15:36.000000000 +0000 @@ -93,8 +93,9 @@ static void set_bg_properties (CcAppearanceItem *item) { - GdkColor pcolor = { 0, 0, 0, 0 }; - GdkColor scolor = { 0, 0, 0, 0 }; + GdkRGBA pcolor = { 0, 0, 0, 0 }; + GdkRGBA scolor = { 0, 0, 0, 0 }; + GdkColor p, s; if (item->priv->uri) { GFile *file; @@ -109,13 +110,13 @@ } if (item->priv->primary_color != NULL) { - gdk_color_parse (item->priv->primary_color, &pcolor); + gdk_rgba_parse (&pcolor, item->priv->primary_color); } if (item->priv->secondary_color != NULL) { - gdk_color_parse (item->priv->secondary_color, &scolor); + gdk_rgba_parse (&scolor, item->priv->secondary_color); } - gnome_bg_set_color (item->priv->bg, item->priv->shading, &pcolor, &scolor); + gnome_bg_set_rgba (item->priv->bg, item->priv->shading, &pcolor, &scolor); gnome_bg_set_placement (item->priv->bg, item->priv->placement); } @@ -904,12 +905,12 @@ colors_equal (const char *a, const char *b) { - GdkColor color1, color2; + GdkRGBA color1, color2; - gdk_color_parse (a, &color1); - gdk_color_parse (b, &color2); - - return gdk_color_equal (&color1, &color2); + gdk_rgba_parse (&color1, a); + gdk_rgba_parse (&color2, b); + + return gdk_rgba_equal (&color1, &color2); } gboolean