From 282a7ce3f988e792545c19854b5f55cff1291cbe Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 17 Aug 2014 13:44:01 -0400
Subject: Fix gtk3 crash when using "close" button

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

(bzr r13341.1.143)
---
 src/ui/dialog/dialog.cpp | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'src/ui/dialog/dialog.cpp')

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 645294bb5..22ba0b6fb 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -317,20 +317,7 @@ void Dialog::_apply()
 
 void Dialog::_close()
 {
-    GtkWidget *dlg = GTK_WIDGET(_behavior->gobj());
-
-    GdkEventAny event;
-    event.type = GDK_DELETE;
-    event.window = gtk_widget_get_window(dlg);
-    event.send_event = TRUE;
-
-    if (event.window)
-        g_object_ref(G_OBJECT(event.window));
-
-    gtk_main_do_event ((GdkEvent*)&event);
-
-    if (event.window)
-        g_object_unref(G_OBJECT(event.window));
+    _behavior->hide();
 }
 
 void Dialog::_defocus()
-- 
cgit v1.2.3


From 2a04905eb339f85263babd7d668dd43f072f75b3 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 17 Aug 2014 14:13:20 -0400
Subject: Fix accidental regression in previous commit

(bzr r13341.1.144)
---
 src/ui/dialog/dialog.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/ui/dialog/dialog.cpp')

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 22ba0b6fb..f2c63ed8d 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -318,6 +318,7 @@ void Dialog::_apply()
 void Dialog::_close()
 {
     _behavior->hide();
+    _onDeleteEvent(NULL);
 }
 
 void Dialog::_defocus()
-- 
cgit v1.2.3


From 2d1275f0337e3fe49ea493f58135c81d0e3af36d Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 26 Aug 2014 11:55:28 +0100
Subject: Standardise InkscapeApplication GObject implementation (namespace not
 supported properly)

(bzr r13341.1.179)
---
 src/ui/dialog/dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/dialog/dialog.cpp')

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index f2c63ed8d..4f0d9fbe1 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -41,7 +41,7 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-void sp_retransientize(Inkscape::Application */*inkscape*/, SPDesktop *desktop, gpointer dlgPtr)
+void sp_retransientize(InkscapeApplication */*inkscape*/, SPDesktop *desktop, gpointer dlgPtr)
 {
     Dialog *dlg = static_cast<Dialog *>(dlgPtr);
     dlg->onDesktopActivated (desktop);
-- 
cgit v1.2.3


From efd39893a4f5e629a9df2d0674222aea1be14199 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 5 Oct 2014 12:38:15 -0400
Subject: Move obvious ui component to ui/

(bzr r13341.1.247)
---
 src/ui/dialog/dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/dialog/dialog.cpp')

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 4f0d9fbe1..213965a18 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -28,7 +28,7 @@
 #include "desktop-handles.h"
 #include "shortcuts.h"
 #include "preferences.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "verbs.h"
 #include "ui/tool/event-utils.h"
 
-- 
cgit v1.2.3