ekiga r7576 - in trunk: lib/engine/gui/gtk-frontend src src/gui

[jpuydt svn gnome org]

Author: jpuydt
Date: Sun Jan 18 19:54:22 2009
New Revision: 7576
URL: http://svn.gnome.org/viewvc/ekiga?rev=7576&view=rev

Log:
Simple widgets didn't belong to gtk-frontend

Modified:
   trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
   trunk/lib/engine/gui/gtk-frontend/gtk-frontend.h
   trunk/src/Makefile.am
   trunk/src/gui/main.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	Sun Jan 18 19:54:22 2009
@@ -80,14 +80,9 @@
 
 GtkFrontend::GtkFrontend (Ekiga::ServiceCore &core)
 {
-  gmref_ptr<Ekiga::PresenceCore> presence_core = core.get ("presence-core");
   gmref_ptr<Ekiga::ContactCore> contact_core = core.get ("contact-core");
   gmref_ptr<Ekiga::ChatCore> chat_core = core.get ("chat-core");
-  gmref_ptr<History::Source> history_source = core.get ("call-history-store");
-  gmref_ptr<History::Book> history_book = history_source->get_book ();
 
-  roster_view = roster_view_gtk_new (*presence_core);
-  call_history_view = call_history_view_gtk_new (history_book);
   addressbook_window =
     addressbook_window_new_with_key (*contact_core, "/apps/ekiga/general/user_interface/addressbook_window");
   chat_window =
@@ -115,12 +110,6 @@
 }
 
 
-const GtkWidget *GtkFrontend::get_roster_view () const
-{
-  return roster_view;
-}
-
-
 const GtkWidget *GtkFrontend::get_addressbook_window () const
 {
   return addressbook_window;
@@ -131,10 +120,3 @@
 {
   return chat_window;
 }
-
-
-const GtkWidget *
-GtkFrontend::get_call_history_view () const
-{
-  return call_history_view;
-}

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	Sun Jan 18 19:54:22 2009
@@ -59,10 +59,6 @@
 
   const std::string get_description () const;
 
-  const GtkWidget *get_roster_view () const;
-
-  const GtkWidget *get_call_history_view () const;
-
   const GtkWidget *get_addressbook_window () const;
 
   const GtkWidget *get_chat_window () const;
@@ -70,8 +66,6 @@
 private :
 
   GtkWidget *addressbook_window;
-  GtkWidget *roster_view;
-  GtkWidget *call_history_view;
   GtkWidget *chat_window;
 };
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Jan 18 19:54:22 2009
@@ -6,6 +6,7 @@
 	-I$(top_srcdir)/lib/engine/			\
 	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/gui/gtk-frontend	\
+	-I$(top_srcdir)/lib/engine/components/call-history \
 	-I$(top_srcdir)/lib/engine/account		\
 	-I$(top_srcdir)/lib/engine/addressbook	\
 	-I$(top_srcdir)/lib/engine/chat		\

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Sun Jan 18 19:54:22 2009
@@ -98,6 +98,9 @@
 #include "call-core.h"
 #include "account.h"
 #include "gtk-frontend.h"
+#include "roster-view-gtk.h"
+#include "call-history-view-gtk.h"
+#include "history-source.h"
 #include "services.h"
 #include "form-dialog-gtk.h"
 
@@ -3382,12 +3385,12 @@
   services = GnomeMeeting::Process ()->GetServiceCore ();
   g_return_if_fail (services != NULL);
 
-  gmref_ptr<GtkFrontend> gtk_frontend = services->get ("gtk-frontend");
+  gmref_ptr<Ekiga::PresenceCore> presence_core = services->get ("presence-core");
 
   label = gtk_label_new (_("Contacts"));
-  roster_view = GTK_WIDGET (gtk_frontend->get_roster_view ());
+  roster_view = roster_view_gtk_new (*presence_core);
   gtk_notebook_append_page (GTK_NOTEBOOK (mw->priv->main_notebook),
-			    roster_view, label);
+			      roster_view, label);
   g_signal_connect (G_OBJECT (roster_view), "presentity-selected",
 		    G_CALLBACK (on_presentity_selected), mw);
 }
@@ -3422,11 +3425,13 @@
   services = GnomeMeeting::Process ()->GetServiceCore ();
   g_return_if_fail (services != NULL);
 
-  gmref_ptr<GtkFrontend> gtk_frontend = services->get ("gtk-frontend");
+  gmref_ptr<History::Source> history_source = services->get ("call-history-store");
+  gmref_ptr<History::Book> history_book = history_source->get_book ();
+  GtkWidget* call_history_view = call_history_view_gtk_new (history_book);
 
   label = gtk_label_new (_("Call history"));
   gtk_notebook_append_page (GTK_NOTEBOOK (mw->priv->main_notebook),
-			    GTK_WIDGET (gtk_frontend->get_call_history_view ()),
+			    call_history_view,
 			    label);
 }