X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fcfv.c;h=ee0b37fda9b6d158ec204435c2c4aeb4f0944f61;hb=2d262115fc06b5ffb6038207a6d0c1d5f81763c2;hp=bf444b65239ea30dd0bbde8bae7c5bb1952379d5;hpb=ebf4f7355aa8bd24a81554b49c22b7d9f44503b0;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
index bf444b65..ee0b37fd 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
@@ -25,17 +25,14 @@
 #include "processlist.h"
 #include "eventhooks.h"
 #include "cfv-private.h"
-
-
-#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
+#include <lttv/lttv.h>
 
 extern GSList *g_control_flow_data_list;
 
 static void control_flow_grab_focus(GtkWidget *widget, gpointer data){
   ControlFlowData * control_flow_data = (ControlFlowData *)data;
   MainWindow * mw = control_flow_data->mw;
-  set_focused_pane(mw, gtk_widget_get_parent(control_flow_data->scrolled_window));
+  lttvwindow_report_focus(mw, control_flow_data->scrolled_window);
 }
 
 
@@ -107,7 +104,13 @@ guicontrolflow(void)
   /* Get trace statistics */
   //control_flow_data->Trace_Statistics = get_trace_statistics(Trace);
 
+  /* Create reading hooks */
+  control_flow_data->event = lttv_hooks_new();
+  control_flow_data->after_event = lttv_hooks_new();
+  control_flow_data->after_traceset = lttv_hooks_new();
+  control_flow_data->event_request = g_new(EventRequest, 1);
 
+  
   gtk_widget_show(drawing_widget);
   gtk_widget_show(process_list_widget);
   gtk_widget_show(control_flow_data->h_paned);
@@ -136,8 +139,8 @@ guicontrolflow(void)
   g_signal_connect (G_OBJECT (process_list_widget), "grab-focus",
         G_CALLBACK (control_flow_grab_focus),
         control_flow_data);
-
-
+  
+  
   return control_flow_data;
 
 }
@@ -169,13 +172,19 @@ guicontrolflow_destructor(ControlFlowData *control_flow_data)
   //ProcessList_destroy(control_flow_data->process_list);
   if(control_flow_data->mw != NULL)
   {
-    unreg_update_time_window(update_time_window_hook,
-        control_flow_data,
-        control_flow_data->mw);
+      /* Delete reading hooks */
+    lttv_hooks_destroy(control_flow_data->event);
+    lttv_hooks_destroy(control_flow_data->after_event);
+    lttv_hooks_destroy(control_flow_data->after_traceset);
+    g_free(control_flow_data->event_request);
+
+    lttvwindow_unregister_time_window_notify(control_flow_data->mw,
+        update_time_window_hook,
+        control_flow_data);
   
-    unreg_update_current_time(update_current_time_hook,
-        control_flow_data,
-        control_flow_data->mw);
+    lttvwindow_unregister_current_time_notify(control_flow_data->mw,
+        update_current_time_hook,
+        control_flow_data);
   }
   g_info("CFV.c : guicontrolflow_destructor, %p", control_flow_data);
   g_slist_remove(g_control_flow_data_list,control_flow_data);
@@ -193,13 +202,4 @@ ProcessList *guicontrolflow_get_process_list
     return control_flow_data->process_list ;
 }
 
-TimeWindow *guicontrolflow_get_time_window(ControlFlowData *control_flow_data)
-{
-  return &control_flow_data->time_window;
-}
-LttTime *guicontrolflow_get_current_time(ControlFlowData *control_flow_data)
-{
-  return &control_flow_data->current_time;
-}
-