From 49a7927ecf31ace696e9e5770e8d6543c356db7a Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 28 Jul 2016 19:15:34 +0100
Subject: Finish removing GTK+ 2 fallbacks

(bzr r15023.2.8)
---
 src/desktop.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/desktop.cpp')

diff --git a/src/desktop.cpp b/src/desktop.cpp
index d482d0d7f..83110f8e0 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -1444,11 +1444,7 @@ void SPDesktop::setWaitingCursor()
     GdkDisplay *display = gdk_display_get_default();
     GdkCursor  *waiting = gdk_cursor_new_for_display(display, GDK_WATCH);
     gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(getCanvas())), waiting);
-#if GTK_CHECK_VERSION(3,0,0)
     g_object_unref(waiting);
-#else
-    gdk_cursor_unref(waiting);
-#endif
     // GDK needs the flush for the cursor change to take effect
     gdk_flush();
     waiting_cursor = true;
-- 
cgit v1.2.3


From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Wed, 3 Aug 2016 15:29:38 +0200
Subject: Removed unused includes, decreased compilation time. Once again

(bzr r15034)
---
 src/desktop.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/desktop.cpp')

diff --git a/src/desktop.cpp b/src/desktop.cpp
index d482d0d7f..7e0953d4d 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -23,12 +23,11 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
 #endif
 
 #include "ui/dialog/dialog-manager.h"
 #include <glibmm/i18n.h>
-#include <sigc++/functors/mem_fun.h>
 
 #include <2geom/transforms.h>
 #include <2geom/rect.h>
@@ -45,35 +44,24 @@
 #include "display/canvas-temporary-item-list.h"
 #include "display/drawing-group.h"
 #include "display/gnome-canvas-acetate.h"
-#include "display/drawing.h"
 #include "display/snap-indicator.h"
 #include "display/sodipodi-ctrlrect.h"
 #include "display/sp-canvas-group.h"
-#include "display/sp-canvas.h"
 #include "display/sp-canvas-util.h"
-#include "document.h"
 #include "document-undo.h"
 #include "event-log.h"
 #include "helper/action-context.h"
 #include "ui/interface.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
-#include "layer-model.h"
-#include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
-#include "preferences.h"
 #include "resource-manager.h"
 #include "ui/tools/select-tool.h"
-#include "selection.h"
-#include "sp-item-group.h"
-#include "sp-item-group.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
-#include "sp-defs.h"
 #include "ui/tool-factory.h"
 #include "widgets/desktop-widget.h"
-#include "xml/repr.h"
 #include "helper/action.h" //sp_action_perform
 
 // TODO those includes are only for node tool quick zoom. Remove them after fixing it.
-- 
cgit v1.2.3