[GNUnet-SVN] [gnunet-gtk] branch master updated: replace deprecated gdk_color_parse

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet-gtk.

The following commit(s) were added to refs/heads/master by this push:
     new 6fbdc0f  replace deprecated gdk_color_parse
6fbdc0f is described below

commit 6fbdc0f32ec520258d24f95f11c9a8100c11cc43
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Nov 27 09:34:16 2016 +0100

    replace deprecated gdk_color_parse
---
 ChangeLog                       |  2 ++
 m4/ltsugar.m4                   |  7 +++----
 src/statistics/gtk_statistics.c | 16 +++++++++-------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..b034f2c
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+Sun Nov 27 09:23:20 CET 2016
+       Resuming having a manual ChangeLog after migrtion to Git. -CG
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 48bc934..9000a05 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,7 +1,6 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -34,7 +33,7 @@ m4_define([_lt_join],
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
-# Autoconf-2.59, which quotes differently.
+# Autoconf-2.59 which quotes differently.
 m4_define([lt_car], [[$1]])
 m4_define([lt_cdr],
 [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -45,7 +44,7 @@ m4_define([lt_unquote], $1)
 
 # lt_append(MACRO-NAME, STRING, [SEPARATOR])
 # ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
 # Note that neither SEPARATOR nor STRING are expanded; they are appended
 # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 # No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/src/statistics/gtk_statistics.c b/src/statistics/gtk_statistics.c
index c9f18ae..fa3ae08 100644
--- a/src/statistics/gtk_statistics.c
+++ b/src/statistics/gtk_statistics.c
@@ -217,15 +217,17 @@ gtk_statistics_new ()
  * @param color_name name of the color to use
  */
 void
-gtk_statistics_add_line (GtkStatistics * statistics, const char *id,
-                         const char *label, const char *color_name)
+gtk_statistics_add_line (GtkStatistics * statistics,
+                        const char *id,
+                         const char *label,
+                        const char *color_name)
 {
   GtkStatisticsPrivate *priv;
   struct ValueHistory *vh;
-  GdkColor c;
+  GdkRGBA c;
 
   g_return_if_fail (GTK_IS_STATISTICS (statistics));
-  g_return_if_fail (gdk_color_parse (color_name, &c));
+  g_return_if_fail (gdk_rgba_parse (&c, color_name));
   priv = statistics->priv;
   priv->values =
       g_realloc (priv->values,
@@ -234,9 +236,9 @@ gtk_statistics_add_line (GtkStatistics * statistics, const 
char *id,
       g_malloc (sizeof (struct ValueHistory));
   vh->id = strdup (id);
   vh->label = strdup (label);
-  vh->red = c.red / 65535.0;
-  vh->green = c.green / 65535.0;
-  vh->blue = c.blue / 65535.0;
+  vh->red = c.red;
+  vh->green = c.green;
+  vh->blue = c.blue;
   vh->last_history_offset = 0;
   vh->history_size = 0;
 }

-- 
To stop receiving notification emails like this one, please contact
address@hidden