X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Flttvwindow.c;h=66639b4f72e7c1f63a396fa25e0dc55772bc33a4;hb=b9ce0bad7daf7c0a2333c91fdb1e35d602afe17f;hp=d76ef62953f73388e824b382de565041c1a5dc5a;hpb=9a366873e0ed6ecc7f23e2d3a959ecddd4f2f91d;p=lttv.git

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
index d76ef629..66639b4f 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
@@ -12,8 +12,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA 02110-1301, USA.
  */
 
 /*! \file lttvwindow.c
@@ -32,7 +32,6 @@
 #include <config.h>
 #endif
 
-#include <ltt/ltt.h>
 #include <lttv/lttv.h>
 #include <lttv/state.h>
 #include <lttv/traceset.h>
@@ -1142,8 +1141,12 @@ __EXPORT gboolean lttvwindow_events_request_pending(Tab            *tab)
 {
   GSList *element = tab->events_requests;
 
-  if(element == NULL) return FALSE;
-  else return TRUE;
+  if(element == NULL){
+          return FALSE;
+  }
+  else {
+          return TRUE;
+  }
 }
 
 
@@ -1236,18 +1239,23 @@ __EXPORT LttvTraceset *lttvwindow_get_traceset(Tab *tab)
 
 void events_request_free(EventsRequest *events_request)
 {
-#ifdef BABEL_CLEANUP
+ 
   if(events_request == NULL) return;
 
   if(events_request->start_position != NULL)
-       lttv_traceset_context_position_destroy(events_request->start_position);
+       lttv_traceset_destroy_position(events_request->start_position);
   if(events_request->end_position != NULL)
-       lttv_traceset_context_position_destroy(events_request->end_position);
-  if(events_request->hooks != NULL) {
+       lttv_traceset_destroy_position(events_request->end_position);
+#ifdef BABEL_CLEANUP
+       if(events_request->hooks != NULL) {
     GArray *hooks = events_request->hooks;
+   
     lttv_trace_hook_remove_all(&hooks);
+ 
     g_array_free(events_request->hooks, TRUE);
+     
   }
+
   if(events_request->before_chunk_traceset != NULL)
        lttv_hooks_destroy(events_request->before_chunk_traceset);
   if(events_request->before_chunk_trace != NULL)
@@ -1256,8 +1264,6 @@ void events_request_free(EventsRequest *events_request)
        lttv_hooks_destroy(events_request->before_chunk_tracefile);
   if(events_request->event != NULL)
        lttv_hooks_destroy(events_request->event);
-  if(events_request->event_by_id_channel != NULL)
-       lttv_hooks_by_id_channel_destroy(events_request->event_by_id_channel);
   if(events_request->after_chunk_tracefile != NULL)
        lttv_hooks_destroy(events_request->after_chunk_tracefile);
   if(events_request->after_chunk_trace != NULL)
@@ -1268,9 +1274,10 @@ void events_request_free(EventsRequest *events_request)
        lttv_hooks_destroy(events_request->before_request);
   if(events_request->after_request != NULL)
        lttv_hooks_destroy(events_request->after_request);
-
-  g_free(events_request);
 #endif /*BABEL_CLEANUP*/
+  g_free(events_request);
+ 
+
 }