Changeset cd0ff9f24329c7de221bd7a72ae605afae4f759e

Timestamp:

18/09/08 22:16:27 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

ebd3ac7923390c60435abec25998db679fc50781

Children:

04fe422de37ab2581560c02d9fbb84e47b49f86e

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-09-18T22:16:27Z+0200

Message:

Added GOBBY_CONFIGDIR define, honor for config files

2008-09-18 Armin Burgmeier <armin@…>

• configure.ac: Added a new define, GOBBY_CONFIGDIR, that specifies where Gobby shall store it's configuration files (preferences, known documents, known hosts)

• inc/core/preferences.hpp:
• src/core/preferences.cpp: Added a security section with trust file and security-policy entries, changed serialise to serialize for consistency.

• src/window.cpp: Call preferences.serialize instead of serialise.

• src/core/browser.cpp: Use the security policy to create new XMPP connections. Honor GOBBY_CONFIGDIR for known hosts file.

• src/core/documentinfostorage: Honor GOBBY_CONFIGDIR for known documents file.

• src/main.cpp: Honor GOBBY_CONFIGDIR for config file.

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (1 diff)
• inc/core/preferences.hpp (modified) (7 diffs)
• src/core/browser.cpp (modified) (2 diffs)
• src/core/documentinfostorage.cpp (modified) (2 diffs)
• src/core/preferences.cpp (modified) (3 diffs)
• src/dialogs/preferencesdialog.cpp (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)
• src/window.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-09-18  Armin Burgmeier  <armin@arbur.net>
+
+        * configure.ac: Added a new define, GOBBY_CONFIGDIR, that specifies
+        where Gobby shall store it's configuration files (preferences, known
+        documents, known hosts)
+
+        * inc/core/preferences.hpp:
+        * src/core/preferences.cpp: Added a security section with trust
+        file and security-policy entries, changed serialise to serialize for
+        consistency.
+
+        * src/window.cpp: Call preferences.serialize instead of serialise.
+
+        * src/core/browser.cpp: Use the security policy to create new XMPP
+        connections. Honor GOBBY_CONFIGDIR for known hosts file.
+
+        * src/core/documentinfostorage: Honor GOBBY_CONFIGDIR for known
+        documents file.
+
+        * src/main.cpp: Honor GOBBY_CONFIGDIR for config file.
+
 2008-09-17  Armin Burgmeier  <armin@arbur.net>
 

configure.ac

@@ -77 +77 @@
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain])
 
+AC_DEFINE(GOBBY_CONFIGDIR, [".gobby-0.5"],
+          [where to store Gobby's config files,
+           relative to the user's home directory])
+
 AC_OUTPUT([
         Makefile

inc/core/preferences.hpp

@@ -25 +25 @@
 
 #include <gtkmm/toolbar.h>
+
+#include <libinfinity/common/inf-xmpp-connection.h>
 
 namespace Gobby
@@ -90 +92 @@
         /** Serialises preferences back to config.
          */
-        void serialise(Config& config) const;
+        void serialize(Config& config) const;
 
         class User
@@ -96 +98 @@
         public:
                 User(Config::ParentEntry& entry);
-                void serialise(Config::ParentEntry& entry) const;
+                void serialize(Config::ParentEntry& entry) const;
 
                 Option<Glib::ustring> name;
@@ -107 +109 @@
         public:
                 Editor(Config::ParentEntry& entry);
-                void serialise(Config::ParentEntry& entry) const;
+                void serialize(Config::ParentEntry& entry) const;
 
                 Option<unsigned int> tab_width;
@@ -119 +121 @@
         public:
                 View(Config::ParentEntry& entry);
-                void serialise(Config::ParentEntry& entry) const;
+                void serialize(Config::ParentEntry& entry) const;
 
                 Option<Gtk::WrapMode> wrap_mode;
@@ -133 +135 @@
         public:
                 Appearance(Config::ParentEntry& entry);
-                void serialise(Config::ParentEntry& entry) const;
+                void serialize(Config::ParentEntry& entry) const;
 
+                // TODO: Option<bool> use_system_default_toolbar_style
+                // (sets toolbar_style by gconf). At least WITH_GNOME.
                 Option<Gtk::ToolbarStyle> toolbar_style;
                 Option<Pango::FontDescription> font;
@@ -146 +150 @@
         };
 
+        class Security
+        {
+        public:
+                Security(Config::ParentEntry& entry);
+                void serialize(Config::ParentEntry& entry) const;
+
+                Option<std::string> trust_file;
+                Option<InfXmppConnectionSecurityPolicy> policy;
+        };
+
         User user;
         Editor editor;
         View view;
         Appearance appearance;
+        Security security;
 };
 

src/core/browser.cpp

@@ -72 +72 @@
 
         Glib::ustring known_hosts_file = Glib::build_filename(
-                Glib::get_home_dir(), ".gobby/known_hosts");
+                Glib::get_home_dir(), GOBBY_CONFIGDIR"/known_hosts");
         m_cert_manager = inf_gtk_certificate_manager_new(
                 parent.gobj(), m_xmpp_manager,
@@ -242 +242 @@
                         xmpp = inf_xmpp_connection_new(
                                 connection, INF_XMPP_CONNECTION_CLIENT,
-                                NULL, hostname.c_str(), NULL, NULL);
+                                NULL, hostname.c_str(),
+                                m_preferences.security.policy, NULL, NULL);
 
                         inf_xmpp_manager_add_connection(m_xmpp_manager, xmpp);

src/core/documentinfostorage.cpp

@@ -20 +20 @@
 #include "util/file.hpp"
 
+#include "features.hpp"
+
 #include <libxml++/nodes/textnode.h>
 #include <libxml++/parsers/domparser.h>
@@ -88 +90 @@
                 return Glib::build_filename(
                         Glib::get_home_dir(),
-                        Glib::build_filename(".gobby", "documents.xml"));
+                        Glib::build_filename(
+                                GOBBY_CONFIGDIR,
+                                "documents.xml"));
         }
 }

src/core/preferences.cpp

@@ -23 +23 @@
         name(entry.get_value<Glib::ustring>("name", Glib::get_user_name())),
         hue(entry.get_value<double>("hue", Glib::Rand().get_double())),
-        host_directory(entry.get_value<std::string>("host-directory", Glib::build_filename(Glib::get_home_dir(), ".infinote")))
+        host_directory(entry.get_value<std::string>("host-directory",
+                Glib::build_filename(Glib::get_home_dir(), ".infinote")))
 {
 }
 
-void Gobby::Preferences::User::serialise(Config::ParentEntry& entry) const
+void Gobby::Preferences::User::serialize(Config::ParentEntry& entry) const
 {
         entry.set_value("name", name);
@@ -35 +36 @@
 
 Gobby::Preferences::Editor::Editor(Config::ParentEntry& entry):
-        tab_width(entry.get_value<unsigned int>("tab_width", 8)),
-        tab_spaces(entry.get_value<bool>("tab_insert_spaces", false)),
-        indentation_auto(entry.get_value<bool>("auto_indentation", true)),
-        homeend_smart(entry.get_value<bool>("smart_homeend", false) )
+        tab_width(entry.get_value<unsigned int>("tab-width", 8)),
+        tab_spaces(entry.get_value<bool>("tab-insert-spaces", false)),
+        indentation_auto(entry.get_value<bool>("auto-indentation", true)),
+        homeend_smart(entry.get_value<bool>("smart-homeend", false) )
 {
 }
 
-void Gobby::Preferences::Editor::serialise(Config::ParentEntry& entry) const
+void Gobby::Preferences::Editor::serialize(Config::ParentEntry& entry) const
 {
-        entry.set_value("tab_width", tab_width);
-        entry.set_value("tab_insert_spaces", tab_spaces);
-        entry.set_value("auto_indentation", indentation_auto);
-        entry.set_value("smart_homeend", homeend_smart);
+        entry.set_value("tab-width", tab_width);
+        entry.set_value("tab-insert_spaces", tab_spaces);
+        entry.set_value("auto-indentation", indentation_auto);
+        entry.set_value("smart-homeend", homeend_smart);
 }
 
 Gobby::Preferences::View::View(Config::ParentEntry& entry):
-        wrap_mode(
-                static_cast<Gtk::WrapMode>(
-                        entry.get_value<int>(
-                                "wrap_mode",
-                                static_cast<int>(Gtk::WRAP_WORD_CHAR)
-                        )
-                )
-        ),
-        linenum_display(entry.get_value<bool>("display_line_numbers", true)),
-        curline_highlight(
-                entry.get_value<bool>("highlight_current_line", true)
-        ),
-        margin_display(entry.get_value<bool>("margin_display", true) ),
-        margin_pos(entry.get_value<unsigned int>("margin_position", 80) ),
-        bracket_highlight(
-                entry.get_value<bool>("highlight_matching_brackets", true)
-        )
+        wrap_mode(static_cast<Gtk::WrapMode>(entry.get_value<int>(
+                "wrap-mode", static_cast<int>(Gtk::WRAP_WORD_CHAR)))),
+        linenum_display(entry.get_value<bool>("display-line-numbers", true)),
+        curline_highlight(entry.get_value<bool>(
+                "highlight-current-line", true)),
+        margin_display(entry.get_value<bool>("margin-display", true) ),
+        margin_pos(entry.get_value<unsigned int>("margin-position", 80) ),
+        bracket_highlight(entry.get_value<bool>(
+                "highlight-matching-brackets", true))
 {
 }
 
-void Gobby::Preferences::View::serialise(Config::ParentEntry& entry) const
+void Gobby::Preferences::View::serialize(Config::ParentEntry& entry) const
 {
-        entry.set_value("wrap_mode", static_cast<int>(wrap_mode));
-        entry.set_value("display_line_numbers", linenum_display);
-        entry.set_value("highlight_current_line", curline_highlight);
-        entry.set_value("margin_display", margin_display);
-        entry.set_value("margin_position", margin_pos);
-        entry.set_value("highlight_matching_brackets", bracket_highlight);
+        entry.set_value("wrap-mode", static_cast<int>(wrap_mode));
+        entry.set_value("display-line-numbers", linenum_display);
+        entry.set_value("highlight-current-line", curline_highlight);
+        entry.set_value("margin-display", margin_display);
+        entry.set_value("margin-position", margin_pos);
+        entry.set_value("highlight-matching-brackets", bracket_highlight);
 }
 
 Gobby::Preferences::Appearance::Appearance(Config::ParentEntry& entry):
-        toolbar_style(
-                static_cast<Gtk::ToolbarStyle>(
-                        entry.get_value<int>(
-                                "toolbar_style",
-                                // TODO: Get default value from gconf
-                                static_cast<int>(Gtk::TOOLBAR_BOTH)
-                        )
-                )
-        ),
+        toolbar_style(static_cast<Gtk::ToolbarStyle>(entry.get_value<int>(
+                "toolbar-style", static_cast<int>(Gtk::TOOLBAR_BOTH)))),
         font(Pango::FontDescription(entry.get_value<Glib::ustring>(
                 "font", "Monospace 10"))),
-        userlist_width(entry.get_value<unsigned int>("userlist_width", 150)),
-        show_toolbar(entry.get_value<bool>("show_toolbar", true)),
-        show_statusbar(entry.get_value<bool>("show_statusbar", true)),
-        show_browser(entry.get_value<bool>("show_browser", true)),
-        show_userlist(entry.get_value<bool>("show_userlist", true))
+        userlist_width(entry.get_value<unsigned int>("userlist-width", 150)),
+        show_toolbar(entry.get_value<bool>("show-toolbar", true)),
+        show_statusbar(entry.get_value<bool>("show-statusbar", true)),
+        show_browser(entry.get_value<bool>("show-browser", true)),
+        show_userlist(entry.get_value<bool>("show-userlist", true))
 {
 }
 
 void Gobby::Preferences::Appearance::
-        serialise(Config::ParentEntry& entry) const
+        serialize(Config::ParentEntry& entry) const
 {
-        entry.set_value("toolbar_style", static_cast<int>(toolbar_style) );
+        entry.set_value("toolbar-style", static_cast<int>(toolbar_style) );
 
         entry.set_value(
                 "font",
-                static_cast<const Pango::FontDescription&>(font).to_string()
-        );
+                static_cast<const Pango::FontDescription&>(font).to_string());
 
-        entry.set_value("userlist_width", userlist_width);
+        entry.set_value("userlist-width", userlist_width);
 
-        entry.set_value("show_toolbar", show_toolbar);
-        entry.set_value("show_statusbar", show_statusbar);
-        entry.set_value("show_browser", show_browser);
-        entry.set_value("show_userlist", show_userlist);
+        entry.set_value("show-toolbar", show_toolbar);
+        entry.set_value("show-statusbar", show_statusbar);
+        entry.set_value("show-browser", show_browser);
+        entry.set_value("show-userlist", show_userlist);
+}
+
+Gobby::Preferences::Security::Security(Config::ParentEntry& entry):
+        trust_file(entry.get_value<std::string>("trust-file", "")),
+        policy(static_cast<InfXmppConnectionSecurityPolicy>(
+                entry.get_value<int>("policy", static_cast<int>(
+                        INF_XMPP_CONNECTION_SECURITY_BOTH_PREFER_TLS))))
+{
+}
+
+void Gobby::Preferences::Security::serialize(Config::ParentEntry& entry) const
+{
+        entry.set_value("trust-file", trust_file);
+        entry.set_value("policy", static_cast<int>(policy));
 }
 
@@ -123 +122 @@
         editor(config.get_root()["editor"]),
         view(config.get_root()["view"]),
-        appearance(config.get_root()["appearance"])
+        appearance(config.get_root()["appearance"]),
+        security(config.get_root()["security"])
 {
 }
 
-void Gobby::Preferences::serialise(Config& config) const
+void Gobby::Preferences::serialize(Config& config) const
 {
         // Serialise into config
-        user.serialise(config.get_root()["user"]);
-        editor.serialise(config.get_root()["editor"]);
-        view.serialise(config.get_root()["view"]);
-        appearance.serialise(config.get_root()["appearance"]);
+        user.serialize(config.get_root()["user"]);
+        editor.serialize(config.get_root()["editor"]);
+        view.serialize(config.get_root()["view"]);
+        appearance.serialize(config.get_root()["appearance"]);
+        security.serialize(config.get_root()["security"]);
 }
 

src/dialogs/preferencesdialog.cpp

@@ -325 +325 @@
         m_group_tab(_("Tab Stops") ),
         m_group_indentation(_("Indentation") ),
-        m_group_homeend(_("Home/End behaviour") ),
+        m_group_homeend(_("Home/End Behaviour") ),
         m_lbl_tab_width(_("Tab width:"), Gtk::ALIGN_RIGHT),
         m_btn_tab_spaces(_("Insert spaces instead of tabs") ),
@@ -381 +381 @@
 
 Gobby::PreferencesDialog::View::View(Preferences& preferences):
-        m_group_wrap(_("Text wrapping") ),
-        m_group_linenum(_("Line numbers") ),
-        m_group_curline(_("Current line") ),
-        m_group_margin(_("Right margin") ),
-        m_group_bracket(_("Bracket matching") ),
+        m_group_wrap(_("Text Wrapping") ),
+        m_group_linenum(_("Line Numbers") ),
+        m_group_curline(_("Current Line") ),
+        m_group_margin(_("Right Margin") ),
+        m_group_bracket(_("Bracket Matching") ),
         m_btn_wrap_text(_("Enable text wrapping") ),
         m_btn_wrap_words(_("Do not split words over two lines") ),

src/main.cpp

@@ -86 +86 @@
 
         // Read the configuration
-        Gobby::Config config(Glib::get_home_dir() + "/.gobby/config.xml");
+        Gobby::Config config(Glib::build_filename(
+                Glib::get_home_dir(),
+                GOBBY_CONFIGDIR"/config.xml"));
 
         // Create window

src/window.cpp

@@ -88 +88 @@
 {
         // Serialise preferences into config
-        m_preferences.serialise(m_config);
+        m_preferences.serialize(m_config);
 }