← Back to branch summary

~jbicha/unity-control-center/gd-3-28

« back to all changes in this revision

Viewing changes to panels/appearance/cc-appearance-item.c

  • Committer: jbicha at ubuntu
  • Date: 2018-02-16 13:02:27 UTC
  • Revision ID: jbicha@ubuntu.com-20180216130227-9g6fvly4zethstwu
Build against latest gnome-desktop3

cherry-picked fix from gnome-control-center

Bump minimum gnome-desktop3 to 3.27.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
panels/appearance/cc-appearance-item.c
93
93
static void
94
94
set_bg_properties (CcAppearanceItem *item)
95
95
{
96
 
        GdkColor pcolor = { 0, 0, 0, 0 };
97
 
        GdkColor scolor = { 0, 0, 0, 0 };
 
96
        GdkRGBA pcolor = { 0, 0, 0, 0 };
 
97
        GdkRGBA scolor = { 0, 0, 0, 0 };
 
98
        GdkColor p, s;
98
99
 
99
100
        if (item->priv->uri) {
100
101
                GFile *file;
109
110
        }
110
111
 
111
112
        if (item->priv->primary_color != NULL) {
112
 
                gdk_color_parse (item->priv->primary_color, &pcolor);
 
113
                gdk_rgba_parse (&pcolor, item->priv->primary_color);
113
114
        }
114
115
        if (item->priv->secondary_color != NULL) {
115
 
                gdk_color_parse (item->priv->secondary_color, &scolor);
 
116
                gdk_rgba_parse (&scolor, item->priv->secondary_color);
116
117
        }
117
118
 
118
 
        gnome_bg_set_color (item->priv->bg, item->priv->shading, &pcolor, &scolor);
 
119
        gnome_bg_set_rgba (item->priv->bg, item->priv->shading, &pcolor, &scolor);
119
120
        gnome_bg_set_placement (item->priv->bg, item->priv->placement);
120
121
}
121
122
 
904
905
colors_equal (const char *a,
905
906
              const char *b)
906
907
{
907
 
        GdkColor color1, color2;
908
 
 
909
 
        gdk_color_parse (a, &color1);
910
 
        gdk_color_parse (b, &color2);
911
 
 
912
 
        return gdk_color_equal (&color1, &color2);
 
908
        GdkRGBA color1, color2;
 
909
 
 
910
        gdk_rgba_parse (&color1, a);
 
911
        gdk_rgba_parse (&color2, b);
 
912
 
 
913
        return gdk_rgba_equal (&color1, &color2);
913
914
}
914
915
 
915
916
gboolean