X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fmodule.c;h=c7c571927f9804432e6901b00a6aba6c726d6288;hb=800aa0293651008a98ae6c71c9d9092a95a3e162;hp=1c3991795d65da506ccc2583441e6911858a6aa8;hpb=297f7a4845fabb98cc7bcf3598cfa7555b820236;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 1c399179..c7c57192 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
@@ -37,25 +37,26 @@
  * Author : Mathieu Desnoyers, June 2003
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <lttv/lttv.h>
 #include <lttv/module.h>
-#include <lttvwindow/viewer.h>
+#include <lttvwindow/lttvwindow.h>
 
 #include "cfv.h"
 #include "eventhooks.h"
 
 #include "hGuiControlFlowInsert.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 ;
 
 
-
-
 /*****************************************************************************
  *                 Functions for module loading/unloading                    *
  *****************************************************************************/
@@ -69,13 +70,15 @@ static void init() {
 
   g_info("GUI ControlFlow Viewer init()");
 
-  /* Register the toolbar insert button */
-  lttvwindow_register_toolbar(hGuiControlFlowInsert_xpm,
-      "Insert Control Flow Viewer", h_guicontrolflow);
+  /* Register the toolbar insert button and menu entry*/
+  lttvwindow_register_constructor("guicontrolflow",
+                                  "/",
+                                  "Insert Control Flow Viewer",
+                                  hGuiControlFlowInsert_xpm,
+                                  "Insert Control Flow Viewer",
+                                  h_guicontrolflow);
 
-  /* Register the menu item insert entry */
-  lttvwindow_register_menu("/", "Insert Control Flow Viewer", h_guicontrolflow);
-  
+  LTT_NAME_CPU = g_quark_from_string("/cpu");
 }
 
 void destroy_walk(gpointer data, gpointer user_data)
@@ -94,18 +97,13 @@ 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);
 
-  /* Unregister the toolbar insert button */
-  lttvwindow_unregister_toolbar(h_guicontrolflow);
-
-  /* Unregister the menu item insert entry */
-  lttvwindow_unregister_menu(h_guicontrolflow);
-  
+  /* Unregister the toolbar insert button and menu entry */
+  lttvwindow_unregister_constructor(h_guicontrolflow);
 }