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

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index 42f75746..9b70ee3f 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -1680,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;
@@ -2279,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;
@@ -3101,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