X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Ftracecontrol%2Ftracecontrol.c;h=768095cd387124fa6093e9b7c2d9d74771d302da;hb=f9240312451df4ff9fc7b0d4cfb159a03d7dc2c3;hp=e3f1ff8565f5d54ce40f2804cacc93ebda12acbb;hpb=b57800a3d1160296471f7054345aeb01ca92bb26;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c b/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c
index e3f1ff85..768095cd 100644
--- a/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c
+++ b/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gprintf.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -32,6 +33,8 @@
 
 #include <lttvwindow/lttvwindow.h>
 #include <lttvwindow/lttvwindowtraces.h>
+#include <lttvwindow/callbacks.h>
+#include <lttvwindow/lttv_plugin_tab.h>
 
 #include "hTraceControlInsert.xpm"
 #include "TraceControlStart.xpm"
@@ -67,9 +70,9 @@ typedef struct _ControlData ControlData;
  * Prototypes
  */
 GtkWidget *guicontrol_get_widget(ControlData *tcd);
-ControlData *gui_control(Tab *tab);
+ControlData *gui_control(LttvPluginTab *ptab);
 void gui_control_destructor(ControlData *tcd);
-GtkWidget* h_guicontrol(Tab *tab);
+GtkWidget* h_guicontrol(LttvPlugin *plugin);
 void control_destroy_walk(gpointer data, gpointer user_data);
   
 /*
@@ -150,8 +153,9 @@ guicontrol_get_widget(ControlData *tcd)
  *  @return The Filter viewer data created.
  */
 ControlData*
-gui_control(Tab *tab)
+gui_control(LttvPluginTab *ptab)
 {
+  Tab *tab = ptab->tab;
   g_debug("filter::gui_control()");
 
   unsigned i;
@@ -245,7 +249,7 @@ gui_control(Tab *tab)
   tcd->channel_dir_label = gtk_label_new("Channel directory:");
   gtk_widget_show (tcd->channel_dir_label);
   tcd->channel_dir_entry = gtk_entry_new();
-  gtk_entry_set_text(GTK_ENTRY(tcd->channel_dir_entry),"/mnt/relayfs/ltt");
+  gtk_entry_set_text(GTK_ENTRY(tcd->channel_dir_entry),"/mnt/debugfs/ltt");
   gtk_widget_show (tcd->channel_dir_entry);
   gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->channel_dir_label,0,2,2,3,GTK_FILL,GTK_FILL,2,2);
   gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->channel_dir_entry,2,6,2,3,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0);
@@ -342,7 +346,7 @@ gui_control(Tab *tab)
   tcd->fac_path_label = gtk_label_new("path to facilities:");
   gtk_widget_show (tcd->fac_path_label);
   tcd->fac_path_entry = gtk_entry_new();
-  gtk_entry_set_text(GTK_ENTRY(tcd->fac_path_entry),PACKAGE_DATA_DIR "/" PACKAGE "/facilities");
+  gtk_entry_set_text(GTK_ENTRY(tcd->fac_path_entry),PACKAGE_DATA_DIR "/" "ltt-control" "/facilities");
   gtk_widget_set_size_request(tcd->fac_path_entry, 250, -1);
   gtk_widget_show (tcd->fac_path_entry);
   gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->fac_path_label,0,2,14,15,GTK_FILL,GTK_FILL,2,2);
@@ -980,7 +984,10 @@ void stop_clicked (GtkButton *button, gpointer user_data)
   
   const gchar *lttctl_path =
     gtk_entry_get_text(GTK_ENTRY(tcd->lttctl_path_entry));
-  const gchar *trace_dir = gtk_entry_get_text(GTK_ENTRY(tcd->trace_dir_entry));
+  gchar *trace_dir = gtk_entry_get_text(GTK_ENTRY(tcd->trace_dir_entry));
+  GSList * trace_list = NULL;
+
+  trace_list = g_slist_append(trace_list, trace_dir);
 
   /* Setup arguments to su */
   /* child */
@@ -1064,7 +1071,7 @@ void stop_clicked (GtkButton *button, gpointer user_data)
   switch(id){
     case GTK_RESPONSE_ACCEPT:
       {
-        create_main_window_with_trace(trace_dir);
+        create_main_window_with_trace_list(trace_list);
       }
       break;
     case GTK_RESPONSE_REJECT:
@@ -1072,7 +1079,7 @@ void stop_clicked (GtkButton *button, gpointer user_data)
       break;
   }
   gtk_widget_destroy(dialogue);
-
+  g_slist_free(trace_list);
 }
 
 
@@ -1087,9 +1094,10 @@ void stop_clicked (GtkButton *button, gpointer user_data)
  *  @return The widget created.
  */
 GtkWidget *
-h_guicontrol(Tab *tab)
+h_guicontrol(LttvPlugin *plugin)
 {
-  ControlData* f = gui_control(tab) ;
+  LttvPluginTab *ptab = LTTV_PLUGIN_TAB(plugin);
+  ControlData* f = gui_control(ptab);
 
   return NULL;
 }