ekiga r6117 - trunk/lib/engine/gui/gtk-frontend

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Apr  3 13:45:47 2008
New Revision: 6117
URL: http://svn.gnome.org/viewvc/ekiga?rev=6117&view=rev

Log:
Make the main window use the new call history widget


Modified:
   trunk/lib/engine/gui/gtk-frontend/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 Apr  3 13:45:47 2008
@@ -74,11 +74,7 @@
   history_book = history_source->get_book ();
 
   roster_view = roster_view_gtk_new (*presence_core);
-<<<<<<< HEAD:lib/engine/gui/gtk-frontend/gtk-frontend.cpp
   call_history_view = call_history_view_gtk_new (*history_book);
-=======
-  call_history_view = book_view_gtk_new (*history_book); // FIXME: better view
->>>>>>> Put a call history view in the main window:lib/engine/gui/gtk-frontend/gtk-frontend.cpp
   addressbook_window = 
     addressbook_window_new_with_key (*contact_core, "/apps/ekiga/general/user_interface/addressbook_window");
   chat_window =