Changeset e861d030b244626b06e7d2409ebfb124b466dc59

Timestamp:

10/25/09 16:37:26 (4 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

e275a84b1e164b543ad6bc2d139b84410e06693b

Children:

d52d8ae14ac8ae79ae2d4c0a1f4c3fbe7a3f441c

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-10-25T16:37:26Z+0100

Message:

Store path and hostname in DocWindow?

Location:

code

Files:

• commands/browser-commands.cpp (modified) (1 diff)
• core/docwindow.cpp (modified) (1 diff)
• core/docwindow.hpp (modified) (3 diffs)
• core/folder.cpp (modified) (1 diff)
• core/folder.hpp (modified) (1 diff)

code/commands/browser-commands.cpp

@@ -290 +290 @@
 {
         InfSession* session = infc_session_proxy_get_session(proxy);
+        gchar* path = infc_browser_iter_get_path(browser, iter);
+
+        InfGtkBrowserStore* store = m_browser.get_store();
+        GtkTreeIter tree_iter;
+        InfcBrowserIter root_iter;
+
+        infc_browser_iter_get_root(browser, &root_iter);
+        inf_gtk_browser_model_browser_iter_to_tree_iter(
+                INF_GTK_BROWSER_MODEL(store), browser,
+                &root_iter, &tree_iter);
+
+        gchar* hostname;
+        gtk_tree_model_get(
+                GTK_TREE_MODEL(store), &tree_iter,
+                INF_GTK_BROWSER_MODEL_COL_NAME, &hostname, -1);
 
         DocWindow& window = m_folder.add_document(
                 INF_TEXT_SESSION(session),
                 infc_browser_iter_get_name(browser, iter),
+                path, hostname,
                 m_info_storage.get_key(browser, iter));
+
+        g_free(hostname);
+        g_free(path);
 
         // For now we always highlight the newly created session...

code/core/docwindow.cpp

@@ -127 +127 @@
 Gobby::DocWindow::DocWindow(InfTextSession* session,
                             const Glib::ustring& title,
+                            const Glib::ustring& path,
+                            const Glib::ustring& hostname,
                             const std::string& info_storage_key,
                             Preferences& preferences,
                             GtkSourceLanguageManager* manager):
-        m_session(session), m_title(title),
-        m_info_storage_key(info_storage_key), m_preferences(preferences),
+        m_session(session), m_title(title), m_path(path),
+        m_hostname(hostname), m_info_storage_key(info_storage_key),
+        m_preferences(preferences),
         m_view(GTK_SOURCE_VIEW(gtk_source_view_new())),
         m_userlist(session), m_info_box(false, 0),

code/core/docwindow.hpp

@@ -47 +47 @@
 
         DocWindow(InfTextSession* session, const Glib::ustring& title,
+                  const Glib::ustring& path, const Glib::ustring& hostname,
                   const std::string& info_storage_key,
                   Preferences& preferences,
@@ -55 +56 @@
         InfTextSession* get_session() { return m_session; }
         const Glib::ustring& get_title() const { return m_title; }
+        const Glib::ustring& get_path() const { return m_path; }
+        const Glib::ustring& get_hostname() const { return m_hostname; }
         const std::string& get_info_storage_key() const
         {
@@ -124 +127 @@
         InfTextSession* m_session;
         Glib::ustring m_title;
+        Glib::ustring m_path;
+        Glib::ustring m_hostname;
         std::string m_info_storage_key;
         Preferences& m_preferences;

code/core/folder.cpp

@@ -118 +118 @@
 Gobby::Folder::add_document(InfTextSession* session,
                             const Glib::ustring& title,
+                            const Glib::ustring& path,
+                            const Glib::ustring& hostname,
                             const std::string& info_storage_key)
 {
         Gobby::DocWindow* window = Gtk::manage(
-                new DocWindow(session, title, info_storage_key,
-                              m_preferences, m_lang_manager));
+                new DocWindow(session, title, path, hostname,
+                              info_storage_key, m_preferences,
+                              m_lang_manager));
         window->show();
         m_signal_document_added.emit(*window);

code/core/folder.hpp

@@ -49 +49 @@
         DocWindow& add_document(InfTextSession* session,
                                 const Glib::ustring& title,
+                                const Glib::ustring& path,
+                                const Glib::ustring& hostname,
                                 const std::string& info_storage_key);
         void remove_document(DocWindow& document);