From 9abd33133650d77714fccf09d0c9ff27c9b75a78 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 5 Jul 2012 22:39:08 +0100
Subject: Drop GTK+ 2.20 support.

Fixed bugs:
  - https://launchpad.net/bugs/1020494

(bzr r11529)
---
 src/extension/param/description.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'src/extension/param/description.cpp')

diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index efdf03721..ae2d88ab3 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -77,20 +77,12 @@ ParamDescription::get_widget (SPDocument * /*doc*/, Inkscape::XML::Node * /*node
     Gtk::Label * label;
     int padding = 12 + _indent;
     if (_mode == HEADER) {
-#if WITH_GTKMM_2_22
         label = Gtk::manage(new Gtk::Label(Glib::ustring("<b>") +newguitext + Glib::ustring("</b>"), Gtk::ALIGN_START));
-#else
-        label = Gtk::manage(new Gtk::Label(Glib::ustring("<b>") +newguitext + Glib::ustring("</b>"), Gtk::ALIGN_LEFT));
-#endif
         label->set_padding(0,5);
         label->set_use_markup(true);
         padding = _indent;
     } else {
-#if WITH_GTKMM_2_22
         label = Gtk::manage(new Gtk::Label(newguitext, Gtk::ALIGN_START));
-#else
-        label = Gtk::manage(new Gtk::Label(newguitext, Gtk::ALIGN_LEFT));
-#endif
     }
     label->set_line_wrap();
     label->show();
-- 
cgit v1.2.3


From 3c82e8251460b21c8046a418a9fefb700db0a164 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Tue, 4 Jun 2013 01:52:40 -0700
Subject: Correct to compile against recent gtkmm, including updated macports
 versions. Fixes bug #1179338.

Fixed bugs:
  - https://launchpad.net/bugs/1179338

(bzr r12346.1.1)
---
 src/extension/param/description.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/extension/param/description.cpp')

diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index ae2d88ab3..a43fd624d 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -13,6 +13,8 @@
 # include "config.h"
 #endif
 
+#include <glibmm/threads.h>
+
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <glibmm/i18n.h>
-- 
cgit v1.2.3


From 72d8e897c6b67e46b2a613c4743ef9c13de25059 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Thu, 6 Jun 2013 06:44:11 -0700
Subject: Added configure/ifdef guards to only bring in the needed #include if
 glibmm has it.

(bzr r12353)
---
 src/extension/param/description.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/extension/param/description.cpp')

diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index a43fd624d..c9cea73d4 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -13,7 +13,9 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
-- 
cgit v1.2.3


From 945c52ec7c25d33c233041f0ba1e72a070c22ee3 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Thu, 26 Dec 2013 21:23:59 +0100
Subject: Fix for bug #1204732 (Inkscape crashed with SIGABRT in
 __gnu_cxx::__verbose_terminate_handler()).

Fixed bugs:
  - https://launchpad.net/bugs/1204732

(bzr r12861)
---
 src/extension/param/description.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/extension/param/description.cpp')

diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index c9cea73d4..95ed04afc 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -66,7 +66,10 @@ ParamDescription::ParamDescription (const gchar * name,
 Gtk::Widget *
 ParamDescription::get_widget (SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/, sigc::signal<void> * /*changeSignal*/)
 {
-	if (_gui_hidden) {
+    if (_gui_hidden) {
+        return NULL;
+    }
+    if (_value == NULL) {
         return NULL;
     }
 
-- 
cgit v1.2.3