diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 09:05:58 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 09:09:55 -0400 |
| commit | 49cf5142ba9e9542e3e848f0fc55c4fd2eaa9f7f (patch) | |
| tree | 2b0794b7842a9d9fe093db0389765ad3dd89b739 /gtk/gtktextattributes.c | |
| parent | c3a9a20839955a98266463c6fad4f0190feaccc2 (diff) | |
| download | gtk+-49cf5142ba9e9542e3e848f0fc55c4fd2eaa9f7f.tar.gz | |
Deprecate GdkColor
It has been replaced by GdkRGBA. Time to make it official.
http://bugzilla.gnome.org/show_bug.cgi?id=636695
Diffstat (limited to 'gtk/gtktextattributes.c')
| -rw-r--r-- | gtk/gtktextattributes.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gtk/gtktextattributes.c b/gtk/gtktextattributes.c index a5dd897eff..5998bd398c 100644 --- a/gtk/gtktextattributes.c +++ b/gtk/gtktextattributes.c @@ -128,8 +128,10 @@ gtk_text_attributes_copy_values (GtkTextAttributes *src, if (dest->font) pango_font_description_free (dest->font); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (dest->pg_bg_color) gdk_color_free (dest->pg_bg_color); +G_GNUC_END_IGNORE_DEPRECATIONS if (dest->pg_bg_rgba) gdk_rgba_free (dest->pg_bg_rgba); @@ -153,8 +155,10 @@ gtk_text_attributes_copy_values (GtkTextAttributes *src, if (src->font) dest->font = pango_font_description_copy (src->font); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (src->pg_bg_color) dest->pg_bg_color = gdk_color_copy (src->pg_bg_color); +G_GNUC_END_IGNORE_DEPRECATIONS if (src->pg_bg_rgba) dest->pg_bg_rgba = gdk_rgba_copy (src->pg_bg_rgba); @@ -209,8 +213,10 @@ gtk_text_attributes_unref (GtkTextAttributes *values) if (values->font) pango_font_description_free (values->font); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (values->pg_bg_color) gdk_color_free (values->pg_bg_color); +G_GNUC_END_IGNORE_DEPRECATIONS if (values->pg_bg_rgba) gdk_rgba_free (values->pg_bg_rgba); @@ -280,15 +286,19 @@ _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest, if (dest->pg_bg_color) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gdk_color_free (dest->pg_bg_color); dest->pg_bg_color = NULL; +G_GNUC_END_IGNORE_DEPRECATIONS } if (vals->pg_bg_rgba) dest->pg_bg_rgba = gdk_rgba_copy (vals->pg_bg_rgba); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (vals->pg_bg_color) dest->pg_bg_color = gdk_color_copy (vals->pg_bg_color); +G_GNUC_END_IGNORE_DEPRECATIONS } if (vals->font) |