From 6dfb9b4eade77ac55d11f05669c2192352b9b8fa Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Thu, 26 Jun 2014 13:49:17 -0400
Subject: 4. further refactor Application class; create proper singleton,
 encapsulate members, simplify signals

(bzr r13341.5.6)
---
 src/ui/widget/imageicon.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/ui/widget/imageicon.cpp')

diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 22abd04ba..0ccff0c9e 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -88,8 +88,9 @@ ImageIcon::~ImageIcon()
  */
 void ImageIcon::init()
 {
+    //  \FIXME Why?
     if (!INKSCAPE)
-        inkscape_application_init("",false);
+        Inkscape::Application::init("", false);
     document = NULL;
     viewerGtkmm = NULL;
     //set_size_request(150,150);
-- 
cgit v1.2.3


From a65c95ff4739e2803e28d64b2a3b3774dd1f45aa Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Thu, 26 Jun 2014 21:40:01 -0400
Subject: Move constructor/destructor into private section, remove protected
 section. Rename init(). Add to-do list.

(bzr r13341.5.8)
---
 src/ui/widget/imageicon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/widget/imageicon.cpp')

diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 0ccff0c9e..8c1e44434 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -90,7 +90,7 @@ void ImageIcon::init()
 {
     //  \FIXME Why?
     if (!INKSCAPE)
-        Inkscape::Application::init("", false);
+        Inkscape::Application::create("", false);
     document = NULL;
     viewerGtkmm = NULL;
     //set_size_request(150,150);
-- 
cgit v1.2.3


From 45f373f3319b598d8e0222fb48e9d3a4760b2044 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Fri, 27 Jun 2014 15:23:06 -0400
Subject: 5. Refactoring of Application class: make copy/assignment operators
 private, disallow pointers to Application

(bzr r13341.5.9)
---
 src/ui/widget/imageicon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/widget/imageicon.cpp')

diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 8c1e44434..df261b69a 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -89,7 +89,7 @@ ImageIcon::~ImageIcon()
 void ImageIcon::init()
 {
     //  \FIXME Why?
-    if (!INKSCAPE)
+    if (!Inkscape::Application::exists())
         Inkscape::Application::create("", false);
     document = NULL;
     viewerGtkmm = NULL;
-- 
cgit v1.2.3