basic lttvwindow works

[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / module.c

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
index 16068794d3c3f797c2a9fe69550caf28c75a7251..258356e65f3f067a4778df32f1c04f57d64c1d24 100644 (file)
--- 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.
@@ -38,15 +38,14 @@
  */
 
 #include <glib.h>
-#include <gmodule.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;
 
@@ -66,24 +65,16 @@ GSList *g_control_flow_data_list = NULL ;
  * This function initializes the Control Flow Viewer functionnality through the
  * gtkTraceSet API.
  */
-G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) {
+static void init() {
 
-  Main_Win_Module = lttv_module_require(self, "mainwin", argc, argv);
-  
-  if(Main_Win_Module == NULL)
-  {
-    g_critical("Can't load Control Flow Viewer : missing mainwin\n");
-    return;
-  }
-  
   g_info("GUI ControlFlow Viewer init()");
 
   /* Register the toolbar insert button */
-  toolbar_item_reg(hGuiControlFlowInsert_xpm, "Insert Control Flow Viewer",
-      h_guicontrolflow);
+  lttvwindow_register_toolbar(hGuiControlFlowInsert_xpm,
+      "Insert Control Flow Viewer", h_guicontrolflow);
 
   /* Register the menu item insert entry */
-  menu_item_reg("/", "Insert Control Flow Viewer", h_guicontrolflow);
+  lttvwindow_register_menu("/", "Insert Control Flow Viewer", h_guicontrolflow);
   
 }
 
@@ -101,7 +92,7 @@ void destroy_walk(gpointer data, gpointer user_data)
  * This function releases the memory reserved by the module and unregisters
  * everything that has been registered in the gtkTraceSet API.
  */
-G_MODULE_EXPORT void destroy() {
+static void destroy() {
   g_info("GUI Control Flow Viewer destroy()");
   int i;
 
@@ -110,9 +101,14 @@ G_MODULE_EXPORT void destroy() {
   g_slist_free(g_control_flow_data_list);
 
   /* Unregister the toolbar insert button */
-  toolbar_item_unreg(h_guicontrolflow);
+  lttvwindow_unregister_toolbar(h_guicontrolflow);
 
   /* Unregister the menu item insert entry */
-  menu_item_unreg(h_guicontrolflow);
+  lttvwindow_unregister_menu(h_guicontrolflow);
   
 }
+
+
+LTTV_MODULE("guicontrolflow", "Control flow viewer", \
+    "Graphical module to view processes state and control flow", \
+    init, destroy, "lttvwindow")