fix file quit

[lttv.git] / trunk / lttv / lttv / modules / gui / lttvwindow / lttvwindow / callbacks.c

diff --git a/trunk/lttv/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/trunk/lttv/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index 817044b89539fa1d7c069c31ca157960c18a7221..0b5756e9a2d318ba609e9d5f889737deb7eb47e2 100644 (file)
--- a/trunk/lttv/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/trunk/lttv/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -764,7 +764,7 @@ void move_down_viewer(GtkWidget * widget, gpointer user_data)
     return;
   } else {
     LttvPluginTab *ptab;
-    ptab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Plugin");
+    ptab = g_object_get_data(G_OBJECT(page), "Tab_Plugin");
     tab = ptab->tab;
   }
 
@@ -839,7 +839,7 @@ void delete_viewer(GtkWidget * widget, gpointer user_data)
     return;
   } else {
     LttvPluginTab *ptab;
-    ptab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Plugin");
+    ptab = g_object_get_data(G_OBJECT(page), "Tab_Plugin");
     tab = ptab->tab;
   }
 
@@ -1229,7 +1229,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                 events_request->before_chunk_trace,
                 events_request->before_chunk_tracefile,
                 events_request->event,
-                events_request->event_by_id);
+                events_request->event_by_id_channel);
           else {
             guint nb_trace = lttv_traceset_number(tsc->ts);
             g_assert((guint)events_request->trace < nb_trace &&
@@ -1242,7 +1242,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                          events_request->before_chunk_trace,
                                          events_request->before_chunk_tracefile,
                                          events_request->event,
-                                         events_request->event_by_id);
+                                         events_request->event_by_id_channel);
           }
         }
       }
@@ -1266,7 +1266,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                 events_request->before_chunk_trace,
                 events_request->before_chunk_tracefile,
                 events_request->event,
-                events_request->event_by_id);
+                events_request->event_by_id_channel);
           else {
             guint nb_trace = lttv_traceset_number(tsc->ts);
             g_assert((guint)events_request->trace < nb_trace &&
@@ -1279,7 +1279,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                          events_request->before_chunk_trace,
                                          events_request->before_chunk_tracefile,
                                          events_request->event,
-                                         events_request->event_by_id);
+                                         events_request->event_by_id_channel);
           }
 
           iter = g_slist_next(iter);
@@ -1330,7 +1330,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                   events_request->before_chunk_trace,
                   events_request->before_chunk_tracefile,
                   events_request->event,
-                  events_request->event_by_id);
+                  events_request->event_by_id_channel);
             else {
               guint nb_trace = lttv_traceset_number(tsc->ts);
               g_assert((guint)events_request->trace < nb_trace &&
@@ -1343,7 +1343,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                            events_request->before_chunk_trace,
                                            events_request->before_chunk_tracefile,
                                            events_request->event,
-                                           events_request->event_by_id);
+                                           events_request->event_by_id_channel);
           }
 
 
@@ -1483,7 +1483,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                          events_request->after_chunk_trace,
                                          events_request->after_chunk_tracefile,
                                          events_request->event,
-                                         events_request->event_by_id);
+                                         events_request->event_by_id_channel);
 
           else {
             guint nb_trace = lttv_traceset_number(tsc->ts);
@@ -1495,7 +1495,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                          events_request->after_chunk_trace,
                                          events_request->after_chunk_tracefile,
                                          events_request->event,
-                                         events_request->event_by_id);
+                                         events_request->event_by_id_channel);
             lttv_hooks_call(events_request->after_chunk_traceset, tsc);
 
 
@@ -1541,7 +1541,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                          events_request->after_chunk_trace,
                                          events_request->after_chunk_tracefile,
                                          events_request->event,
-                                         events_request->event_by_id);
+                                         events_request->event_by_id_channel);
 
           else {
             guint nb_trace = lttv_traceset_number(tsc->ts);
@@ -1553,7 +1553,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                          events_request->after_chunk_trace,
                                          events_request->after_chunk_tracefile,
                                          events_request->event,
-                                         events_request->event_by_id);
+                                         events_request->event_by_id_channel);
 
             lttv_hooks_call(events_request->after_chunk_traceset, tsc);
           }
@@ -2474,7 +2474,10 @@ void
 on_quit_activate                       (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  mainwindow_quit();
+  while (g_slist_length(g_main_window_list) != 0) {
+    on_MWindow_destroy(((MainWindow *)g_main_window_list->data)->mwindow,
+      user_data);
+  }
 }
 
 
@@ -2577,7 +2580,7 @@ void
 on_trace_facility_activate              (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_info("Trace facility selector: %s\n");  
+       g_info("Trace facility selector: %s\n", "");
 }
 
 
@@ -2895,7 +2898,7 @@ on_unload_module_activate              (GtkMenuItem     *menuitem,
   GError *error = NULL;
   MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
 
-  LttvLibrary *library;
+  LttvLibrary *library = NULL;
   {
     GPtrArray *name;
     guint nb,i;
@@ -4349,10 +4352,10 @@ MainWindow *construct_main_window(MainWindow * parent)
     LttvIAttribute *attributes_global = 
        LTTV_IATTRIBUTE(lttv_global_attributes());
 
-    g_assert(attribute = 
-      LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
-                                LTTV_IATTRIBUTE(attributes_global),
-                                LTTV_VIEWER_CONSTRUCTORS)));
+    attribute = LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
+                                      LTTV_IATTRIBUTE(attributes_global),
+                                      LTTV_VIEWER_CONSTRUCTORS));
+    g_assert(attribute);
 
     name = g_quark_from_string("guievents");
     type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute),