Changeset 3d3692a5077fa50f51604e7957b820667351de92

Timestamp:

01/06/07 23:44:02 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

c22e31bfd4133f8ff54382f2144309a4df2cf1a8

Children:

e1a4ceb7c162cd72af08edb9038ece416f06f399

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:44:02Z+0000

Message:

[project @ Improved the Zeroconf handling]

Original author: Philipp Kern <phil@…>
Date: 2005-07-24 22:35:50+00:00

Files:

• inc/joindialog.hpp (modified) (2 diffs)
• inc/window.hpp (modified) (2 diffs)
• src/joindialog.cpp (modified) (4 diffs)
• src/window.cpp (modified) (6 diffs)

inc/joindialog.hpp

@@ -57 +57 @@
 #endif
 
+#ifndef WITH_HOWL
+        JoinDialog(Gtk::Window& parent, Gobby::Config& config);
+#else
         JoinDialog(Gtk::Window& parent, Gobby::Config& config,
-                   void* zeroconf = NULL);
+                   obby::zeroconf* zeroconf);
+#endif
         virtual ~JoinDialog();
 
@@ -97 +101 @@
         Glib::RefPtr<Gtk::ListStore> m_session_list;
         Columns m_session_cols;
-        obby::zeroconf& m_zeroconf;
+        obby::zeroconf* m_zeroconf;
         sigc::connection m_timer_connection;
 #endif

inc/window.hpp

@@ -109 +109 @@
         void save_local_file(Document& doc, const Glib::ustring& file);
         void close_document(DocWindow& doc);
-        void display_error(const Glib::ustring& message);
+        void display_error(const Glib::ustring& message,
+                           const Gtk::MessageType type = Gtk::MESSAGE_ERROR);
 
         // Config
@@ -139 +140 @@
         std::auto_ptr<obby::local_buffer> m_buffer;
 #ifdef WITH_HOWL
-        obby::zeroconf m_zeroconf;
+        std::auto_ptr<obby::zeroconf> m_zeroconf;
 #endif
         sigc::connection m_timer_conn;

src/joindialog.cpp

@@ -31 +31 @@
 #endif
 
+#ifndef WITH_HOWL
+Gobby::JoinDialog::JoinDialog(Gtk::Window& parent, Gobby::Config& config)
+#else
 Gobby::JoinDialog::JoinDialog(Gtk::Window& parent, Gobby::Config& config,
-                              void* zeroconf)
+                              obby::zeroconf* zeroconf)
+#endif
  : DefaultDialog(_("Join obby session"), parent, true, true),
    m_config(config),
@@ -41 +45 @@
    m_lbl_color(_("Colour:"), Gtk::ALIGN_RIGHT)
 #ifdef WITH_HOWL
-   , m_ep_discover(_("Local network")),
-     m_zeroconf(*static_cast<obby::zeroconf*>(zeroconf))
+   , m_ep_discover(_("Local network")), m_zeroconf(zeroconf)
 #endif
 {
@@ -90 +93 @@
 
 #ifdef WITH_HOWL
-        m_session_list = Gtk::ListStore::create(m_session_cols);
-        m_session_view.set_model(m_session_list);
-        m_session_view.append_column(_("User"), m_session_cols.name);
-        m_session_view.append_column(_("Host"), m_session_cols.host);
-        m_session_view.append_column(_("Port"), m_session_cols.port);
-        m_session_view.get_selection()->set_mode(
-                Gtk::SELECTION_SINGLE);
-        m_session_view.get_selection()->signal_changed().connect(
-                sigc::mem_fun(*this, &JoinDialog::on_change) );
-        m_ep_discover.add(m_session_view);
-
-        m_zeroconf.discover_event().connect(sigc::mem_fun(*this,
-                                            &JoinDialog::on_discover) );
-        m_zeroconf.leave_event().connect(sigc::mem_fun(*this,
-                                         &JoinDialog::on_leave) );
-        m_zeroconf.discover();
-        m_timer_connection = Glib::signal_timeout().connect(
-                sigc::mem_fun(*this, &JoinDialog::on_timer), 400);
-
-        m_vbox.set_spacing(5);
-        m_vbox.pack_start(m_table);
-        m_vbox.pack_start(m_ep_discover);
-        get_vbox()->pack_start(m_vbox);
+        if(m_zeroconf)
+        {
+                m_session_list = Gtk::ListStore::create(m_session_cols);
+                m_session_view.set_model(m_session_list);
+                m_session_view.append_column(_("User"), m_session_cols.name);
+                m_session_view.append_column(_("Host"), m_session_cols.host);
+                m_session_view.append_column(_("Port"), m_session_cols.port);
+                m_session_view.get_selection()->set_mode(
+                        Gtk::SELECTION_SINGLE);
+                m_session_view.get_selection()->signal_changed().connect(
+                        sigc::mem_fun(*this, &JoinDialog::on_change) );
+                m_ep_discover.add(m_session_view);
+
+                m_zeroconf->discover_event().connect(
+                        sigc::mem_fun(*this, &JoinDialog::on_discover));
+                m_zeroconf->leave_event().connect(
+                        sigc::mem_fun(*this, &JoinDialog::on_leave) );
+                m_zeroconf->discover();
+                m_timer_connection = Glib::signal_timeout().connect(
+                        sigc::mem_fun(*this, &JoinDialog::on_timer), 400);
+
+                m_vbox.set_spacing(5);
+                m_vbox.pack_start(m_table);
+                m_vbox.pack_start(m_ep_discover);
+                get_vbox()->pack_start(m_vbox);
+        }
+        else
+        {
+                // Howl is deactivated
+                get_vbox()->set_spacing(5);
+                get_vbox()->pack_start(m_table);
+        }
 #else
         get_vbox()->set_spacing(5);
@@ -200 +212 @@
 bool Gobby::JoinDialog::on_timer()
 {
-        m_zeroconf.select(0);
+        m_zeroconf->select(0);
         return true;
 }

src/window.cpp

@@ -50 +50 @@
    m_preferences(m_config), m_buffer(NULL),
 #ifdef WITH_HOWL
-   m_zeroconf(),
+   m_zeroconf(NULL),
 #endif
    m_folder(m_preferences), m_header(m_folder), m_statusbar(m_folder)
@@ -129 +129 @@
         set_title("Gobby");
         set_default_size(640, 480);
+
+#ifdef WITH_HOWL
+        // Initialise Zeroconf
+        try
+        {
+                m_zeroconf.reset(new obby::zeroconf);
+        }
+        catch(std::runtime_error&)
+        {
+                display_error(_("Howl initialisation failed. Probably you need "
+                        "to run mDNSResponder as root prior to Gobby. "
+                        "Zeroconf support is deactivated for this session."),
+                        Gtk::MESSAGE_WARNING);
+                m_zeroconf.reset();
+        }
+#endif
 }
 
@@ -223 +239 @@
         m_statusbar.obby_end();
 
-        // Delete buffer and zeroconf
+        // Delete buffer
         m_buffer.reset();
+
 #ifdef WITH_HOWL
-        m_zeroconf.unpublish_all();
+        m_zeroconf->unpublish_all();
 #endif
 }
@@ -257 +274 @@
                         buffer->set_global_password(password);
 #ifdef WITH_HOWL
-                        // Publish the newly created session via ZeroConf
-                        m_zeroconf.publish(name, port);
+                        // Publish the newly created session via Zeroconf
+                        // if Howl is not deactivated
+                        if(m_zeroconf.get() )
+                                m_zeroconf->publish(name, port);
 #endif
 
@@ -273 +292 @@
         JoinDialog dlg(*this, m_config);
 #else
-        JoinDialog dlg(*this, m_config, &m_zeroconf);
+        JoinDialog dlg(*this, m_config, m_zeroconf.get() );
 #endif
 
@@ -850 +869 @@
 }
 
-void Gobby::Window::display_error(const Glib::ustring& message)
-{
-        Gtk::MessageDialog dlg(*this, message, false, Gtk::MESSAGE_ERROR,
+void Gobby::Window::display_error(const Glib::ustring& message,
+                                  const Gtk::MessageType type)
+{
+        Gtk::MessageDialog dlg(*this, message, false, type,
                                Gtk::BUTTONS_OK, true);
         dlg.run();