X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=0a7f8b8d31a4a2c2ed7a2624f6ed08d549b19f19;hb=5e96e7e38fc3a40f0d9076c7ca8f369ad8c91d8c;hp=705697c66ae6556856e9332810e9d5ab94266b12;hpb=864a5a1ca7221b4fe2bb26ea2c6ba46e1e4cf88d;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 705697c6..0a7f8b8d 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -49,6 +49,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <string.h>
 
 #include <ltt/ltt.h>
@@ -1040,6 +1041,8 @@ gboolean tree_v_scroll_handler (GtkWidget *widget, GdkEventScroll *event, gpoint
 			gtk_adjustment_set_value(event_viewer_data->vadjust_c,
 				gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 1);
 			break;
+		default:
+			g_error("Only scroll up and down expected");
 	}
 	return TRUE;
 }
@@ -1181,7 +1184,6 @@ static __inline gint get_cell_height(GtkTreeView *TreeView)
   
   gtk_tree_view_column_cell_get_size(column, NULL, NULL, NULL, NULL, &height);
   
-
   gint vertical_separator;
   gtk_widget_style_get (GTK_WIDGET (TreeView),
       "vertical-separator", &vertical_separator,
@@ -1481,6 +1483,7 @@ int event_hook(void *hook_data, void *call_data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*)hook_data;
   LttvTracefileContext *tfc = (LttvTracefileContext*)call_data;
+  LttvTracefileState *tfs = (LttvTracefileState*)call_data;
   LttEvent *e = ltt_tracefile_get_event(tfc->tf);
 
   LttvFilter *filter = event_viewer_data->main_win_filter;
@@ -1493,7 +1496,7 @@ int event_hook(void *hook_data, void *call_data)
   LttEventType *event_type = ltt_event_eventtype(e);
   LttTime time = ltt_event_time(e);
 
-  guint cpu = ltt_tracefile_num(tfc->tf);
+  guint cpu = tfs->cpu;
   LttvTraceState *ts = (LttvTraceState*)tfc->t_context;
   LttvProcessState *process = ts->running_process[cpu];
   
@@ -1753,6 +1756,7 @@ gint redraw_notify(void *hook_data, void *call_data)
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
 
   get_events(event_viewer_data->vadjust_c->value, event_viewer_data);
+  return 0;
 }
 
 void gui_events_free(EventViewerData *event_viewer_data)