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/string.cpp | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index cf2b0f5d5..2020fb24d 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -165,12 +165,7 @@ Gtk::Widget * ParamString::get_widget(SPDocument * doc, Inkscape::XML::Node * no
     }
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
-
-#if WITH_GTKMM_2_22
     Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
-#else
-    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_LEFT));
-#endif
     label->show();
     hbox->pack_start(*label, false, false, _indent);
 
-- 
cgit v1.2.3


From 0cdd007ebf8dcfbd39c1d36ab53f43617eb692df Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Mon, 25 Mar 2013 17:42:31 +0000
Subject: Workaround usage of deprecated glib symbols in 3rd party libraries

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

(bzr r12243)
---
 src/extension/param/string.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 2020fb24d..4e525ff73 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -10,11 +10,12 @@
 # include "config.h"
 #endif
 
-#include <glibmm/value.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 
+#include <glibmm/value.h>
+
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "string.h"
-- 
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/string.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 4e525ff73..cedc6b1a9 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -10,6 +10,8 @@
 # include "config.h"
 #endif
 
+#include <glibmm/threads.h>
+
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.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/string.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index cedc6b1a9..d6e438db5 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -10,7 +10,9 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-- 
cgit v1.2.3