X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fmodule.c;h=1ad14c1691f6c4e3d483ac75448687975a2122b8;hb=d34141ca6fc6dd872a922134b22095bd74ec013d;hp=14311efed2a552661b6eb7dd1cee0e5afeb1d8a7;hpb=0de51231df955953661f9bf712394961524092d9;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
index 14311efe..1ad14c16 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
@@ -47,18 +47,16 @@
 #include <lttvwindow/lttvwindow.h>
 
 #include "cfv.h"
+#include "lttv_plugin_cfv.h"
 #include "eventhooks.h"
 
 #include "hGuiControlFlowInsert.xpm"
-#include "hLegendInsert.xpm"
 
 GQuark LTT_NAME_CPU;
 
 /** Array containing instanced objects. Used when module is unloaded */
 GSList *g_control_flow_data_list = NULL ;
 
-GSList *g_legend_list = NULL ;
-
 /*****************************************************************************
  *                 Functions for module loading/unloading                    *
  *****************************************************************************/
@@ -80,31 +78,16 @@ static void init() {
                                   "Insert Control Flow Viewer",
                                   h_guicontrolflow);
   
-  lttvwindow_register_constructor("guicontrolflowlegend",
-                                  "/",
-                                  "Popup Control Flow Viewer Legend",
-                                  hLegendInsert_xpm,
-                                  "Popup Control Flow Viewer Legend",
-                                  h_legend);
-
-
   LTT_NAME_CPU = g_quark_from_string("/cpu");
 }
 
 void destroy_walk(gpointer data, gpointer user_data)
 {
   g_info("Walk destroy GUI Control Flow Viewer");
-  guicontrolflow_destructor_full((ControlFlowData*)data);
-}
-
-void destroy_legend_walk(gpointer data, gpointer user_data)
-{
-  g_info("Walk destroy GUI Control Flow Viewer");
-  legend_destructor((GtkWindow*)data);
+  guicontrolflow_destructor_full((LttvPluginCFV*)data);
 }
 
 
-
 /**
  * plugin's destroy function
  *
@@ -118,13 +101,10 @@ static void destroy() {
   
   g_slist_free(g_control_flow_data_list);
 
-  g_slist_foreach(g_legend_list, destroy_legend_walk, NULL );
-  
   g_slist_free(g_control_flow_data_list);
   
   /* Unregister the toolbar insert button and menu entry */
   lttvwindow_unregister_constructor(h_guicontrolflow);
-  lttvwindow_unregister_constructor(h_legend);
 }