GNOME.org
 

ekiga r6299 - in trunk: . lib/engine lib/engine/chat/skel lib/engine/gui/gtk-frontend lib/engine/protocol/skel src

Author: dsandras
Date: Wed May 21 20:48:28 2008
New Revision: 6299
URL: http://svn.gnome.org/viewvc/ekiga?rev=6299&view=rev

Log:
Removed Chat stuff from the CallCore/CallProtocolManager and use the
newly created ChatCore instead. 


Modified:
   trunk/ChangeLog
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/chat/skel/chat-core.cpp
   trunk/lib/engine/chat/skel/chat-core.h
   trunk/lib/engine/chat/skel/chat-manager.h
   trunk/lib/engine/engine.cpp
   trunk/lib/engine/gui/gtk-frontend/Makefile.am
   trunk/lib/engine/gui/gtk-frontend/chat-window-page.cpp
   trunk/lib/engine/gui/gtk-frontend/chat-window.cpp
   trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
   trunk/lib/engine/gui/gtk-frontend/gtk-frontend.h
   trunk/lib/engine/protocol/skel/call-core.cpp
   trunk/lib/engine/protocol/skel/call-core.h
   trunk/lib/engine/protocol/skel/call-protocol-manager.h
   trunk/src/Makefile.am

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Wed May 21 20:48:28 2008
@@ -1,4 +1,4 @@
-SUBDIRS = framework addressbook presence gui protocol videooutput videoinput audioinput audiooutput hal components chat
+SUBDIRS = framework addressbook presence chat gui protocol videooutput videoinput audioinput audiooutput hal components
 
 noinst_LTLIBRARIES = libekiga_engine.la
 
@@ -8,6 +8,7 @@
 	-I$(top_srcdir)/lib/engine/gui/gtk-core				\
 	-I$(top_srcdir)/lib/engine/gui/gtk-frontend			\
 	-I$(top_srcdir)/lib/engine/framework/		 		\
+	-I$(top_srcdir)/lib/engine/chat/skel				\
 	-I$(top_srcdir)/lib/engine/protocol/skel			\
 	-I$(top_srcdir)/lib/engine/addressbook/skel			\
 	-I$(top_srcdir)/lib/engine/addressbook/call-history		\

Modified: trunk/lib/engine/chat/skel/chat-core.cpp
==============================================================================
--- trunk/lib/engine/chat/skel/chat-core.cpp	(original)
+++ trunk/lib/engine/chat/skel/chat-core.cpp	Wed May 21 20:48:28 2008
@@ -34,6 +34,8 @@
  *
  */
 
+#include <iostream>
+
 #include "config.h"
 
 #include "chat-core.h"
@@ -94,25 +96,25 @@
 }
 
 
-void ChatCore::on_im_failed (const std::string & uri, const std::string & reason, ChatManager *manager)
+void ChatCore::on_im_failed (const std::string uri, const std::string reason, ChatManager *manager)
 {
   im_failed.emit (*manager, uri, reason);
 }
 
 
-void ChatCore::on_im_sent (const std::string & uri, const std::string & message, ChatManager *manager)
+void ChatCore::on_im_sent (const std::string uri, const std::string message, ChatManager *manager)
 {
   im_sent.emit (*manager, uri, message);
 }
 
 
-void ChatCore::on_im_received (const std::string & display_name, const std::string & uri, const std::string & message, ChatManager *manager)
+void ChatCore::on_im_received (const std::string display_name, const std::string uri, const std::string message, ChatManager *manager)
 {
   im_received.emit (*manager, display_name, uri, message);
 }
 
 
-void ChatCore::on_new_chat (const std::string & display_name, const std::string & uri, ChatManager *manager)
+void ChatCore::on_new_chat (const std::string display_name, const std::string uri, ChatManager *manager)
 {
   new_chat.emit (*manager, display_name, uri);
 }

Modified: trunk/lib/engine/chat/skel/chat-core.h
==============================================================================
--- trunk/lib/engine/chat/skel/chat-core.h	(original)
+++ trunk/lib/engine/chat/skel/chat-core.h	Wed May 21 20:48:28 2008
@@ -116,17 +116,17 @@
       bool send_message (const std::string & uri, 
                          const std::string & message);
 
-      sigc::signal<void, const ChatManager &, const std::string &, const std::string &> im_failed;
-      sigc::signal<void, const ChatManager &, const std::string &, const std::string &, const std::string &> im_received;
-      sigc::signal<void, const ChatManager &, const std::string &, const std::string &> im_sent;
-      sigc::signal<void, const ChatManager &, const std::string &, const std::string &> new_chat;
+      sigc::signal<void, const ChatManager &, const std::string, const std::string> im_failed;
+      sigc::signal<void, const ChatManager &, const std::string, const std::string, const std::string> im_received;
+      sigc::signal<void, const ChatManager &, const std::string, const std::string> im_sent;
+      sigc::signal<void, const ChatManager &, const std::string, const std::string> new_chat;
 
 
   private:
-      void on_im_failed (const std::string &, const std::string &, ChatManager *manager);
-      void on_im_sent (const std::string &, const std::string &, ChatManager *manager);
-      void on_im_received (const std::string &, const std::string &, const std::string &, ChatManager *manager);
-      void on_new_chat (const std::string &, const std::string &, ChatManager *manager);
+      void on_im_failed (const std::string, const std::string, ChatManager *manager);
+      void on_im_sent (const std::string, const std::string, ChatManager *manager);
+      void on_im_received (const std::string, const std::string, const std::string, ChatManager *manager);
+      void on_new_chat (const std::string, const std::string, ChatManager *manager);
 
       std::set<ChatManager *> managers;
     };

Modified: trunk/lib/engine/chat/skel/chat-manager.h
==============================================================================
--- trunk/lib/engine/chat/skel/chat-manager.h	(original)
+++ trunk/lib/engine/chat/skel/chat-manager.h	Wed May 21 20:48:28 2008
@@ -61,7 +61,7 @@
 
       /* The destructor
        */
-      virtual ~ChatManager () = 0;
+      ~ChatManager () {};
 
 
       /*                 
@@ -79,26 +79,26 @@
        * @param: uri    : where the message could not be sent
        *         error  : a string describing the error that occured
        */
-      sigc::signal<void, const std::string &, const std::string &> im_failed;
+      sigc::signal<void, const std::string, const std::string> im_failed;
 
       /** This signal is emitted when a message has been received
        * @param: display_name: the display name of the sender
        *         uri         : the uri of the sender
        *         message     : the message sent by the sender
        */
-      sigc::signal<void, const std::string &, const std::string &, const std::string &> im_received;
+      sigc::signal<void, const std::string, const std::string, const std::string> im_received;
 
       /** This signal is emitted when a message has been sent
        * @param: uri    : where the message has been sent
        *         message: the message that was sent
        */
-      sigc::signal<void, const std::string &, const std::string &> im_sent;
+      sigc::signal<void, const std::string, const std::string> im_sent;
 
       /** This signal is emitted when a chat conversation should be initiated
        * @param: uri            : the remote party
        *         display_name   : the display name
        */
-      sigc::signal<void, const std::string &, const std::string &> new_chat;
+      sigc::signal<void, const std::string, const std::string> new_chat;
     };
 
 /**

Modified: trunk/lib/engine/engine.cpp
==============================================================================
--- trunk/lib/engine/engine.cpp	(original)
+++ trunk/lib/engine/engine.cpp	Wed May 21 20:48:28 2008
@@ -44,6 +44,7 @@
 #include "presence-core.h"
 #include "contact-core.h"
 #include "call-core.h"
+#include "chat-core.h"
 #include "videooutput-core.h"
 #include "videoinput-core.h"
 #include "audioinput-core.h"
@@ -106,6 +107,7 @@
   Ekiga::PresenceCore *presence_core = new Ekiga::PresenceCore;
   Ekiga::ContactCore *contact_core = new Ekiga::ContactCore;
   Ekiga::CallCore *call_core = new Ekiga::CallCore;
+  Ekiga::ChatCore *chat_core = new Ekiga::ChatCore;
   Ekiga::VideoOutputCore *videooutput_core = new Ekiga::VideoOutputCore;
   Ekiga::VideoInputCore *videoinput_core = new Ekiga::VideoInputCore(*runtime, *videooutput_core);
   Ekiga::AudioOutputCore *audiooutput_core = new Ekiga::AudioOutputCore(*runtime);  
@@ -124,6 +126,7 @@
   core->add (*contact_core);
   core->add (*presence_core);
   core->add (*call_core);
+  core->add (*chat_core);
   core->add (*videooutput_core);
   core->add (*videoinput_core);
   core->add (*audiooutput_core);

Modified: trunk/lib/engine/gui/gtk-frontend/Makefile.am
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/Makefile.am	(original)
+++ trunk/lib/engine/gui/gtk-frontend/Makefile.am	Wed May 21 20:48:28 2008
@@ -5,34 +5,36 @@
 AM_CPPFLAGS = $(XML_CFLAGS) $(SIGC_CFLAGS) $(GTK_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gui \
-	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/presence/skel \
-	-I$(top_srcdir)/lib/engine/protocol/skel \
-	-I$(top_srcdir)/lib/engine/addressbook/skel \
-	-I$(top_srcdir)/lib/engine/addressbook/call-history \
+	-I$(top_srcdir)/lib/gui 				\
+	-I$(top_srcdir)/lib/gmconf 				\
+	-I$(top_srcdir)/lib/engine/framework 			\
+	-I$(top_srcdir)/lib/engine/chat/skel 			\
+	-I$(top_srcdir)/lib/engine/presence/skel 		\
+	-I$(top_srcdir)/lib/engine/protocol/skel 		\
+	-I$(top_srcdir)/lib/engine/addressbook/skel 		\
+	-I$(top_srcdir)/lib/engine/addressbook/call-history 	\
 	-I$(top_srcdir)/lib/engine/gui/gtk-core 
 
 libgmgtk_frontend_la_SOURCES = \
-	$(gtk_frontend_dir)/addressbook-window.h \
-	$(gtk_frontend_dir)/addressbook-window.cpp \
-	$(gtk_frontend_dir)/book-view-gtk.h \
-	$(gtk_frontend_dir)/book-view-gtk.cpp \
-	$(gtk_frontend_dir)/roster-view-gtk.h \
-	$(gtk_frontend_dir)/roster-view-gtk.cpp \
-	$(gtk_frontend_dir)/call-history-view-gtk.h \
-	$(gtk_frontend_dir)/call-history-view-gtk.cpp \
-	$(gtk_frontend_dir)/chat-window.h \
-	$(gtk_frontend_dir)/chat-window.cpp \
-	$(gtk_frontend_dir)/chat-window-page.h \
-	$(gtk_frontend_dir)/chat-window-page.cpp \
-	$(gtk_frontend_dir)/gtk-frontend.h \
+	$(gtk_frontend_dir)/addressbook-window.h 	\
+	$(gtk_frontend_dir)/addressbook-window.cpp 	\
+	$(gtk_frontend_dir)/book-view-gtk.h 		\
+	$(gtk_frontend_dir)/book-view-gtk.cpp 		\
+	$(gtk_frontend_dir)/roster-view-gtk.h 		\
+	$(gtk_frontend_dir)/roster-view-gtk.cpp 	\
+	$(gtk_frontend_dir)/call-history-view-gtk.h 	\
+	$(gtk_frontend_dir)/call-history-view-gtk.cpp 	\
+	$(gtk_frontend_dir)/chat-window.h 		\
+	$(gtk_frontend_dir)/chat-window.cpp 		\
+	$(gtk_frontend_dir)/chat-window-page.h 		\
+	$(gtk_frontend_dir)/chat-window-page.cpp 	\
+	$(gtk_frontend_dir)/gtk-frontend.h 		\
 	$(gtk_frontend_dir)/gtk-frontend.cpp
 
 libgmgtk_frontend_la_LIBADD = \
-	$(top_builddir)/lib/gui/libgmwidgets.la \
-	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la \
+	$(top_builddir)/lib/gui/libgmwidgets.la 			\
+	$(top_builddir)/lib/engine/chat/skel/libgmchat.la 		\
+	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la 	\
 	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la \
 	$(top_builddir)/lib/engine/gui/gtk-core/libgmgtk-core.la
 

Modified: trunk/lib/engine/gui/gtk-frontend/chat-window-page.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-window-page.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-window-page.cpp	Wed May 21 20:48:28 2008
@@ -43,7 +43,7 @@
 #include "gmtextviewaddon.h"
 #include "gmstockicons.h"
 
-#include "call-core.h"
+#include "chat-core.h"
 #include "presence-core.h"
 
 #include <gdk/gdkkeysyms.h>
@@ -395,10 +395,10 @@
 
   if (!message.empty ()) {
     
-    Ekiga::CallCore *call_core = dynamic_cast<Ekiga::CallCore *>(self->priv->core.get ("call-core"));
+    Ekiga::ChatCore *chat_core = dynamic_cast<Ekiga::ChatCore *>(self->priv->core.get ("chat-core"));
 
-    if (call_core) 
-      call_core->send_message (self->priv->uri, message);
+    if (chat_core) 
+      chat_core->send_message (self->priv->uri, message);
   }
 }
 

Modified: trunk/lib/engine/gui/gtk-frontend/chat-window.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-window.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-window.cpp	Wed May 21 20:48:28 2008
@@ -42,7 +42,7 @@
 #include "chat-window.h"
 #include "chat-window-page.h"
 
-#include "call-core.h"
+#include "chat-core.h"
 
 #include "gmconf.h"
 #include "gmtexttagaddon.h"
@@ -139,10 +139,10 @@
  *                displayed.
  * PRE          : The ChatWindow as last argument.
  */
-static void on_im_received_cb (Ekiga::CallManager & manager,
-                               std::string display_name,
-                               std::string from, 
-                               std::string message,
+static void on_im_received_cb (const Ekiga::ChatManager & manager,
+                               const std::string & display_name,
+                               const std::string & from, 
+                               const std::string & message,
                                gpointer data);
 
 
@@ -151,9 +151,9 @@
  *                ChatWindowPage.
  * PRE          : The ChatWindow as last argument.
  */
-static void on_im_sent_cb (Ekiga::CallManager & manager,
-                           std::string to,
-                           std::string message,
+static void on_im_sent_cb (const Ekiga::ChatManager & manager,
+                           const std::string & to,
+                           const std::string & message,
                            gpointer data);
 
 
@@ -162,9 +162,9 @@
  *                ChatWindowPage.
  * PRE          : The ChatWindow as last argument.
  */
-static void on_im_failed_cb (Ekiga::CallManager & manager,
-                             std::string to,
-                             std::string reason,
+static void on_im_failed_cb (const Ekiga::ChatManager & manager,
+                             const std::string & to,
+                             const std::string & reason,
                              gpointer data);
 
 
@@ -366,10 +366,10 @@
  */
 
 static void
-on_im_received_cb (Ekiga::CallManager & /*manager*/,
-                   std::string display_name,
-                   std::string from, 
-                   std::string message,
+on_im_received_cb (const Ekiga::ChatManager & /*manager*/,
+                   const std::string & display_name,
+                   const std::string & from, 
+                   const std::string & message,
                    gpointer data)
 {
   GtkWidget *page = chat_window_get_page (CHAT_WINDOW (data), from, display_name);
@@ -404,9 +404,9 @@
 
 
 static void
-on_im_sent_cb (Ekiga::CallManager & /*manager*/,
-               std::string to,
-               std::string message,
+on_im_sent_cb (const Ekiga::ChatManager & /*manager*/,
+               const std::string & to,
+               const std::string & message,
                gpointer data)
 {
   GtkWidget *page = chat_window_get_page (CHAT_WINDOW (data), to);
@@ -419,9 +419,9 @@
 
 
 static void
-on_im_failed_cb (Ekiga::CallManager & /*manager*/,
-                 std::string to,
-                 std::string reason,
+on_im_failed_cb (const Ekiga::ChatManager & /*manager*/,
+                 const std::string & to,
+                 const std::string & reason,
                  gpointer data)
 {
   GtkWidget *page = chat_window_get_page (CHAT_WINDOW (data), to);
@@ -546,7 +546,7 @@
 {
   ChatWindow *self = NULL;
 
-  Ekiga::CallCore *call_core = NULL;
+  Ekiga::ChatCore *chat_core = NULL;
 
   sigc::connection conn;
 
@@ -566,12 +566,12 @@
   gtk_container_add (GTK_CONTAINER (self), self->priv->notebook);
 
   /* Engine signals */
-  call_core = dynamic_cast<Ekiga::CallCore *> (core.get ("call-core"));
-  conn = call_core->im_received.connect (sigc::bind (sigc::ptr_fun (on_im_received_cb), self));
+  chat_core = dynamic_cast<Ekiga::ChatCore *> (core.get ("chat-core"));
+  conn = chat_core->im_received.connect (sigc::bind (sigc::ptr_fun (on_im_received_cb), self));
   self->priv->connections.push_back (conn);
-  conn = call_core->im_sent.connect (sigc::bind (sigc::ptr_fun (on_im_sent_cb), self));
+  conn = chat_core->im_sent.connect (sigc::bind (sigc::ptr_fun (on_im_sent_cb), self));
   self->priv->connections.push_back (conn);
-  conn = call_core->im_failed.connect (sigc::bind (sigc::ptr_fun (on_im_failed_cb), self));
+  conn = chat_core->im_failed.connect (sigc::bind (sigc::ptr_fun (on_im_failed_cb), self));
   self->priv->connections.push_back (conn);
 
   g_signal_connect (G_OBJECT (self), "hide",

Modified: trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp	Wed May 21 20:48:28 2008
@@ -44,7 +44,7 @@
 
 #include "gtk-frontend.h"
 
-#include "call-core.h"
+#include "chat-core.h"
 #include "contact-core.h"
 #include "presence-core.h"
 #include "addressbook-window.h"
@@ -63,13 +63,13 @@
 
   Ekiga::PresenceCore *presence_core = NULL;
   Ekiga::ContactCore *contact_core = NULL;
-  Ekiga::CallCore *call_core = NULL;
+  Ekiga::ChatCore *chat_core = NULL;
   History::Source *history_source = NULL;
   History::Book *history_book = NULL;
 
   contact_core = dynamic_cast<Ekiga::ContactCore *>(core.get ("contact-core"));
   presence_core = dynamic_cast<Ekiga::PresenceCore *>(core.get ("presence-core"));
-  call_core = dynamic_cast<Ekiga::CallCore *>(core.get ("call-core"));
+  chat_core = dynamic_cast<Ekiga::ChatCore *>(core.get ("chat-core"));
   history_source = dynamic_cast<History::Source*>(core.get ("call-history-store"));
   history_book = history_source->get_book ();
 
@@ -80,7 +80,7 @@
   chat_window = 
     chat_window_new_with_key (core, "/apps/ekiga/general/user_interface/chat_window");
 
-  conn = call_core->new_chat.connect (sigc::mem_fun (this, &GtkFrontend::on_new_chat));
+  conn = chat_core->new_chat.connect (sigc::mem_fun (this, &GtkFrontend::on_new_chat));
   connections.push_back (conn);
 }
 
@@ -131,9 +131,9 @@
 }
 
 
-void GtkFrontend::on_new_chat (Ekiga::CallManager & /*manager*/,
-                               std::string name,
-                               std::string uri)
+void GtkFrontend::on_new_chat (const Ekiga::ChatManager & /*manager*/,
+                               const std::string & name,
+                               const std::string & uri)
 {
   chat_window_add_page (CHAT_WINDOW (chat_window), name, uri);
   gtk_widget_show_all (GTK_WIDGET (chat_window));

Modified: trunk/lib/engine/gui/gtk-frontend/gtk-frontend.h
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/gtk-frontend.h	(original)
+++ trunk/lib/engine/gui/gtk-frontend/gtk-frontend.h	Wed May 21 20:48:28 2008
@@ -45,7 +45,7 @@
 #include "services.h"
 #include "contact-core.h"
 #include "presence-core.h"
-#include "call-manager.h"
+#include "chat-manager.h"
 
 
 class GtkFrontend: public Ekiga::Service
@@ -69,9 +69,9 @@
     const GtkWidget *get_chat_window () const;
 
 private :
-    void on_new_chat (Ekiga::CallManager & manager,
-                      std::string name,
-                      std::string uri);
+    void on_new_chat (const Ekiga::ChatManager & manager,
+                      const std::string & name,
+                      const std::string & uri);
 
     GtkWidget *addressbook_window;
     GtkWidget *roster_view;

Modified: trunk/lib/engine/protocol/skel/call-core.cpp
==============================================================================
--- trunk/lib/engine/protocol/skel/call-core.cpp	(original)
+++ trunk/lib/engine/protocol/skel/call-core.cpp	Wed May 21 20:48:28 2008
@@ -51,20 +51,6 @@
   managers.insert (&manager);
   manager_added.emit (manager);
 
-  // IM stuff
-  // It should finally get out of the CallCore
-  // Currently IM Managers are CallProtocolManagers
-  // Of course, not all CallProtocolManagers implement IM
-  for (CallManager::iterator iter = manager.begin ();
-       iter != manager.end ();
-       iter++) {
-
-    (*iter)->im_failed.connect (sigc::bind (sigc::mem_fun (this, &CallCore::on_im_failed), &manager));
-    (*iter)->im_received.connect (sigc::bind (sigc::mem_fun (this, &CallCore::on_im_received), &manager));
-    (*iter)->im_sent.connect (sigc::bind (sigc::mem_fun (this, &CallCore::on_im_sent), &manager));
-    (*iter)->new_chat.connect (sigc::bind (sigc::mem_fun (this, &CallCore::on_new_chat), &manager));
-  }
-
   manager.mwi_event.connect (sigc::bind (sigc::mem_fun (this, &CallCore::on_mwi_event), &manager));
   manager.registration_event.connect (sigc::bind (sigc::mem_fun (this, &CallCore::on_registration_event), &manager));
 }
@@ -107,25 +93,6 @@
 }
 
 
-bool CallCore::send_message (const std::string & uri, 
-                             const std::string & message)
-{
-  for (std::set<CallManager *>::iterator iter = managers.begin ();
-       iter != managers.end ();
-       iter++) {
-    for (CallManager::iterator miter = (*iter)->begin ();
-         miter != (*iter)->end ();
-         miter++) {
-
-      if ((*miter)->send_message (uri, message))
-        return true;
-    }
-  }
-
-  return false;
-}
-
-
 void CallCore::add_call (Call *call, CallManager *manager)
 {
   call->ringing.connect (sigc::bind (sigc::mem_fun (this, &CallCore::on_ringing_call), call, manager));
@@ -208,30 +175,6 @@
 }
 
 
-void CallCore::on_im_failed (std::string uri, std::string reason, CallManager *manager)
-{
-  im_failed.emit (*manager, uri, reason);
-}
-
-
-void CallCore::on_im_sent (std::string uri, std::string message, CallManager *manager)
-{
-  im_sent.emit (*manager, uri, message);
-}
-
-
-void CallCore::on_im_received (std::string display_name, std::string uri, std::string message, CallManager *manager)
-{
-  im_received.emit (*manager, display_name, uri, message);
-}
-
-
-void CallCore::on_new_chat (std::string display_name, std::string uri, CallManager *manager)
-{
-  new_chat.emit (*manager, display_name, uri);
-}
-
-
 void CallCore::on_mwi_event (std::string account, std::string info, CallManager *manager)
 {
   mwi_event.emit (*manager, account, info);

Modified: trunk/lib/engine/protocol/skel/call-core.h
==============================================================================
--- trunk/lib/engine/protocol/skel/call-core.h	(original)
+++ trunk/lib/engine/protocol/skel/call-core.h	Wed May 21 20:48:28 2008
@@ -142,28 +142,6 @@
       sigc::signal<void, CallManager &, Call &, std::string, Call::StreamType> stream_resumed;
 
 
-      /*** Instant Messaging ***/ 
-
-      /**
-       * NOTICE 
-       *
-       * At some point, Instant Messaging and its signals should be moved out of 
-       * the CallCore and put into a shiny new object. Probably the Presence 
-       * one. But that's a TODO for later. Later we could also introduce the notion
-       * of Conversation.
-       */
-
-      /** See call-protocol-manager.h for API 
-       */
-      bool send_message (const std::string & uri, 
-                         const std::string & message);
-
-      sigc::signal<void, CallManager &, std::string, std::string> im_failed;
-      sigc::signal<void, CallManager &, std::string, std::string, std::string> im_received;
-      sigc::signal<void, CallManager &, std::string, std::string> im_sent;
-      sigc::signal<void, CallManager &, std::string, std::string> new_chat;
-
-
       /*** Accounts ***/
       // TODO Should move too
       sigc::signal<void, CallManager &, std::string, std::string> mwi_event;

Modified: trunk/lib/engine/protocol/skel/call-protocol-manager.h
==============================================================================
--- trunk/lib/engine/protocol/skel/call-protocol-manager.h	(original)
+++ trunk/lib/engine/protocol/skel/call-protocol-manager.h	Wed May 21 20:48:28 2008
@@ -96,57 +96,7 @@
 
 
       /*
-       * INSTANT MESSAGING 
-       */
-
-      /**
-       * NOTICE 
-       *
-       * At some point, Instant Messaging and its signals should be moved out of 
-       * the CallCore and put into a shiny new object. Probably the Presence 
-       * one. But that's a TODO for later. Later we could also introduce the notion
-       * of Conversation.
-       *
-       * Notice the current definition forces each CallProtocolManager to implement
-       * a send_message method. That is wrong. Please use a dummy function if needed
-       * before we implement something specific.
-       */
-
-      /** Send a message to the given uri
-       * @param: uri    : where to send the message
-       *         message: what to send to the remote peer
-       */
-      virtual bool send_message (const std::string & uri, 
-                                 const std::string & message) = 0;
-
-      /** This signal is emitted when the transmission of a message failed
-       * @param: uri    : where the message could not be sent
-       *         error  : a string describing the error that occured
-       */
-      sigc::signal<void, std::string, std::string> im_failed;
-
-      /** This signal is emitted when a message has been received
-       * @param: display_name: the display name of the sender
-       *         uri         : the uri of the sender
-       *         message     : the message sent by the sender
-       */
-      sigc::signal<void, std::string, std::string, std::string> im_received;
-
-      /** This signal is emitted when a message has been sent
-       * @param: uri    : where the message has been sent
-       *         message: the message that was sent
-       */
-      sigc::signal<void, std::string, std::string> im_sent;
-
-      /** This signal is emitted when a chat conversation should be initiated
-       * @param: uri            : the remote party
-       *         display_name   : the display name
-       */
-      sigc::signal<void, std::string, std::string> new_chat;
-
-
-      /*
-       * Misc
+       * MISC
        */
 
       /** Return the listen interface

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed May 21 20:48:28 2008
@@ -11,6 +11,7 @@
 	-I$(top_srcdir)/lib/engine/			\
 	-I$(top_srcdir)/lib/engine/gui/gtk-frontend	\
 	-I$(top_srcdir)/lib/engine/addressbook/skel	\
+	-I$(top_srcdir)/lib/engine/chat/skel		\
 	-I$(top_srcdir)/lib/engine/presence/skel	\
 	-I$(top_srcdir)/lib/engine/protocol/skel	\
 	-I$(top_srcdir)/lib/engine/protocol/sip		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]