X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Flttvwindow.c;h=aa42477282a62f4e02ea39d2b548958f76c151a3;hb=f31675494449c73316cab60617f51a85e67291c1;hp=9f153a75ed54169a1b92dc388a383c1ec113e98d;hpb=f37a2002e940e771ef47c9936f9b82b79e64d086;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
index 9f153a75..aa424772 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
@@ -228,6 +228,7 @@ void remove_menu_constructor(MainWindow *mw, lttvwindow_viewer_constructor viewe
  * 
  * It should be called by init function of the module.
  * 
+ * @param name name of the viewer
  * @param menu_path path of the menu item.
  * @param menu_text text of the menu item.
  * @param pixmap Image shown on the toolbar item.
@@ -236,7 +237,8 @@ void remove_menu_constructor(MainWindow *mw, lttvwindow_viewer_constructor viewe
  */
 
 void lttvwindow_register_constructor
-                            (char *  menu_path, 
+                            (char *  name,
+                             char *  menu_path, 
                              char *  menu_text,
                              char ** pixmap,
                              char *  tooltip,
@@ -249,6 +251,8 @@ void lttvwindow_register_constructor
   LttvMenuClosure menu_c;
   LttvAttributeValue value;
 
+  if(view_constructor == NULL) return;
+  
   if(pixmap != NULL) {
     g_assert(lttv_iattribute_find_by_path(attributes_global,
        "viewers/toolbar", LTTV_POINTER, &value));
@@ -281,6 +285,19 @@ void lttvwindow_register_constructor
                     (gpointer)add_menu_constructor,
                     &menu_c);
   }
+  {
+    LttvAttribute *attribute;
+    g_assert(attribute = 
+      LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
+                                LTTV_IATTRIBUTE(attributes_global),
+                                LTTV_VIEWER_CONSTRUCTORS)));
+  
+    g_assert(lttv_iattribute_find_by_path(LTTV_IATTRIBUTE(attribute),
+                            name, LTTV_POINTER, &value));
+
+    *(value.v_pointer) = view_constructor;
+
+  }
 }
 
 
@@ -324,6 +341,29 @@ void lttvwindow_unregister_constructor
                     view_constructor);
     lttv_menus_remove(menu, view_constructor);
   }
+
+  {
+    LttvAttribute *attribute;
+    g_assert(attribute = 
+      LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
+                                LTTV_IATTRIBUTE(attributes_global),
+                                LTTV_VIEWER_CONSTRUCTORS)));
+  
+    guint num = lttv_iattribute_get_number(LTTV_IATTRIBUTE(attribute));
+    guint i;
+    LttvAttributeName name;
+    LttvAttributeValue value;
+    LttvAttributeType type;
+    
+    for(i=0;i<num;i++) {
+      type = lttv_iattribute_get(LTTV_IATTRIBUTE(attribute), i, &name, &value);
+      g_assert(type == LTTV_POINTER);
+      if(*(value.v_pointer) == view_constructor) {
+        lttv_iattribute_remove(LTTV_IATTRIBUTE(attribute), i);
+        break;
+      }
+    }
+  }
 }
 
 
@@ -840,10 +880,10 @@ gint find_viewer (const EventsRequest *a, gconstpointer b)
 void lttvwindow_events_request_remove_all(Tab       *tab,
                                           gconstpointer   viewer)
 {
-  GSList *element;
+  GSList *element = tab->events_requests;
   
   while((element = 
-            g_slist_find_custom(tab->events_requests, viewer,
+            g_slist_find_custom(element, viewer,
                                 (GCompareFunc)find_viewer))
               != NULL) {
     EventsRequest *events_request = (EventsRequest *)element->data;
@@ -855,6 +895,8 @@ void lttvwindow_events_request_remove_all(Tab       *tab,
     //}
     g_free(events_request);
     tab->events_requests = g_slist_remove_link(tab->events_requests, element);
+    element = g_slist_next(element);
+    if(element == NULL) break;   /* end of list */
   }
   if(g_slist_length(tab->events_requests) == 0) {
     tab->events_request_pending = FALSE;
@@ -874,7 +916,7 @@ void lttvwindow_events_request_remove_all(Tab       *tab,
  * @return time window.
  */
 
-TimeWindow lttvwindow_get_time_window(Tab *tab)
+__inline TimeWindow lttvwindow_get_time_window(Tab *tab)
 {
   return tab->time_window;