X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2Fmodule.c;h=7e5ab92ec2ab172bdfa7fae0b6364607090f02b2;hb=ba90bc77f7ef2ffc59cc08b6234c61274cdd4396;hp=058c5b1cffea325b90e76ab83b0f2671ac3eadcb;hpb=ae4e77e0a98448e785288290c9d786d65e8e039b;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/module.c b/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
index 058c5b1c..7e5ab92e 100644
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
@@ -17,21 +17,24 @@
  * Author : Mathieu Desnoyers, June 2003
  */
 
+#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 <glib.h>
 #include <gmodule.h>
 #include <lttv/module.h>
-//#include <lttv/gtkTraceSet.h>
+#include <lttv/gtkTraceSet.h>
 
-//#include "CFV.h"
-//#include "Event_Hooks.h"
+#include "CFV.h"
+#include "Event_Hooks.h"
 
-// #include "../icons/hGuiControlFlowInsert.xpm"
+ #include "../icons/hGuiControlFlowInsert.xpm"
 
 static LttvModule *Main_Win_Module;
 
 
 /** Array containing instanced objects. Used when module is unloaded */
-//GSList *gControl_Flow_Data_List = NULL ;
+GSList *gControl_Flow_Data_List = NULL ;
 
 
 
@@ -47,28 +50,29 @@ static LttvModule *Main_Win_Module;
  */
 G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) {
 
-	Main_Win_Module = lttv_module_require(self, "mainwin", argc, argv);
-	
-	if(Main_Win_Module == NULL)
-	{
-	  g_critical("Can't load Control Flow Viewer : missing mainwin\n");
-	  return;
-	}
-	
-	g_critical("GUI ControlFlow Viewer init()");
-
-	/* Register the toolbar insert button */
-	//ToolbarItemReg(hGuiControlFlowInsert_xpm, "Insert Control Flow Viewer",
-	//		hGuiControlFlow);
-
-	/* Register the menu item insert entry */
-	//MenuItemReg("/", "Insert Control Flow Viewer", hGuiControlFlow);
-	
+  Main_Win_Module = lttv_module_require(self, "mainwin", argc, argv);
+  
+  if(Main_Win_Module == NULL)
+  {
+    g_critical("Can't load Control Flow Viewer : missing mainwin\n");
+    return;
+  }
+  
+  g_info("GUI ControlFlow Viewer init()");
+
+  /* Register the toolbar insert button */
+  toolbar_item_reg(hGuiControlFlowInsert_xpm, "Insert Control Flow Viewer",
+      h_guicontrolflow);
+
+  /* Register the menu item insert entry */
+  menu_item_reg("/", "Insert Control Flow Viewer", h_guicontrolflow);
+  
 }
 
 void destroy_walk(gpointer data, gpointer user_data)
 {
-//	GuiControlFlow_Destructor((ControlFlowData*)data);
+  g_info("Walk destroy GUI Control Flow Viewer");
+  guicontrolflow_destructor_full((ControlFlowData*)data);
 }
 
 
@@ -80,19 +84,17 @@ void destroy_walk(gpointer data, gpointer user_data)
  * everything that has been registered in the gtkTraceSet API.
  */
 G_MODULE_EXPORT void destroy() {
-	g_critical("GUI Control Flow Viewer destroy()");
-	int i;
+  g_info("GUI Control Flow Viewer destroy()");
+  int i;
 
-//	ControlFlowData *Control_Flow_Data;
-	
-	g_critical("GUI Event Viewer destroy()");
+  g_slist_foreach(gControl_Flow_Data_List, destroy_walk, NULL );
+  
+  g_slist_free(gControl_Flow_Data_List);
 
-//	g_slist_foreach(gControl_Flow_Data_List, destroy_walk, NULL );
-	
-	/* Unregister the toolbar insert button */
-	//ToolbarItemUnreg(hGuiControlFlow);
+  /* Unregister the toolbar insert button */
+  toolbar_item_unreg(h_guicontrolflow);
 
-	/* Unregister the menu item insert entry */
-	//MenuItemUnreg(hGuiControlFlow);
-	
+  /* Unregister the menu item insert entry */
+  menu_item_unreg(h_guicontrolflow);
+  
 }