merged with trunk so I can build again...

(bzr r10092.1.36)

1 files changed, 13 insertions, 18 deletions

diff --git a/src/ui/widget/icon-widget.cpp b/src/ui/widget/icon-widget.cpp
index 64415f421..d04f89b15 100644
--- a/src/ui/widget/icon-widget.cpp
+++ b/src/ui/widget/icon-widget.cpp
@@ -1,6 +1,4 @@
-/**
- * \brief Icon Widget
- *
+/*
  * Author:
  *   Bryce Harrington <bryce@bryceharrington.org>
  *
@@ -14,28 +12,23 @@
 # include <config.h>
 #endif
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "icon-widget.h"
 
 namespace Inkscape {
 namespace UI {
 namespace Widget {
 
-/**
- *    General purpose icon widget, supporting SVG, etc. icon loading
- *
- *    \param ...
- *
- *    An icon widget is a ...
- */
-
-IconWidget::IconWidget()
+IconWidget::IconWidget() :
+    _pb(0),
+    _size(0),
+    _do_bitmap_icons(false)
 {
-    _pb = NULL;
-    _size = 0;
 }
 
-IconWidget::IconWidget(int unsigned size, int unsigned scale, gchar const *name)
+IconWidget::IconWidget(int unsigned size, int unsigned scale, gchar const *name) :
+    _pb(0),
+    _do_bitmap_icons(false)
 {
     _size = std::max((int unsigned)128, std::min(size, (int unsigned)1));
 
@@ -45,7 +38,7 @@ IconWidget::IconWidget(int unsigned size, int unsigned scale, gchar const *name)
 
     if (pixels == NULL) {
         g_warning("Couldn't find matching icon for %s - has this application been installed?", name);
-        _pb = NULL;
+        //_pb = NULL;
     } else {
         /* TODO
         _pb = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB,
@@ -55,7 +48,9 @@ IconWidget::IconWidget(int unsigned size, int unsigned scale, gchar const *name)
     }
 }
 
-IconWidget::IconWidget(int unsigned size, guchar const */*px*/)
+IconWidget::IconWidget(int unsigned size, guchar const */*px*/) :
+    _pb(0),
+    _do_bitmap_icons(false)
 {
     _size = std::max((int unsigned)128, std::min(size, (int unsigned)1));