[glom/gtkmm4: 8/9] Comment out use of evince_view.



commit 290adfdcda1ad8029f433b52f368d43ef195f707
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 16 16:47:28 2016 +0100

    Comment out use of evince_view.
    
    Until there is a version that uses GTK+4.

 configure.ac                      |    2 +-
 glom/main.cc                      |    4 ++--
 glom/utility_widgets/imageglom.cc |   12 ++++++++----
 glom/utility_widgets/imageglom.h  |    8 ++++----
 4 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bb8e9b3..e737c7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ AS_IF([test "x$glom_host_win32" != xyes],
       [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-2.0 >= 0.4.0"])
 
 # Libraries used by Glom:
-REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-4.0 >= 3.18.0 goocanvasmm-3.0 >= 1.90.11 evince-view-3.0"
+REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-4.0 >= 3.18.0 goocanvasmm-3.0 >= 1.90.11"
 
 # Do not require iso-codes in client-only mode, or on Windows:
 # TODO: Package iso-codes for Windows?
diff --git a/glom/main.cc b/glom/main.cc
index b8d4b90..dd3feea 100644
--- a/glom/main.cc
+++ b/glom/main.cc
@@ -62,7 +62,7 @@
 #include <glom/application.h>
 #include <glom/utils_ui.h>
 
-#include <evince-view.h>
+//#include <evince-view.h>>
 
 #include <gtkmm/main.h>
 
@@ -499,7 +499,7 @@ main(int argc, char* argv[])
     Goocanvas::init();
 #endif //!GLOM_ENABLE_CLIENT_ONLY
 
-    ev_init();
+    //ev_init();
 
 #ifdef GLOM_ENABLE_POSTGRESQL
 
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index fc994f1..cbb5025 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -49,16 +49,16 @@ ImageGlom::type_vec_ustrings ImageGlom::m_evince_supported_mime_types;
 ImageGlom::type_vec_ustrings ImageGlom::m_gdkpixbuf_supported_mime_types;
 
 ImageGlom::ImageGlom()
-: m_ev_view(nullptr),
-  m_ev_document_model(nullptr)
+//: m_ev_view(nullptr),
+  //m_ev_document_model(nullptr)
 {
   init();
 }
 
 ImageGlom::ImageGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
-: Gtk::EventBox(cobject),
+: Gtk::EventBox(cobject) /*,
   m_ev_view(nullptr),
-  m_ev_document_model(nullptr)
+  m_ev_document_model(nullptr) */
 {
   init();
 }
@@ -70,11 +70,13 @@ void ImageGlom::clear_image_from_widgets()
     m_image->set(Glib::RefPtr<Gdk::Pixbuf>()); //TODO: Add an unset() to gtkmm.
   }
 
+  /*
   if(m_ev_document_model)
   {
     g_object_unref(m_ev_document_model);
     m_ev_document_model = nullptr;
   }
+  */
 }
 
 void ImageGlom::init_widgets(bool use_evince)
@@ -85,6 +87,7 @@ void ImageGlom::init_widgets(bool use_evince)
 
   Gtk::Widget* widget = nullptr;
 
+  /*
   if(use_evince)
   {
     if(!m_ev_view)
@@ -110,6 +113,7 @@ void ImageGlom::init_widgets(bool use_evince)
     widget = m_ev_scrolled_window.get();
   }
   else
+  */
   {
     m_image = std::make_unique<Gtk::Image>();
     if(m_ev_view)
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index f6e1715..fef94ee 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -31,7 +31,7 @@
 #include <gtkmm/scrolledwindow.h>
 #include <giomm/appinfo.h>
 #include <giomm/simpleactiongroup.h>
-#include <evince-view.h>
+//#include <evince-view.h>
 
 namespace Glom
 {
@@ -60,7 +60,7 @@ public:
 
   void set_read_only(bool read_only = true) override;
 
-  void on_ev_job_finished(EvJob* job);
+  //void on_ev_job_finished(EvJob* job);
 
 private:
   void init();
@@ -111,8 +111,8 @@ private:
 
   //For anything supported by Evince:
   std::unique_ptr<Gtk::ScrolledWindow> m_ev_scrolled_window;
-  EvView* m_ev_view;
-  EvDocumentModel* m_ev_document_model;
+  //EvView* m_ev_view;
+  //EvDocumentModel* m_ev_document_model;
 
   //For anything supported by GdkPixbuf,
   //or for representative thumbnails and icons:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]