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

(limited to 'src/event-context.cpp')

diff --git a/src/event-context.cpp b/src/event-context.cpp
index cec3a6e68..4a0608d62 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -18,6 +18,8 @@
 # include "config.h"
 #endif
 
+#include <glibmm/threads.h>
+
 #include "shortcuts.h"
 #include "file.h"
 #include "event-context.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/event-context.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/event-context.cpp')

diff --git a/src/event-context.cpp b/src/event-context.cpp
index 4a0608d62..628380a2c 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -18,7 +18,9 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include "shortcuts.h"
 #include "file.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/event-context.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/event-context.cpp')

diff --git a/src/event-context.cpp b/src/event-context.cpp
index 628380a2c..4bbb012e0 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -590,13 +590,6 @@ static gint sp_event_context_private_root_handler(
             ret = sp_shortcut_invoke(shortcut, desktop);
             break;
 
-        case GDK_KEY_D:
-        case GDK_KEY_d:
-            if (!MOD__SHIFT(event) && !MOD__CTRL(event) && !MOD__ALT(event)) {
-                sp_toggle_dropper(desktop);
-                ret = TRUE;
-            }
-            break;
         case GDK_KEY_Q:
         case GDK_KEY_q:
             if (desktop->quick_zoomed()) {
-- 
cgit v1.2.3