Fix DND with frame sync

[~andy/gtk] / gtk / gtktextattributes.c

diff --git a/gtk/gtktextattributes.c b/gtk/gtktextattributes.c
index 67c3db392a5bb322915dd26b773b3b6bfdb3fe6a..d9bb88564424c1c1761b7edb161301999e9a5293 100644 (file)
--- a/gtk/gtktextattributes.c
+++ b/gtk/gtktextattributes.c
@@ -51,7 +51,6 @@
 
 #include "gtktextattributes.h"
 
-#include "gtkmainprivate.h"
 #include "gtktexttag.h"
 #include "gtktexttypes.h"
 
@@ -279,11 +278,19 @@ _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest,
            {
              gdk_rgba_free (dest->pg_bg_rgba);
              dest->pg_bg_rgba = NULL;
+           }
 
+         if (dest->pg_bg_color)
+           {
+             gdk_color_free (dest->pg_bg_color);
+             dest->pg_bg_color = NULL;
            }
 
          if (vals->pg_bg_rgba)
            dest->pg_bg_rgba = gdk_rgba_copy (vals->pg_bg_rgba);
+
+         if (vals->pg_bg_color)
+           dest->pg_bg_color = gdk_color_copy (vals->pg_bg_color);
         }
 
       if (vals->font)