X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2Fmodule.c;h=dde25f283597eeb642b45cfc133e77e510b14553;hb=a0bd2c9981e6fc72170a784cf9b4bfd1666e35df;hp=41b77a6d983d9cd573803b0e4ba1fd9fb915b522;hpb=1ab818de1d890bf716413090d943858bfef8d3d3;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/module.c b/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
index 41b77a6d..dde25f28 100644
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
@@ -17,6 +17,9 @@
  * 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>
@@ -55,21 +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_critical("Walk destroy GUI Control Flow Viewer");
+	g_info("Walk destroy GUI Control Flow Viewer");
+	guicontrolflow_destructor_full((ControlFlowData*)data);
 }
 
 
@@ -81,17 +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_slist_free(gControl_Flow_Data_List);
+
 	/* Unregister the toolbar insert button */
-	ToolbarItemUnreg(hGuiControlFlow);
+	toolbar_item_unreg(h_guicontrolflow);
 
 	/* Unregister the menu item insert entry */
-	MenuItemUnreg(hGuiControlFlow);
+	menu_item_unreg(h_guicontrolflow);
 	
 }