X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Finit_module.c;h=c964481db12e80244a2c56523bc765c002ea72b5;hb=c4e6f4dcd943f5fc42a6f903c2ca336a343a4624;hp=1ca5cf04cf154c8500202480f548bba5c6fd0d22;hpb=6cec4cd266bde25f87dad0a059fd98c7381eb8c2;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
index 1ca5cf04..c964481d 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
@@ -27,6 +27,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
+#include <string.h>
 
 #include <lttv/lttv.h>
 #include <lttv/attribute.h>
@@ -48,7 +49,8 @@
 #include <ltt/trace.h>
 
 
-LttvTraceInfo LTTV_TRACES,
+__EXPORT LttvTraceInfo
+       LTTV_TRACES,
        LTTV_COMPUTATION,
        LTTV_VIEWER_CONSTRUCTORS,
        LTTV_REQUESTS_QUEUE,
@@ -82,17 +84,18 @@ LttvHooks
   *main_hooks;
 
 /* Initial trace from command line */
-//LttvTrace *g_init_trace = NULL;
+static GSList *g_init_trace = NULL;
 
 static char *a_trace;
-static char g_init_trace[PATH_MAX] = "";
+//static char g_init_trace[PATH_MAX] = "";
 
 
 void lttv_trace_option(void *hook_data)
 { 
-  LttTrace *trace;
+  //LttTrace *trace;
 
-  get_absolute_pathname(a_trace, g_init_trace);
+  //get_absolute_pathname(a_trace, g_init_trace);
+  g_init_trace = g_slist_append(g_init_trace, a_trace);
 }
 
 /*****************************************************************************
@@ -121,11 +124,7 @@ static gboolean window_creation_hook(void *hook_data, void *call_data)
   add_pixmap_directory ("../modules/gui/main/pixmaps");
 
   /* First window, use command line trace */
-  if(strcmp(g_init_trace, "") != 0){
-    create_main_window_with_trace(g_init_trace);
-  } else {
-    construct_main_window(NULL);
-  }
+  create_main_window_with_trace_list(g_init_trace);
 
   gtk_main ();
 
@@ -254,6 +253,8 @@ static void destroy() {
   g_slist_foreach(g_main_window_list, destroy_walk, NULL);
   
   g_slist_free(g_main_window_list);
+
+  g_slist_free(g_init_trace);
   
 }