[gnome-system-log] logview-prefs: complete migration to GdkRGBA



commit d71f51ff6cd7696d2ddb9b8485863eb8527a877c
Author: Xavier Lehmann <xlehmann free fr>
Date:   Fri Mar 18 10:45:26 2016 -0700

    logview-prefs: complete migration to GdkRGBA
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763843

 src/logview-prefs.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/logview-prefs.c b/src/logview-prefs.c
index a75fa69..fa5f788 100644
--- a/src/logview-prefs.c
+++ b/src/logview-prefs.c
@@ -132,7 +132,7 @@ load_filters (LogviewPrefs *prefs)
   const gchar *str;
   LogviewFilter *filter;
   GtkTextTag *tag;
-  GdkColor color;
+  GdkRGBA color;
   gint idx;
 
   filters = g_settings_get_strv (prefs->priv->logview_prefs,
@@ -152,14 +152,14 @@ load_filters (LogviewPrefs *prefs)
                   g_str_equal (tokens[FILTER_INVISIBLE], "1"), NULL);
 
     if (strlen (tokens[FILTER_FOREGROUND])) {
-      gdk_color_parse (tokens[FILTER_FOREGROUND], &color);
-      g_object_set (tag, "foreground-gdk", &color, 
+      gdk_rgba_parse (&color, tokens[FILTER_FOREGROUND]);
+      g_object_set (tag, "foreground-rgba", &color,
                     "foreground-set", TRUE, NULL);
     }
 
     if (strlen (tokens[FILTER_BACKGROUND])) {
-      gdk_color_parse (tokens[FILTER_BACKGROUND], &color);
-      g_object_set (tag, "paragraph-background-gdk", &color, 
+      gdk_rgba_parse (&color, tokens[FILTER_BACKGROUND]);
+      g_object_set (tag, "paragraph-background-rgba", &color,
                     "paragraph-background-set", TRUE, NULL);
     }
 
@@ -182,9 +182,9 @@ save_filter_foreach_func (gpointer key, gpointer value, gpointer user_data)
   GPtrArray *filters;
   const gchar *name;
   LogviewFilter *filter;
-  GdkColor *foreground;
+  GdkRGBA *foreground;
   gboolean foreground_set;
-  GdkColor *background;
+  GdkRGBA *background;
   gboolean background_set;
   gchar *regex, *color;
   gboolean invisible;
@@ -204,10 +204,10 @@ save_filter_foreach_func (gpointer key, gpointer value, gpointer user_data)
                 "texttag", &tag,
                 NULL);
   g_object_get (tag,
-                "foreground-gdk", &foreground,
-                "paragraph-background-gdk", &background,
                 "foreground-set", &foreground_set,
+                "foreground-rgba", &foreground,
                 "paragraph-background-set", &background_set,
+                "paragraph-background-rgba", &background,
                 "invisible", &invisible, NULL);
 
   if (invisible) {
@@ -217,25 +217,25 @@ save_filter_foreach_func (gpointer key, gpointer value, gpointer user_data)
   }
 
   if (foreground_set) {
-    color = gdk_color_to_string (foreground);
+    color = gdk_rgba_to_string (foreground);
     g_string_append (prefs_string, color);
     g_free (color);
   }
 
   if (foreground) {
-    gdk_color_free (foreground);
+    gdk_rgba_free (foreground);
   }
 
   g_string_append (prefs_string, DELIMITER);
 
   if (background_set) {
-    color = gdk_color_to_string (background);
+    color = gdk_rgba_to_string (background);
     g_string_append (prefs_string, color);
     g_free (color);
   }
 
   if (background) {
-    gdk_color_free (background);
+    gdk_rgba_free (background);
   }
 
   g_string_append (prefs_string, DELIMITER);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]