ekiga r7600 - in trunk/lib/engine: account components/opal

[jpuydt svn gnome org]

Author: jpuydt
Date: Fri Jan 23 20:40:55 2009
New Revision: 7600
URL: http://svn.gnome.org/viewvc/ekiga?rev=7600&view=rev

Log:
Get the message waiting events out of the core classes

Modified:
   trunk/lib/engine/account/account-core.cpp
   trunk/lib/engine/account/bank-impl.h
   trunk/lib/engine/account/bank.h
   trunk/lib/engine/components/opal/opal-bank.cpp
   trunk/lib/engine/components/opal/opal-bank.h

Modified: trunk/lib/engine/account/account-core.cpp
==============================================================================
--- trunk/lib/engine/account/account-core.cpp	(original)
+++ trunk/lib/engine/account/account-core.cpp	Fri Jan 23 20:40:55 2009
@@ -90,7 +90,6 @@
 
   bank.questions.add_handler (questions.make_slot ());
   bank.registration_event.connect (sigc::mem_fun (this, &Ekiga::AccountCore::on_registration_event));
-  bank.mwi_event.connect (sigc::mem_fun (this, &Ekiga::AccountCore::on_mwi_event));
 }
 
 

Modified: trunk/lib/engine/account/bank-impl.h
==============================================================================
--- trunk/lib/engine/account/bank-impl.h	(original)
+++ trunk/lib/engine/account/bank-impl.h	Fri Jan 23 20:40:55 2009
@@ -156,7 +156,6 @@
 
   private:
     void on_registration_event (Ekiga::AccountCore::RegistrationState, std::string info, Ekiga::Account *account);
-    void on_mwi_event (std::string info, Ekiga::Account *account);
   };
 
 /**
@@ -292,7 +291,6 @@
   account.questions.add_handler (questions.make_slot ());
   account.trigger_saving.connect (sigc::mem_fun (this, &Ekiga::BankImpl<T>::save));
   account.registration_event.connect (sigc::bind (sigc::mem_fun (this, &Ekiga::BankImpl<T>::on_registration_event), &account));
-  account.mwi_event.connect (sigc::bind (sigc::mem_fun (this, &Ekiga::BankImpl<T>::on_mwi_event), &account));
 }
 
 
@@ -311,11 +309,4 @@
   registration_event.emit (account, state, info);
 }
 
-
-template<typename T>
-void
-Ekiga::BankImpl<T>::on_mwi_event (std::string info, Ekiga::Account *account)
-{
-  mwi_event.emit (account, info);
-}
 #endif

Modified: trunk/lib/engine/account/bank.h
==============================================================================
--- trunk/lib/engine/account/bank.h	(original)
+++ trunk/lib/engine/account/bank.h	Fri Jan 23 20:40:55 2009
@@ -100,12 +100,6 @@
      */
     sigc::signal3<void, const Ekiga::Account *, Ekiga::AccountCore::RegistrationState, std::string> registration_event;
 
-    /** This signal is emitted when there is a new message waiting event
-     * @param: account is the account 
-     *         info contains information about the indication 
-     */
-    sigc::signal2<void, const Ekiga::Account *, std::string> mwi_event;
-
     /** This chain allows the BankImpl to present forms to the user
      */
     ChainOfResponsibility<FormRequest*> questions;

Modified: trunk/lib/engine/components/opal/opal-bank.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-bank.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-bank.cpp	Fri Jan 23 20:40:55 2009
@@ -194,6 +194,7 @@
 {
   Opal::Account *account = new Opal::Account (core, t, name, host, user, auth_user, password, enabled, timeout);
   add_account (*account);
+  account->mwi_event.connect (sigc::bind<0> (mwi_event.make_slot (), account));
 }
 
 void

Modified: trunk/lib/engine/components/opal/opal-bank.h
==============================================================================
--- trunk/lib/engine/components/opal/opal-bank.h	(original)
+++ trunk/lib/engine/components/opal/opal-bank.h	Fri Jan 23 20:40:55 2009
@@ -72,6 +72,12 @@
 
     void stun_ready ();
 
+    /** This signal is emitted when there is a new message waiting event
+     * @param: account is the account 
+     *         info contains information about the indication 
+     */
+    sigc::signal2<void, const Ekiga::Account *, std::string> mwi_event;
+
 private:
     void on_new_account_form_submitted (bool submitted,
 					Ekiga::Form& form,