[gnote] Cleanup note manager of start note



commit 6e2560938adc28532fd5222baa7d1da3e3bd976d
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Dec 19 14:52:18 2020 +0200

    Cleanup note manager of start note

 src/notemanager.cpp     | 25 ++++---------------------
 src/notemanager.hpp     |  2 --
 src/notemanagerbase.hpp |  6 ------
 3 files changed, 4 insertions(+), 29 deletions(-)
---
diff --git a/src/notemanager.cpp b/src/notemanager.cpp
index b94f03ab..0f6801a7 100644
--- a/src/notemanager.cpp
+++ b/src/notemanager.cpp
@@ -52,13 +52,6 @@ namespace gnote {
     Glib::ustring backup = directory + "/Backup";
     bool is_first_run = NoteManagerBase::init(directory, backup);
 
-    Glib::RefPtr<Gio::Settings> settings = m_preferences.get_schema_settings(Preferences::SCHEMA_GNOTE);
-    // Watch the START_NOTE_URI setting and update it so that the
-    // StartNoteUri property doesn't generate a call to
-    // Preferences.Get () each time it's accessed.
-    m_start_note_uri = settings->get_string(Preferences::START_NOTE_URI);
-    settings->signal_changed().connect(sigc::mem_fun(*this, &NoteManager::on_setting_changed));
-
     m_addin_mgr = create_addin_manager ();
 
     if (is_first_run) {
@@ -101,14 +94,6 @@ namespace gnote {
     delete m_addin_mgr;
   }
 
-  void NoteManager::on_setting_changed(const Glib::ustring & key)
-  {
-    if(key == Preferences::START_NOTE_URI) {
-      m_start_note_uri = m_preferences
-        .get_schema_settings(Preferences::SCHEMA_GNOTE)->get_string(Preferences::START_NOTE_URI);
-    }
-  }
-
   AddinManager *NoteManager::create_addin_manager()
   {
     return new AddinManager(m_gnote, *this, m_preferences, IGnote::conf_dir());
@@ -163,8 +148,7 @@ namespace gnote {
       NoteBase::Ptr start_note = create (_("Start Here"),
                                 start_note_content);
       start_note->queue_save (CONTENT_CHANGED);
-      m_preferences.get_schema_settings(Preferences::SCHEMA_GNOTE)->set_string(
-          Preferences::START_NOTE_URI, start_note->uri());
+      m_preferences.start_note_uri(start_note->uri());
 
       NoteBase::Ptr links_note = create (_("Using Links in Gnote"),
                                 links_note_content);
@@ -195,13 +179,12 @@ namespace gnote {
     // make sure that the Uri is valid to prevent bug #508982. This
     // has to be done here for long-time Tomboy users who won't go
     // through the create_start_notes () process.
-    if (start_note_uri().empty() ||
-        !find_by_uri(start_note_uri())) {
+    auto start_note_uri = m_preferences.start_note_uri();
+    if (start_note_uri.empty() || !find_by_uri(start_note_uri)) {
       // Attempt to find an existing Start Here note
       NoteBase::Ptr start_note = find (_("Start Here"));
       if (start_note) {
-        m_preferences.get_schema_settings(Preferences::SCHEMA_GNOTE)->set_string(
-            Preferences::START_NOTE_URI, start_note->uri());
+        m_preferences.start_note_uri(start_note->uri());
       }
     }
   }
diff --git a/src/notemanager.hpp b/src/notemanager.hpp
index f05ee0a4..a9ad21a2 100644
--- a/src/notemanager.hpp
+++ b/src/notemanager.hpp
@@ -61,8 +61,6 @@ namespace gnote {
         return m_tag_manager;
       }
 
-    void on_setting_changed(const Glib::ustring & key);
-
     AddinManager & get_addin_manager()
       {
         return *m_addin_mgr;
diff --git a/src/notemanagerbase.hpp b/src/notemanagerbase.hpp
index 280e9a7d..0ef31dc7 100644
--- a/src/notemanagerbase.hpp
+++ b/src/notemanagerbase.hpp
@@ -92,11 +92,6 @@ public:
       return m_notes;
     }
 
-  const Glib::ustring & start_note_uri() const
-    { 
-      return m_start_note_uri; 
-    }
-
   ChangedHandler signal_note_deleted;
   ChangedHandler signal_note_added;
   NoteBase::RenamedHandler signal_note_renamed;
@@ -122,7 +117,6 @@ protected:
 
   IGnote & m_gnote;
   NoteBase::List m_notes;
-  Glib::ustring m_start_note_uri;
   Glib::ustring m_backup_dir;
   Glib::ustring m_default_note_template_title;
 private:


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