X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FmainWin%2Fsrc%2Finit_module.c;h=7bf2f5e37f0399319f0690f4d637ae27f57b62de;hb=6ba6ea42a5970c00d113dfcd4cb4afacbb523f6b;hp=1cee6afe062d8a65eed9d6470e0645e6d0a27b8b;hpb=bca3b81f050faa6295485fc7dbc3fef45f706d14;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c
index 1cee6afe..7bf2f5e3 100644
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c
@@ -24,6 +24,8 @@
 #include "support.h"
 #include <lttv/mainWindow.h>
 #include "callbacks.h"
+#include <ltt/trace.h>
+
 
 /* global variable */
 static WindowCreationData  win_creation_data;
@@ -75,7 +77,7 @@ static gboolean window_creation_hook(void *hook_data, void *call_data)
   add_pixmap_directory ("pixmaps");
   add_pixmap_directory ("modules/gui/mainWin/pixmaps");
 
-  construct_main_window(NULL, window_creation_data, TRUE);
+  construct_main_window(NULL, window_creation_data);
 
   gtk_main ();
 
@@ -110,45 +112,8 @@ G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) {
 void
 main_window_free(MainWindow * mw)
 { 
-  guint i, nb, ref_count;
-  LttvTrace * trace;
-
   if(mw){
-
-g_critical("begin remove");
-    lttv_hooks_destroy(mw->traceset_info->before_traceset);
-    lttv_hooks_destroy(mw->traceset_info->after_traceset);
-    lttv_hooks_destroy(mw->traceset_info->before_trace);
-    lttv_hooks_destroy(mw->traceset_info->after_trace);
-    lttv_hooks_destroy(mw->traceset_info->before_tracefile);
-    lttv_hooks_destroy(mw->traceset_info->after_tracefile);
-    lttv_hooks_destroy(mw->traceset_info->before_event);
-    lttv_hooks_destroy(mw->traceset_info->after_event);
-g_critical("end remove");
-    
-    if(mw->traceset_info->path != NULL)
-      g_free(mw->traceset_info->path);
-    if(mw->traceset_info->traceset_context != NULL){
-      lttv_context_fini(LTTV_TRACESET_CONTEXT(mw->traceset_info->traceset_context));
-      g_object_unref(mw->traceset_info->traceset_context);
-    }
-    if(mw->traceset_info->traceset != NULL) {
-      nb = lttv_traceset_number(mw->traceset_info->traceset);
-      for(i = 0 ; i < nb ; i++) {
-	trace = lttv_traceset_get(mw->traceset_info->traceset, i);
-	ref_count = lttv_trace_get_ref_number(trace);
-	if(ref_count <= 1)
-	  ltt_trace_close(lttv_trace(trace));
-      }
-    }
-
-    lttv_traceset_destroy(mw->traceset_info->traceset); 
-
     g_object_unref(mw->attributes);
-
-    g_free(mw->traceset_info);
-    mw->traceset_info = NULL;
-      
     g_main_window_list = g_slist_remove(g_main_window_list, mw);
 
     g_hash_table_destroy(mw->hash_menu_item);