X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fmodule.c;h=14311efed2a552661b6eb7dd1cee0e5afeb1d8a7;hb=6cec4cd266bde25f87dad0a059fd98c7381eb8c2;hp=db6d256f957cc29e97f7ce7ff125db636f822173;hpb=ca0f8a8e5907fe8aa588324b1b268d3089b46160;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 db6d256f..14311efe 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
@@ -37,6 +37,10 @@
  * Author : Mathieu Desnoyers, June 2003
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <lttv/lttv.h>
 #include <lttv/module.h>
@@ -46,15 +50,14 @@
 #include "eventhooks.h"
 
 #include "hGuiControlFlowInsert.xpm"
+#include "hLegendInsert.xpm"
 
-static LttvModule *Main_Win_Module;
-
+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                    *
@@ -70,11 +73,22 @@ static void init() {
   g_info("GUI ControlFlow Viewer init()");
 
   /* Register the toolbar insert button and menu entry*/
-  lttvwindow_register_constructor("/",
+  lttvwindow_register_constructor("guicontrolflow",
+                                  "/",
                                   "Insert Control Flow Viewer",
                                   hGuiControlFlowInsert_xpm,
                                   "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)
@@ -83,6 +97,12 @@ void destroy_walk(gpointer data, gpointer user_data)
   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);
+}
+
 
 
 /**
@@ -93,14 +113,18 @@ void destroy_walk(gpointer data, gpointer user_data)
  */
 static void destroy() {
   g_info("GUI Control Flow Viewer destroy()");
-  int i;
 
   g_slist_foreach(g_control_flow_data_list, destroy_walk, NULL );
   
   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);
 }