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/ui/widget/entity-entry.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui/widget/entity-entry.cpp')

diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index c622796b2..6b14f2841 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -17,6 +17,8 @@
 # include <config.h>
 #endif
 
+#include <glibmm/threads.h>
+
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/entry.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/ui/widget/entity-entry.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui/widget/entity-entry.cpp')

diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index 6b14f2841..0f526f77a 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -17,7 +17,9 @@
 # include <config.h>
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/entry.h>
-- 
cgit v1.2.3