[niepce] Get rid of Gdk::Color as it seems that Gtk 3.4 deprecated it all.

[Hubert Figuière <hub src gnome org>]

commit c62099ce50b3c58043e07af7a8451fc9e689f5ee
Author: Hubert Figuière <hub figuiere net>
Date:   Sun Feb 3 21:24:59 2013 -0500

    Get rid of Gdk::Color as it seems that Gtk 3.4 deprecated it all.

 src/fwk/toolkit/gdkutils.cpp          |   12 +++++-------
 src/fwk/toolkit/gdkutils.hpp          |    7 ++++---
 src/niepce/ui/dialogs/editlabels.cpp  |   10 +++++-----
 src/niepce/ui/librarycellrenderer.cpp |    4 ++--
 4 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/src/fwk/toolkit/gdkutils.cpp b/src/fwk/toolkit/gdkutils.cpp
index 229a645..729e829 100644
--- a/src/fwk/toolkit/gdkutils.cpp
+++ b/src/fwk/toolkit/gdkutils.cpp
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gdkmm/color.h>
-
 #include "fwk/base/debug.hpp"
 #include "gdkutils.hpp"
 
@@ -82,17 +80,17 @@ namespace fwk {
        }
 
 
-  Gdk::Color rgbcolor_to_gdkcolor(const fwk::RgbColor & color)
+  Gdk::RGBA rgbcolor_to_gdkcolor(const fwk::RgbColor & color)
   {
-    Gdk::Color gdkcolor;
-    gdkcolor.set_rgb(color[0], color[1], color[2]);
+    Gdk::RGBA gdkcolor;
+    gdkcolor.set_rgba_u(color[0], color[1], color[2]);
     return gdkcolor;
   }
 
 
-  fwk::RgbColor gdkcolor_to_rgbcolor(const Gdk::Color & color)
+  fwk::RgbColor gdkcolor_to_rgbcolor(const Gdk::RGBA & color)
   {
-    fwk::RgbColor rgbcolor(color.get_red(), color.get_green(), color.get_blue());
+    fwk::RgbColor rgbcolor(color.get_red_u(), color.get_green_u(), color.get_blue_u());
     return rgbcolor;
   }
 
diff --git a/src/fwk/toolkit/gdkutils.hpp b/src/fwk/toolkit/gdkutils.hpp
index 3cdf3f2..bd8d16e 100644
--- a/src/fwk/toolkit/gdkutils.hpp
+++ b/src/fwk/toolkit/gdkutils.hpp
@@ -1,7 +1,7 @@
 /*
  * niepce - fwk/toolkit/gdkutils.hpp
  *
- * Copyright (C) 2008-2009 Hubert Figuiere
+ * Copyright (C) 2008-2009, 2013 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #define __FWK_GDKUTILS_H__
 
 #include <gdkmm/pixbuf.h>
+#include <gdkmm/rgba.h>
 
 #include "fwk/base/color.hpp"
 
@@ -36,8 +37,8 @@ namespace fwk {
        Glib::RefPtr<Gdk::Pixbuf> gdkpixbuf_exif_rotate(const Glib::RefPtr<Gdk::Pixbuf> & pixbuf,
                                                                                                        int 
exif_orientation);
 
-  Gdk::Color rgbcolor_to_gdkcolor(const fwk::RgbColor & color);
-  fwk::RgbColor gdkcolor_to_rgbcolor(const Gdk::Color & color);
+  Gdk::RGBA rgbcolor_to_gdkcolor(const fwk::RgbColor & color);
+  fwk::RgbColor gdkcolor_to_rgbcolor(const Gdk::RGBA & color);
 
 }
 
diff --git a/src/niepce/ui/dialogs/editlabels.cpp b/src/niepce/ui/dialogs/editlabels.cpp
index 29450f9..ec7ddbe 100644
--- a/src/niepce/ui/dialogs/editlabels.cpp
+++ b/src/niepce/ui/dialogs/editlabels.cpp
@@ -1,7 +1,7 @@
 /*
  * niepce - niepce/ui/dialogs/editlabels.cpp
  *
- * Copyright (C) 2009 Hubert Figuiere
+ * Copyright (C) 2009, 2013 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,8 +71,8 @@ void EditLabels::setup_widget()
         m_entries[i] = labelentry;
 
         if(has_label) {
-            Gdk::Color color = fwk::rgbcolor_to_gdkcolor(m_labels[i]->color());
-            colorbutton->set_color(color);
+            Gdk::RGBA color = fwk::rgbcolor_to_gdkcolor(m_labels[i]->color());
+            colorbutton->set_rgba(color);
             labelentry->set_text(m_labels[i]->label());
         }
         colorbutton->signal_color_set().connect(
@@ -108,8 +108,8 @@ void EditLabels::update_labels(int /*response*/)
             if(new_name.empty()) {
                 continue;
             }
-            std::string new_color 
-                = fwk::gdkcolor_to_rgbcolor(m_colors[i]->get_color()).to_string();
+            std::string new_color
+                = fwk::gdkcolor_to_rgbcolor(m_colors[i]->get_rgba()).to_string();
             if(!undo) {
                 undo = fwk::Application::app()->begin_undo(_("Change Labels"));
             }
diff --git a/src/niepce/ui/librarycellrenderer.cpp b/src/niepce/ui/librarycellrenderer.cpp
index 1f11580..d8380e6 100644
--- a/src/niepce/ui/librarycellrenderer.cpp
+++ b/src/niepce/ui/librarycellrenderer.cpp
@@ -1,7 +1,7 @@
 /*
  * niepce - ui/librarycellrenderer.cpp
  *
- * Copyright (C) 2008,2011 Hubert Figuiere
+ * Copyright (C) 2008, 2011, 2013 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -177,7 +177,7 @@ void drawLabel(const Cairo::RefPtr<Cairo::Context> & cr,
     cr->set_source_rgb(1.0, 1.0, 1.0);
     cr->stroke();
     cr->rectangle(x, y, label_size, label_size);
-    Gdk::Cairo::set_source_color(cr, fwk::rgbcolor_to_gdkcolor(*color));
+    Gdk::Cairo::set_source_rgba(cr, fwk::rgbcolor_to_gdkcolor(*color));
     cr->fill();
 }