Changeset 4d4c20e5237e5e5c8b93d8e01d2b1e2d769c2dbb

Timestamp:

01/06/07 23:41:13 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

3515287dcd5e186be189d26efb988e2f38d4df28

Children:

e37f9cc2be176746e30e6ec2b2c377d0173e6b89

git-committer:

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

Message:

[project @ Connect synchoniously to the server, would cause too much trouble otherwise]

Original author: Armin Burgmeier <armin@…>
Date: 2005-07-20 19:04:42+00:00

Files:

• inc/buffer_wrapper.hpp (modified) (1 diff)
• inc/joinprogressdialog.hpp (modified) (1 diff)
• src/buffer_wrapper.cpp (modified) (1 diff)
• src/joinprogressdialog.cpp (modified) (2 diffs)

inc/buffer_wrapper.hpp

@@ -265 +265 @@
 
 protected:
-        ClientBuffer();
 };
 

inc/joinprogressdialog.hpp

@@ -67 +67 @@
         Gdk::Color m_color;
 
-        Glib::ustring m_error;
-
         std::auto_ptr<obby::client_buffer> m_buffer;
 };

src/buffer_wrapper.cpp

@@ -197 +197 @@
 }
 
-Gobby::ClientBuffer::ClientBuffer()
-{
-}
-
 Gobby::ClientBuffer::ClientBuffer(Gtk::Window& window,
                                   const Glib::ustring& hostname,

src/joinprogressdialog.cpp

@@ -49 +49 @@
 void Gobby::JoinProgressDialog::on_thread()
 {
-        // Get color components
-        unsigned int red = m_color.get_red() * 255 / 65535;
-        unsigned int green = m_color.get_green() * 255 / 65535;
-        unsigned int blue = m_color.get_blue() * 255 / 65535;
+}
+
+void Gobby::JoinProgressDialog::on_done()
+{
+        // Call base function joining the thread
+        ProgressDialog::on_done();
 
         try
@@ -67 +69 @@
         catch(net6::error& e)
         {
-                // Store error, if one occured
-                m_error = e.what();
-        }
-}
-
-void Gobby::JoinProgressDialog::on_done()
-{
-        // Call base function joining the thread
-        ProgressDialog::on_done();
-
-        // Error?
-        if(!m_error.empty() )
-        {
-                // Show it up
-                display_error(m_error);
-                // Close dialog
+                // Display error
+                display_error(e.what() );
+                // Return
                 response(Gtk::RESPONSE_CANCEL);
-                // Ignore rest of function
                 return;
         }