Changeset 1d335d377d393ba74eac67877822b19cfaeb31fa for src/window.cpp

Timestamp:

01/06/07 23:43:18 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

42eed7fcd5c2709d714983be46e3a133cc732b73

Children:

63303a926cadfea5c64181f2b1c8031c7044a23b

git-committer:

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

Message:

[project @ Adjusted the Zeroconf usage]

Original author: Philipp Kern <phil@…>
Date: 2005-07-23 22:40:29+00:00

Files:

• src/window.cpp (modified) (4 diffs)

src/window.cpp

@@ -49 +49 @@
    m_preferences(m_config), m_buffer(NULL),
 #ifdef WITH_HOWL
-   m_zeroconf(NULL),
+   m_zeroconf(),
 #endif
    m_folder(m_preferences), m_header(m_folder), m_statusbar(m_folder)
@@ -220 +220 @@
         m_buffer.reset();
 #ifdef WITH_HOWL
-        delete m_zeroconf;
-        m_zeroconf = NULL;
+        m_zeroconf.unpublish_all();
 #endif
 }
@@ -253 +252 @@
 #ifdef WITH_HOWL
                         // Publish the newly created session via ZeroConf
-                        m_zeroconf = new obby::zeroconf();
-                        m_zeroconf->publish(name, port);
+                        m_zeroconf.publish(name, port);
 #endif
 
@@ -266 +264 @@
 void Gobby::Window::on_session_join()
 {
+#ifndef WITH_HOWL
         JoinDialog dlg(*this, m_config);
+#else
+        JoinDialog dlg(*this, m_config, &m_zeroconf);
+#endif
+
         if(dlg.run() == Gtk::RESPONSE_OK)
         {