Fixing up a few more files

diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h
index 3126f10f1ebd3a05b1de001073a382d0dc683b0d..74301a609b2cef7109e717f5edbf355f44be3e1f 100644 (file)
--- a/src/debug/simple-event.h
+++ b/src/debug/simple-event.h
@@ -14,7 +14,7 @@
 
 #include <stdarg.h>
 #include <vector>
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/gstrfuncs.h>
 #include <glib/gmessages.h>
 

diff --git a/src/display/bezier-utils.cpp b/src/display/bezier-utils.cpp
index 95b1a5eb1bbb8b34cae049079b7b082cb05d06df..3a9aa415fe70a796259c1f0819f954e2482a7864 100644 (file)
--- a/src/display/bezier-utils.cpp
+++ b/src/display/bezier-utils.cpp
@@ -33,7 +33,7 @@
 # include <ieeefp.h>
 #endif
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/gmessages.h>
 #include <glib/gmem.h>
 #include "bezier-utils.h"

diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 852b7ce7031a756670b81cd39e528d70a59e7e6e..3fe3115c0fdb6b5e96eface4e492952076705c29 100644 (file)
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -151,6 +151,8 @@ update_pref(gchar const *pref_path, gchar const *pref_attr,
 void
 init()
 {
+    printf("Initting inputs\n");
+
     /* TODO: Change to Internal */
     Internal::Svg::init();
     Internal::Svgz::init();
@@ -167,10 +169,13 @@ init()
     Internal::CairoPsOutput::init();
 #endif
 #ifdef HAVE_POPPLER
+    printf("Initting PdfInput for poppler");
     Internal::PdfInput::init();
 #endif
 #ifdef HAVE_POPPLER_GLIB
+    printf("We have POPPLER GLIB\n");
     if (1) {
+        printf("Initting PdfInputCairo\n");
     Internal::PdfInputCairo::init();
     }
 #endif

diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index e17c690aa5017acf07d257e5c24b917e49892d9f..5c8f8d57f26614cfc2ef30abd6032696330c8085 100644 (file)
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -44,7 +44,9 @@ Input::Input (Inkscape::XML::Node * in_repr, Implementation::Implementation * in
     extension = NULL;
     filetypename = NULL;
     filetypetooltip = NULL;
-       output_extension = NULL;
+    output_extension = NULL;
+
+    printf("Input::Input\n");
 
     if (repr != NULL) {
         Inkscape::XML::Node * child_repr;
@@ -145,6 +147,8 @@ Input::check (void)
 SPDocument *
 Input::open (const gchar *uri)
 {
+    printf("Input::open\n");
+
     if (!loaded()) {
         set_state(Extension::STATE_LOADED);
     }

diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp
index 90ac9294b5071c67ce5898bd0d89b4123a1bd4ce..8069f9cf3e0929ad1e7031526ddbe822d4129ea7 100644 (file)
--- a/src/extension/internal/pdf-input-cairo.cpp
+++ b/src/extension/internal/pdf-input-cairo.cpp
@@ -35,6 +35,8 @@ static cairo_status_t _write_ustring_cb(void *closure, const unsigned char *data
 SPDocument *
 PdfInputCairo::open(Inkscape::Extension::Input * mod, const gchar * uri) {
 
+    printf("Attempting to open using PdfInputCairo\n");
+
     gchar* filename_uri = g_filename_to_uri(uri, NULL, NULL);
 
     PopplerDocument* document = poppler_document_new_from_file(filename_uri, NULL, NULL);

diff --git a/src/libnr/nr-matrix.h b/src/libnr/nr-matrix.h
index 0205ab04f44438c2043229a77f2d415a0c16bf82..f4164d3e786496f4b876cc780809549df4f632db 100644 (file)
--- a/src/libnr/nr-matrix.h
+++ b/src/libnr/nr-matrix.h
@@ -17,7 +17,7 @@
  * This code is in public domain.
  */
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/gmessages.h>
 
 #include "libnr/nr-coord.h"