[gnote] sanitize the use of Gnote::conf_dir();
- From: Hubert Figuière <hub src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnote] sanitize the use of Gnote::conf_dir();
- Date: Wed, 3 Jun 2009 03:52:53 -0400 (EDT)
commit 5c191ed8f5e06358d6e9ca970784e55ad414cef6
Author: Hubert Figuiere <hub figuiere net>
Date: Mon Jun 1 23:48:56 2009 -0400
sanitize the use of Gnote::conf_dir();
---
src/gnote.hpp | 5 +++--
src/notemanager.cpp | 4 +---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/gnote.hpp b/src/gnote.hpp
index c2f21ae..f0e4519 100644
--- a/src/gnote.hpp
+++ b/src/gnote.hpp
@@ -47,7 +47,6 @@ public:
Gnote();
~Gnote();
int main(int argc, char **argv);
- std::string get_note_path(const std::string & override_path);
NoteManager & default_note_manager()
{
return *m_manager;
@@ -70,7 +69,6 @@ public:
void open_search_all();
void open_note_sync_window();
- static std::string conf_dir();
static bool tray_icon_showing()
{
return s_tray_icon_showing;
@@ -84,6 +82,9 @@ public:
m_tray = tray;
}
private:
+ static std::string conf_dir();
+ std::string get_note_path(const std::string & override_path);
+
NoteManager *m_manager;
IKeybinder *m_keybinder;
Glib::RefPtr<Gtk::IconTheme> m_icon_theme;
diff --git a/src/notemanager.cpp b/src/notemanager.cpp
index 5ed1204..315173c 100644
--- a/src/notemanager.cpp
+++ b/src/notemanager.cpp
@@ -151,9 +151,7 @@ namespace gnote {
AddinManager *NoteManager::create_addin_manager() const
{
- std::string gnote_conf_dir = Gnote::conf_dir();
-
- return new AddinManager(gnote_conf_dir);
+ return new AddinManager(m_notes_dir);
}
// For overriding in test methods.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]