[glom] ImageGlom: Remove unused member variable.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] ImageGlom: Remove unused member variable.
- Date: Fri, 15 Jul 2011 07:39:08 +0000 (UTC)
commit 19f11ea7a1badd7eae3331e173733239387fe82e
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Jul 15 09:38:18 2011 +0200
ImageGlom: Remove unused member variable.
* glom/utility_widgets/imageglom.[h|cc]: Also add a comment that
gnome_desktop_thumbnail_factory_new() didn't work either when I tried it.
ChangeLog | 7 +++++++
glom/utility_widgets/imageglom.cc | 3 ++-
glom/utility_widgets/imageglom.h | 7 +++----
3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 67e79d2..b8cff98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-15 Murray Cumming <murrayc murrayc com>
+
+ ImageGlom: Remove unused member variable.
+
+ * glom/utility_widgets/imageglom.[h|cc]: Also add a comment that
+ gnome_desktop_thumbnail_factory_new() didn't work either when I tried it.
+
1.19.8:
2011-07-14 Murray Cumming <murrayc murrayc com>
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 7329c93..a16807b 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -314,7 +314,6 @@ void ImageGlom::show_image_data()
//Clear all possible display widgets:
m_pixbuf_original.reset();
- m_pixbuf_thumbnail.reset();
m_image.set(Glib::RefPtr<Gdk::Pixbuf>()); //TODO: Add an unset() to gtkmm.
if(m_ev_document_model)
@@ -410,6 +409,8 @@ void ImageGlom::show_image_data()
else
{
std::cerr << G_STRFUNC << ": Could not get attribute G_FILE_ATTRIBUTE_THUMBNAIL_PATH. failed=" << failed << std::endl;
+ //Note that gnome_desktop_thumbnail_factory_new() fails too, and
+ //also requires a filepath rather than data in memory.
//Use the standard icon instead:
icon = file_info->get_icon();
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index fab9e28..4b70d01 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -102,13 +102,12 @@ private:
EvView* m_ev_view;
EvDocumentModel* m_ev_document_model;
- //For anything supported by GdkPixbuf:
+ //For anything supported by GdkPixbuf,
+ //or for representative thumbnails and icons:
Gtk::Image m_image;
Glib::RefPtr<Gdk::Pixbuf> m_pixbuf_original; //Only stored temporarily, because it could be big.
Glib::RefPtr<Gdk::Pixbuf> m_pixbuf_clipboard; //When copy is used, store it here until it is pasted.
-
- //For anything else:
- Glib::RefPtr<Gdk::Pixbuf> m_pixbuf_thumbnail;
+
Gtk::Menu* m_pMenuPopup_UserMode;
Glib::RefPtr<Gtk::ActionGroup> m_refActionGroup_UserModePopup;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]