[gnote] Use new utilities in sync dialog



commit e90abc5b9539898312055a76048a983a71a313c4
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Dec 13 00:00:34 2020 +0200

    Use new utilities in sync dialog

 src/synchronization/syncdialog.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/synchronization/syncdialog.cpp b/src/synchronization/syncdialog.cpp
index 8e07c53d..bdc300ab 100644
--- a/src/synchronization/syncdialog.cpp
+++ b/src/synchronization/syncdialog.cpp
@@ -596,8 +596,7 @@ void SyncDialog::note_conflict_detected(const Note::Ptr & localConflictNote,
                                         NoteUpdate remoteNote,
                                         const std::vector<Glib::ustring> & noteUpdateTitles)
 {
-  int dlgBehaviorPref = m_gnote.preferences()
-    .get_schema_settings(Preferences::SCHEMA_SYNC)->get_int(Preferences::SYNC_CONFIGURED_CONFLICT_BEHAVIOR);
+  int dlgBehaviorPref = m_gnote.preferences().sync_configured_conflict_behavior();
 
   // This event handler will be called by the synchronization thread
   // so we have to use the delegate here to manipulate the GUI.
@@ -674,8 +673,7 @@ void SyncDialog::note_conflict_detected_(
     }
   }
 
-  m_gnote.preferences().get_schema_settings(Preferences::SCHEMA_SYNC)->set_int(
-    Preferences::SYNC_CONFIGURED_CONFLICT_BEHAVIOR, static_cast<int>(savedBehavior)); // TODO: Clean up
+  m_gnote.preferences().sync_configured_conflict_behavior(static_cast<int>(savedBehavior));
 
   conflictDlg.hide();
 


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