From 8e6879acee859f216f5e63d97a4ba80c7cb0b94b Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Wed, 8 Oct 2014 18:56:12 -0400
Subject: Fix gtk3 build at risk of breaking windows build

(bzr r13341.1.262)
---
 src/ui/widget/highlight-picker.cpp | 10 +---------
 src/ui/widget/insertordericon.cpp  |  9 ---------
 src/ui/widget/insertordericon.h    |  4 ++--
 3 files changed, 3 insertions(+), 20 deletions(-)

(limited to 'src/ui/widget')

diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp
index c03f526dc..8593f0bdf 100644
--- a/src/ui/widget/highlight-picker.cpp
+++ b/src/ui/widget/highlight-picker.cpp
@@ -7,19 +7,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#include <glibmm.h>
 #include <gtkmm/icontheme.h>
- 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
 
 #include "display/cairo-utils.h"
 
-
 #include "highlight-picker.h"
 #include "widgets/icon.h"
 #include "widgets/toolbox.h"
diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp
index 17930daa2..a28b0f834 100644
--- a/src/ui/widget/insertordericon.cpp
+++ b/src/ui/widget/insertordericon.cpp
@@ -9,15 +9,6 @@
 
 #include "ui/widget/insertordericon.h"
  
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
-
 #include <gtkmm/icontheme.h>
 
 #include "widgets/icon.h"
diff --git a/src/ui/widget/insertordericon.h b/src/ui/widget/insertordericon.h
index e6c2e1c5b..fb3412d3f 100644
--- a/src/ui/widget/insertordericon.h
+++ b/src/ui/widget/insertordericon.h
@@ -10,12 +10,12 @@
  */
 
 #if HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
+#include <glibmm.h>
 #include <gtkmm/cellrendererpixbuf.h>
 #include <gtkmm/widget.h>
-#include <glibmm/property.h>
 
 namespace Inkscape {
 namespace UI {
-- 
cgit v1.2.3


From 35153b45814dcc844213951352f410b2fc13e2ad Mon Sep 17 00:00:00 2001
From: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon, 13 Oct 2014 20:49:44 -0700
Subject: Fix crash with GTK+ 3.14 on launch

Patch from Liam to check for undefined desktop during startup.

** (inkscape:57708): CRITICAL **: SPCanvas* sp_desktop_canvas(const
   SPDesktop*): assertion 'desktop != NULL' failed

Fixes:  https://bugs.launchpad.net/inkscape/+bug/1375085

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

(bzr r13611)
---
 src/ui/widget/selected-style.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/ui/widget')

diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index f01366e19..a575dd592 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -1199,7 +1199,9 @@ void SelectedStyle::on_opacity_menu (Gtk::Menu *menu) {
     menu->show_all();
 }
 
-void SelectedStyle::on_opacity_changed () {
+void SelectedStyle::on_opacity_changed ()
+{
+    g_return_if_fail(_desktop); // TODO this shouldn't happen!
     if (_opacity_blocked)
         return;
     _opacity_blocked = true;
-- 
cgit v1.2.3