X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fmodule.c;h=d2099fc47ca3108f961a46d93f0b47df72b26f3f;hb=49217bd422d9fed609bccf93d5ea67440ee2678a;hp=69694d6f7b28e73863fe77bd8063abc607375b42;hpb=08b1c66e3a5ad9588d08f9477af98c0cda4f070c;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 69694d6f..d2099fc4 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
@@ -26,7 +26,7 @@
  *
  * This plugin adds a Control Flow Viewer functionnality to Linux TraceToolkit
  * GUI when this plugin is loaded. The init and destroy functions add the
- * viewer's insertion menu item and toolbar icon by calling gtkTraceSet's
+ * viewer's insertion menu item and toolbar icon by calling viewer.h's
  * API functions. Then, when a viewer's object is created, the constructor
  * creates ans register through API functions what is needed to interact
  * with the TraceSet window.
@@ -40,12 +40,12 @@
 #include <glib.h>
 #include <lttv/lttv.h>
 #include <lttv/module.h>
-#include <lttv/gtktraceset.h>
+#include <lttvwindow/lttvwindow.h>
 
 #include "cfv.h"
 #include "eventhooks.h"
 
-#include "../icons/hGuiControlFlowInsert.xpm"
+#include "hGuiControlFlowInsert.xpm"
 
 static LttvModule *Main_Win_Module;
 
@@ -69,13 +69,13 @@ static void init() {
 
   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);
-  
+  /* Register the toolbar insert button and menu entry*/
+  lttvwindow_register_constructor("guicontrolflow",
+                                  "/",
+                                  "Insert Control Flow Viewer",
+                                  hGuiControlFlowInsert_xpm,
+                                  "Insert Control Flow Viewer",
+                                  h_guicontrolflow);
 }
 
 void destroy_walk(gpointer data, gpointer user_data)
@@ -100,15 +100,11 @@ static void destroy() {
   
   g_slist_free(g_control_flow_data_list);
 
-  /* Unregister the toolbar insert button */
-  toolbar_item_unreg(h_guicontrolflow);
-
-  /* Unregister the menu item insert entry */
-  menu_item_unreg(h_guicontrolflow);
-  
+  /* Unregister the toolbar insert button and menu entry */
+  lttvwindow_unregister_constructor(h_guicontrolflow);
 }
 
 
 LTTV_MODULE("guicontrolflow", "Control flow viewer", \
     "Graphical module to view processes state and control flow", \
-    init, destroy, "mainwin")
+    init, destroy, "lttvwindow")