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

(limited to 'src/verbs.cpp')

diff --git a/src/verbs.cpp b/src/verbs.cpp
index ec7cad8dd..8d275aeb7 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -32,6 +32,8 @@
 #include <cstring>
 #include <string>
 
+#include <glibmm/threads.h>
+
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/stock.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/verbs.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/verbs.cpp')

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 8d275aeb7..6f83b3dfb 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -32,7 +32,9 @@
 #include <cstring>
 #include <string>
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/messagedialog.h>
-- 
cgit v1.2.3


From 18632069f19fc1255f509bffb6077cf9d00455ac Mon Sep 17 00:00:00 2001
From: Christoffer Holmstedt <christoffer.holmstedt@gmail.com>
Date: Mon, 17 Jun 2013 19:16:47 +0200
Subject: Removed hard coded keybinding from event-context.cpp and added the
 appropiate function call in verbs.cpp

(bzr r12379.1.1)
---
 src/verbs.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/verbs.cpp')

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 6f83b3dfb..3fdb97365 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -47,6 +47,7 @@
 #include "document.h"
 #include "draw-context.h"
 #include "extension/effect.h"
+#include "event-context.h"
 #include "file.h"
 #include "gradient-drag.h"
 #include "helper/action.h"
@@ -1560,7 +1561,7 @@ void ContextVerb::perform(SPAction *action, void *data)
             tools_switch(dt, TOOLS_MEASURE);
             break;
         case SP_VERB_CONTEXT_DROPPER:
-            tools_switch(dt, TOOLS_DROPPER);
+            sp_toggle_dropper(dt); // Functionality defined in event-context.cpp
             break;
         case SP_VERB_CONTEXT_CONNECTOR:
             tools_switch(dt,  TOOLS_CONNECTOR);
-- 
cgit v1.2.3