From c260fcd615791615b33f55459dabe38e64ee3471 Mon Sep 17 00:00:00 2001
From: Jasper van de Gronde <jasper.vandegronde@gmail.com>
Date: Fri, 15 Apr 2011 09:17:08 +0200
Subject: No more PrintWin32, including no special cases for non-Unicode
 Windows anymore.

(bzr r9508.1.82)
---
 src/file.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/file.h')

diff --git a/src/file.h b/src/file.h
index 97d1bd5f8..65d561adc 100644
--- a/src/file.h
+++ b/src/file.h
@@ -183,11 +183,6 @@ would be useful as instance methods
  */
 void sp_file_print (Gtk::Window& parentWindow);
 
-/**
- *
- */
-void sp_file_print_preview (gpointer object, gpointer data);
-
 /*#####################
 ## U T I L I T Y
 #####################*/
-- 
cgit v1.2.3


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/file.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/file.h')

diff --git a/src/file.h b/src/file.h
index 97d1bd5f8..dec7e3f14 100644
--- a/src/file.h
+++ b/src/file.h
@@ -17,7 +17,7 @@
 
 #include <gtkmm.h>
 #include <glib/gslist.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "extension/extension-forward.h"
 #include "extension/system.h"
-- 
cgit v1.2.3


From cf0c689f665675b976215e80ec7c9acf1b2e49e6 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sun, 21 Aug 2011 09:42:08 +0200
Subject: DBUS. Merging lp:~joakim-verona/inkscape/dbus-fixes changes.

(bzr r10559)
---
 src/file.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/file.h')

diff --git a/src/file.h b/src/file.h
index 0041af81f..cf3adec2b 100644
--- a/src/file.h
+++ b/src/file.h
@@ -129,7 +129,7 @@ void sp_file_import (Gtk::Window &parentWindow);
 /**
  * Imports a resource
  */
-void file_import(SPDocument *in_doc, const Glib::ustring &uri,
+SPObject* file_import(SPDocument *in_doc, const Glib::ustring &uri,
                  Inkscape::Extension::Extension *key);
 
 /*######################
-- 
cgit v1.2.3


From 8a1cacd44e5db6437463e31dca2b4e5d4893d075 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Mon, 3 Oct 2011 23:49:12 -0700
Subject: More forward.h purging.

(bzr r10665)
---
 src/file.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/file.h')

diff --git a/src/file.h b/src/file.h
index cf3adec2b..5a43ffa5e 100644
--- a/src/file.h
+++ b/src/file.h
@@ -1,5 +1,5 @@
-#ifndef __SP_FILE_H__
-#define __SP_FILE_H__
+#ifndef SEEN_SP_FILE_H
+#define SEEN_SP_FILE_H
 
 /*
  * File/Print operations
@@ -19,7 +19,6 @@
 #include <glib/gslist.h>
 #include <gtk/gtk.h>
 
-#include "extension/extension-forward.h"
 #include "extension/system.h"
 
 struct SPDesktop;
@@ -193,7 +192,7 @@ void sp_file_print (Gtk::Window& parentWindow);
 void sp_file_vacuum ();
 
 
-#endif
+#endif // SEEN_SP_FILE_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/file.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/file.h')

diff --git a/src/file.h b/src/file.h
index 5a43ffa5e..7e44d7da1 100644
--- a/src/file.h
+++ b/src/file.h
@@ -16,7 +16,7 @@
  */
 
 #include <gtkmm.h>
-#include <glib/gslist.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "extension/system.h"
-- 
cgit v1.2.3