X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fmodule.c;h=d2099fc47ca3108f961a46d93f0b47df72b26f3f;hb=b27439533c5620fe06b9800fce0bc3592ed2088b;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..d2099fc4 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
@@ -40,7 +40,7 @@
 #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"
@@ -69,13 +69,13 @@ 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 menu item insert entry */
-  lttvwindow_register_menu("/", "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,12 +100,8 @@ static void destroy() {
   
   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);
 }