X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=9b70ee3f8c8c4f5e183b10c38a4cb475a02e076a;hb=e40cdd19296a4fbacf0738fb3671f6d0503d9e99;hp=872cd75bbeb26f34310e80c0de71fe889b8f4f6d;hpb=8924e3e4b9f77267572f4fe0d4430748c27e66ea;p=lttv.git

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index 872cd75b..9b70ee3f 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -344,7 +344,7 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset)
     events_request->before_chunk_traceset = NULL;
     events_request->before_chunk_trace = NULL;
     events_request->before_chunk_tracefile = NULL;
-    events_request->event = traceset->event_hooks;
+    events_request->event = NULL;
     events_request->after_chunk_tracefile = NULL;
     events_request->after_chunk_trace = NULL;
     events_request->after_chunk_traceset = NULL;
@@ -1030,12 +1030,12 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
             /* Process the traceset with only state hooks */
 #ifdef DEBUG
             seek_count =
-
+#endif
                lttv_process_traceset_middle(ts,
                                             ltt_time_infinite,
                                             G_MAXUINT,
                                             events_request->start_position);
-#endif
+
             //g_assert(lttv_traceset_context_ctx_pos_compare(tsc,
             //             events_request->start_position) == 0);
 
@@ -1047,7 +1047,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
       /* 1.3 Add hooks and call before request for all list_in members */
       {
         GSList *iter = NULL;
-
         for(iter=list_in;iter!=NULL;iter=g_slist_next(iter)) {
           EventsRequest *events_request = (EventsRequest*)iter->data;
           /* 1.3.1 If !servicing */
@@ -1063,13 +1062,14 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
            */
 	  //TODO ybrosseau 2012-07-10: || TRUE added since we only support
 	  //     traceset wide requests
-          if(events_request->trace == -1 || TRUE)
+          if(events_request->trace == -1 || TRUE) {
+
             lttv_process_traceset_begin(ts,
                 events_request->before_chunk_traceset,
                 events_request->before_chunk_trace,
                 events_request->event
                 );
-          else {
+	  } else {
             guint nb_trace = lttv_traceset_number(ts);
             g_assert((guint)events_request->trace < nb_trace &&
                       events_request->trace > -1);
@@ -1378,15 +1378,12 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
            */
 	  //TODO ybrosseau 2012-07-10: || TRUE added since we only support
 	  //     traceset wide requests
-          if(events_request->trace == -1 || TRUE) 
+          if(events_request->trace == -1 || TRUE) {
                lttv_process_traceset_end(ts,
                                          events_request->after_chunk_traceset,
                                          events_request->after_chunk_trace,
-
                                          events_request->event);
-
-
-          else {
+	  } else {
             guint nb_trace = lttv_traceset_number(ts);
             g_assert(events_request->trace < nb_trace &&
                       events_request->trace > -1);
@@ -1683,23 +1680,12 @@ void add_trace(GtkWidget * widget, gpointer user_data)
     ptab = (LttvPluginTab *)g_object_get_data(G_OBJECT(page), "Tab_Plugin");
     tab = ptab->tab;
   }
-//TODO fdeslauriers 2012-07-06: Remove this popup when we support multiple traces
-  traceset = lttvwindow_get_traceset(tab);
-  if(traceset != NULL && lttv_traceset_number(traceset) > 0){
-	  GtkWidget *dialogue = 
-	    gtk_message_dialog_new(
-	      GTK_WINDOW(gtk_widget_get_toplevel(widget)),
-	      GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-	      GTK_MESSAGE_ERROR,
-	      GTK_BUTTONS_OK,
-	      "Loading multiple traces is not supported at the moment.");
-	  gtk_dialog_run(GTK_DIALOG(dialogue));
-	  gtk_widget_destroy(dialogue);
-	  return;
-	}
-  
+
   /* Create a new traceset*/
-  traceset = lttv_traceset_new();
+  traceset = tab->traceset_info->traceset;
+  if(traceset == NULL) {
+    traceset = lttv_traceset_new();
+  }
   /* File open dialog management */
 #ifdef BABEL_CLEANUP
   GtkWidget *extra_live_button;
@@ -2282,7 +2268,7 @@ LttvPluginTab *create_new_tab(GtkWidget* widget, gpointer user_data)
                       gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
   Tab *copy_tab;
 
-  if(!page) {
+  if(!page || TRUE ) {
     copy_tab = NULL;
   } else {
     LttvPluginTab *ptab;
@@ -3104,7 +3090,19 @@ void
 on_button_new_clicked                  (GtkButton       *button,
                                         gpointer         user_data)
 {
+#ifdef BABEL_CLEANUP
   create_new_window((GtkWidget*)button, user_data, TRUE);
+#else
+  GtkWidget *dialogue = 
+    gtk_message_dialog_new(
+      GTK_WINDOW(gtk_widget_get_toplevel(button)),
+      GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+      GTK_MESSAGE_ERROR,
+      GTK_BUTTONS_OK,
+      "Opening multiple windows is disabled.");
+  gtk_dialog_run(GTK_DIALOG(dialogue));
+  gtk_widget_destroy(dialogue);
+#endif
 }
 
 void