From f3756ff85a32f4b2a0771d0ac3bd78a69535395f Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Fri, 3 Jun 2011 11:44:52 +0100
Subject: Use generic headers in preparation for GTK+ 3 transition

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

(bzr r10252.1.1)
---
 src/inkview.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index 448aa77f1..173427aae 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -45,11 +45,7 @@
 
 #include <libxml/tree.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include <gtkmm/main.h>
 
-- 
cgit v1.2.3


From f27307a481f64c0b2d70f02eb3828910981c02e0 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Fri, 24 Jun 2011 00:42:12 +0100
Subject: Remove/replace deprecated gtk_window_set_policy symbol

(bzr r10350.1.2)
---
 src/inkview.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index 173427aae..09169f5be 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -312,7 +312,6 @@ main (int argc, const char **argv)
     gtk_window_set_default_size (GTK_WINDOW (w),
 				 MIN ((int)(ss.doc)->getWidth (), (int)gdk_screen_width () - 64),
 				 MIN ((int)(ss.doc)->getHeight (), (int)gdk_screen_height () - 64));
-    gtk_window_set_policy (GTK_WINDOW (w), TRUE, TRUE, FALSE);
     ss.window = w;
 
     g_signal_connect (G_OBJECT (w), "delete_event", (GCallback) sp_svgview_main_delete, &ss);
-- 
cgit v1.2.3


From d6af1140ee108cc7d7fb6e0ba89ff7e30bb7ad3a Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Sat, 27 Aug 2011 18:05:32 +0200
Subject: Completely remove NRRect, NRRectL, in-svg-plane.h

(bzr r10582.1.6)
---
 src/inkview.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index 09169f5be..0b1292e8e 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -39,7 +39,6 @@
 #include <locale.h>
 
 #include <glib/gmem.h>
-#include <libnr/nr-macros.h>
 
 // #include <stropts.h>
 
-- 
cgit v1.2.3


From 4e51446f417ad82d2cdac758d0c5ce908ff88038 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 8 Dec 2011 11:53:54 +0000
Subject: Switch to top-level glib headers.  Thanks to DimStar for patch

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

(bzr r10762)
---
 src/inkview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index 0b1292e8e..1fd5c2d56 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -38,7 +38,7 @@
 #include <sys/stat.h>
 #include <locale.h>
 
-#include <glib/gmem.h>
+#include <glib.h>
 
 // #include <stropts.h>
 
-- 
cgit v1.2.3