Se arregla el cliente para que compile de nuevo (NOT TESTED!)

diff --git a/Client/include/principal.h b/Client/include/principal.h
index f166cf3f5e797a548f28b5880c2c4a9d7cb0f664..55555242cab05a963dbd06570d0015be7b8d5957 100644 (file)
--- a/Client/include/principal.h
+++ b/Client/include/principal.h
@@ -73,7 +73,6 @@ protected:
        virtual bool on_item_clicked(GdkEventButton *, ViewItem *);
        
        // Callbacks para las conexiones
-       void on_conexion_connected();
        void on_conexion_finished();
        void on_conexion_ok(const std::string &body);
        void on_conexion_error(unsigned code);

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 0ec83bb536464771c4b1b4b3f4fb42fd20d9d1b9..3b3cab1dc41a2aabca45b6f8421f8d5838e1896c 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -89,13 +89,17 @@ void Principal::on_dlg_connect_ok()
                // Conecto las señales
                conexion->signal_ok_received().connect( SigC::slot(*this, &Principal::on_conexion_ok) );
                conexion->signal_error_received().connect( SigC::slot(*this, &Principal::on_conexion_error) );
-               conexion->signal_connected().connect( SigC::slot(*this, &Principal::on_conexion_connected) );
                conexion->signal_finished().connect( SigC::slot(*this, &Principal::on_conexion_finished) );
                conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));
                // Lanzo la conexion!
                conexion->run();
-       } else {
-               txt_view->get_buffer()->insert_at_cursor("YA ESTAS CONECTADO\n");
+               txt_view->get_buffer()->insert_at_cursor("CONNECTED\n");
+               ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
+
+               // Pido la planta por defecto
+               PlaQui::Server::Command c("plant", "get");
+               c.add_arg("default");
+               conexion->send(c);
        }
        dlg_conectar->hide();
 }
@@ -202,19 +206,6 @@ void Principal::update_items_prop()
 
 }
 
-void Principal::on_conexion_connected()
-{
-       txt_view->get_buffer()->insert_at_cursor("CONNECTED\n");
-       ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
-
-       // Pido la planta por defecto
-       if (conexion != NULL) {
-               PlaQui::Server::Command c("plant", "get");
-               c.add_arg("default");
-               conexion->send(c);
-       }
-}
-
 void Principal::on_conexion_frame(const std::string &frame)
 {
        if (conexion != NULL) {