X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2Fmodule.c;h=dde25f283597eeb642b45cfc133e77e510b14553;hb=90ffd2adca8a23a36f3a9b7279f40797907723de;hp=fe6a2838c0ca0e0c29f4ca3ad61fd40344799cda;hpb=558aa01322f1af8be09fcfc086864da0373823c5;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/module.c b/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
index fe6a2838..dde25f28 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"
 
-LttvModule *Main_Win_Module;
+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 ;
 
 
 
@@ -55,20 +58,21 @@ G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) {
 	  return;
 	}
 	
-	g_critical("GUI ControlFlow Viewer init()");
+	g_info("GUI ControlFlow Viewer init()");
 
 	/* Register the toolbar insert button */
-	//ToolbarItemReg(hGuiControlFlowInsert_xpm, "Insert Control Flow Viewer",
-	//		hGuiControlFlow);
+	toolbar_item_reg(hGuiControlFlowInsert_xpm, "Insert Control Flow Viewer",
+			h_guicontrolflow);
 
 	/* Register the menu item insert entry */
-	//MenuItemReg("/", "Insert Control Flow Viewer", hGuiControlFlow);
+	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,22 +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()");
+	g_info("GUI Control Flow Viewer destroy()");
 	int i;
 
-//	ControlFlowData *Control_Flow_Data;
+	g_slist_foreach(gControl_Flow_Data_List, destroy_walk, NULL );
 	
-	g_critical("GUI Event Viewer destroy()");
+	g_slist_free(gControl_Flow_Data_List);
 
-//	g_slist_foreach(gControl_Flow_Data_List, destroy_walk, NULL );
-	
 	/* Unregister the toolbar insert button */
-	//ToolbarItemUnreg(hGuiControlFlow);
+	toolbar_item_unreg(h_guicontrolflow);
 
 	/* Unregister the menu item insert entry */
-	//MenuItemUnreg(hGuiControlFlow);
-	
-
-	lttv_module_unload(Main_Win_Module);
+	menu_item_unreg(h_guicontrolflow);
 	
 }