ekiga r6492 - in trunk: . lib/engine/chat/skel lib/engine/gui/gtk-frontend src/endpoints src/gui

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Jul 24 13:43:36 2008
New Revision: 6492
URL: http://svn.gnome.org/viewvc/ekiga?rev=6492&view=rev

Log:
Made the old chat code uncompiled and unused, and the new one used instead

Modified:
   trunk/ChangeLog
   trunk/lib/engine/chat/skel/Makefile.am
   trunk/lib/engine/chat/skel/chat-core.h
   trunk/lib/engine/gui/gtk-frontend/Makefile.am
   trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
   trunk/lib/engine/gui/gtk-frontend/gtk-frontend.h
   trunk/src/endpoints/opal-main.cpp
   trunk/src/endpoints/sip.cpp
   trunk/src/endpoints/sip.h
   trunk/src/gui/statusicon.cpp

Modified: trunk/lib/engine/chat/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/chat/skel/Makefile.am	(original)
+++ trunk/lib/engine/chat/skel/Makefile.am	Thu Jul 24 13:43:36 2008
@@ -16,7 +16,6 @@
 	$(chat_dir)/dialect-impl.h		\
 	$(chat_dir)/chat.h			\
 	$(chat_dir)/chat-simple.h		\
-	$(chat_dir)/chat-multiple.h		\
-	$(chat_dir)/chat-manager.h
+	$(chat_dir)/chat-multiple.h
 
 libgmchat_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS)

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	Thu Jul 24 13:43:36 2008
@@ -39,9 +39,6 @@
 #include "services.h"
 #include "dialect.h"
 
-// FIXME: that one is for Damien's temporary code
-#include "chat-manager.h"
-
 /* FIXME: probably it should have a decorator system, so we can for example
  * hook a logger
  */
@@ -125,57 +122,6 @@
      */
     ChainOfResponsibility<FormRequest*> questions;
 
-    /** FIXME: start of Damien's temporary code :
-     **
-     **/
-  public:
-    void add_manager (ChatManager &manager)
-    {
-      managers.insert (&manager);
-      manager.im_failed.connect (sigc::bind (sigc::mem_fun (this, &ChatCore::on_im_failed), &manager));
-      manager.im_received.connect (sigc::bind (sigc::mem_fun (this, &ChatCore::on_im_received), &manager));
-      manager.im_sent.connect (sigc::bind (sigc::mem_fun (this, &ChatCore::on_im_sent), &manager));
-      manager.new_chat.connect (sigc::bind (sigc::mem_fun (this, &ChatCore::on_new_chat), &manager));
-    }
-
-    bool send_message (const std::string & uri,
-		       const std::string & message)
-    {
-      for (std::set<ChatManager*>::iterator iter = managers.begin ();
-	   iter != managers.end ();
-	   iter++) {
-
-	if ((*iter)->send_message (uri, message))
-	  return true;
-      }
-
-      return false;
-    }
-
-    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:
-    std::set<ChatManager *> managers;
-
-    void on_im_failed (const std::string uri, const std::string reason, ChatManager *manager)
-    { im_failed.emit (*manager, uri, reason); }
-
-    void on_im_sent (const std::string uri, const std::string message, ChatManager *manager)
-    { im_sent.emit (*manager, uri, message); }
-
-    void 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 on_new_chat (const std::string display_name, const std::string uri, ChatManager *manager)
-    { new_chat.emit (*manager, display_name, uri); }
-
-
-    /** FIXME: end of Damien's temporary code
-     **
-     **/
   };
 
   /**

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	Thu Jul 24 13:43:36 2008
@@ -35,10 +35,6 @@
 	$(gtk_frontend_dir)/multiple-chat-page.cpp	\
 	$(gtk_frontend_dir)/chat-window.h 		\
 	$(gtk_frontend_dir)/chat-window.cpp 		\
-	$(gtk_frontend_dir)/chat-window-old.h 		\
-	$(gtk_frontend_dir)/chat-window-old.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
 

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	Thu Jul 24 13:43:36 2008
@@ -80,24 +80,13 @@
   chat_window =
     chat_window_new (*chat_core,
 		     "/apps/ekiga/general/user_interface/chat_window");
-  chat_window_old =
-    chat_window_old_new_with_key (core, "/apps/ekiga/general/user_interface/chat_window");
-
-  conn = chat_core->new_chat.connect (sigc::mem_fun (this, &GtkFrontend::on_new_chat));
-  connections.push_back (conn);
 }
 
 
 GtkFrontend::~GtkFrontend ()
 {
-  for (std::vector<sigc::connection>::iterator iter = connections.begin () ;
-       iter != connections.end ();
-       iter++)
-    iter->disconnect ();
-
   gtk_widget_destroy (addressbook_window);
   gtk_widget_destroy (chat_window);
-  gtk_widget_destroy (chat_window_old);
 }
 
 
@@ -127,7 +116,7 @@
 
 const GtkWidget *GtkFrontend::get_chat_window () const
 {
-  return chat_window_old;
+  return chat_window;
 }
 
 
@@ -138,15 +127,6 @@
 }
 
 
-void GtkFrontend::on_new_chat (const Ekiga::ChatManager & /*manager*/,
-                               const std::string & name,
-                               const std::string & uri)
-{
-  chat_window_old_add_page (CHAT_WINDOW_OLD (chat_window_old), name, uri);
-  gtk_widget_show_all (GTK_WIDGET (chat_window_old));
-}
-
-
 bool
 gtk_frontend_init (Ekiga::ServiceCore &core,
 		   int * /*argc*/,

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	Thu Jul 24 13:43:36 2008
@@ -45,7 +45,6 @@
 #include "services.h"
 #include "contact-core.h"
 #include "presence-core.h"
-#include "chat-manager.h"
 
 
 class GtkFrontend: public Ekiga::Service
@@ -69,17 +68,11 @@
   const GtkWidget *get_chat_window () const;
 
 private :
-  void on_new_chat (const Ekiga::ChatManager & manager,
-		    const std::string & name,
-		    const std::string & uri);
 
   GtkWidget *addressbook_window;
   GtkWidget *roster_view;
   GtkWidget *call_history_view;
   GtkWidget *chat_window;
-  GtkWidget *chat_window_old;
-
-  std::vector<sigc::connection> connections;
 };
 
 

Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp	(original)
+++ trunk/src/endpoints/opal-main.cpp	Thu Jul 24 13:43:36 2008
@@ -99,7 +99,6 @@
 
   call_core->add_manager (*call_manager);
   core.add (*call_manager); // FIXME temporary
-  chat_core->add_manager (*sip_manager);
   account_core->add_account_subscriber (*sip_manager);
 
   new ConfBridge (*call_manager);

Modified: trunk/src/endpoints/sip.cpp
==============================================================================
--- trunk/src/endpoints/sip.cpp	(original)
+++ trunk/src/endpoints/sip.cpp	Thu Jul 24 13:43:36 2008
@@ -186,7 +186,7 @@
 }
 
 
-bool CallProtocolManager::menu_builder_add_actions (const std::string & fullname,
+bool CallProtocolManager::menu_builder_add_actions (const std::string& /*fullname*/,
                                                     std::map<std::string,std::string> & uris,
                                                     Ekiga::MenuBuilder & builder)
 {
@@ -207,21 +207,6 @@
     populated = true;
   }
 
-  /* Add actions of type "message" for all uris */
-  for (std::map<std::string, std::string>::const_iterator iter = uris.begin ();
-       iter != uris.end ();
-       iter++) {
-
-    std::string action = _("Message (old)");
-
-    if (!iter->first.empty ())
-      action = action + " [" + iter->first + "]";
-
-    builder.add_action ("message", action, sigc::bind (sigc::mem_fun (this, &CallProtocolManager::on_message), fullname, iter->second));
-
-    populated = true;
-  }
-
   return populated;
 }
 
@@ -313,8 +298,6 @@
 
     SIPEndPoint::Message (_uri, _message);
 
-    runtime.run_in_main (sigc::bind (im_sent.make_slot (), _uri, _message));
-
     return true;
   }
 
@@ -882,7 +865,6 @@
     std::string _message = (const char *) pdu.GetEntityBody ();
 
     dialect->push_message (message_uri, display_name, _message);
-    runtime.run_in_main (sigc::bind (im_received.make_slot (), display_name, message_uri, _message));
   }
 }
 
@@ -896,8 +878,6 @@
   std::string display_name = (const char *) to.GetDisplayName ();
   
   dialect->push_notice (uri, display_name, _("Could not send message"));
-  runtime.run_in_main (sigc::bind (im_failed.make_slot (), uri, 
-                                   _("Could not send message")));
 }
 
 
@@ -996,11 +976,3 @@
 {
   endpoint.dial (uri);
 }
-
-
-void CallProtocolManager::on_message (const std::string & name,
-                                      const std::string & uri)
-{
-  runtime.run_in_main (sigc::bind (new_chat.make_slot (), name, uri));
-}
-

Modified: trunk/src/endpoints/sip.h
==============================================================================
--- trunk/src/endpoints/sip.h	(original)
+++ trunk/src/endpoints/sip.h	Thu Jul 24 13:43:36 2008
@@ -46,7 +46,6 @@
 
 #include "manager.h"
 #include "presence-core.h"
-#include "chat-manager.h"
 #include "call-manager.h"
 #include "call-protocol-manager.h"
 #include "account-core.h"
@@ -62,7 +61,6 @@
   namespace Sip {
 
     class CallProtocolManager : public SIPEndPoint, 
-                                public Ekiga::ChatManager,
                                 public Ekiga::CallProtocolManager,
                                 public Ekiga::PresenceFetcher,
                                 public Ekiga::PresencePublisher,
@@ -100,7 +98,7 @@
       void publish (const Ekiga::PersonalDetails & details);
 
 
-      /* ChatManager */
+      /* Chat subsystem */
       bool send_message (const std::string & uri, 
                          const std::string & message);
 
@@ -166,10 +164,6 @@
   private:
       void on_dial (std::string uri);
 
-      void on_message (const std::string & name,
-                       const std::string & uri);
-
-
       PMutex msgDataMutex;
       msgDict msgData;
 

Modified: trunk/src/gui/statusicon.cpp
==============================================================================
--- trunk/src/gui/statusicon.cpp	(original)
+++ trunk/src/gui/statusicon.cpp	Thu Jul 24 13:43:36 2008
@@ -103,9 +103,9 @@
                          gpointer data);
 
 static void
-message_event_cb (GtkWidget *widget,
-                  guint messages,
-                  gpointer data);
+unread_count_cb (GtkWidget *widget,
+		 guint messages,
+		 gpointer data);
 
 static gboolean
 statusicon_blink_cb (gpointer data);
@@ -345,9 +345,9 @@
 
 
 static void
-message_event_cb (G_GNUC_UNUSED GtkWidget *widget,
-                  guint messages,
-                  gpointer data)
+unread_count_cb (G_GNUC_UNUSED GtkWidget *widget,
+		 guint messages,
+		 gpointer data)
 {
   StatusIcon *self = STATUSICON (data);
 
@@ -566,8 +566,8 @@
   g_signal_connect (self, "activate",
                     G_CALLBACK (statusicon_activated_cb), self);
 
-  g_signal_connect (chat_window, "message-event",
-                    G_CALLBACK (message_event_cb), self);
+  g_signal_connect (chat_window, "unread-count",
+                    G_CALLBACK (unread_count_cb), self);
 
   return self;
 }