From ba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 28 Apr 2015 00:38:31 +0100
Subject: Fix unnecessary inclusion of glibmm/threads.h.  This can be resolved
 by ensuring that glibmm headers always preceed glib.h headers. Same applies
 with gtkmm/gtk+ etc

(bzr r14064)
---
 src/ui/widget/entity-entry.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/ui/widget/entity-entry.cpp')

diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index c7d5efe29..69173fa25 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -17,10 +17,6 @@
 # include <config.h>
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/entry.h>
 
-- 
cgit v1.2.3


From e64a5c1dfa1b373e7c25378d9a7180cc7a9688b7 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Tue, 23 Jun 2015 07:26:16 +0200
Subject: Fix for bug #1467601 (Missing undo history label for metadata
 description).

Fixed bugs:
  - https://launchpad.net/bugs/1467601

(bzr r14211)
---
 src/ui/widget/entity-entry.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/ui/widget/entity-entry.cpp')

diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index 69173fa25..a8de2f384 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -188,8 +188,7 @@ EntityMultiLineEntry::on_changed()
     Gtk::TextView *tv = static_cast<Gtk::TextView*>(s->get_child());
     Glib::ustring text = tv->get_buffer()->get_text();
     if (rdf_set_work_entity (doc, _entity, text.c_str())) {
-        DocumentUndo::done(doc, SP_VERB_NONE,
-                            /* TODO: annotate */ "entity-entry.cpp:146");
+        DocumentUndo::done(doc, SP_VERB_NONE, "Document metadata updated");
     }
     _wr->setUpdating (false);
 }
-- 
cgit v1.2.3