X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fgtkmultivpaned.c;h=5856a7bf74ac9e4679798ba28a806c0e0a582c2e;hb=6ea089620900a1e1353112b14ccb3b6df05a9883;hp=24a39b4f8be9eaaa18ec5114d295da7338309c55;hpb=501e4e70320aeb56090ada4447958db1c2ed6616;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/gtkmultivpaned.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/gtkmultivpaned.c
index 24a39b4f..5856a7bf 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/gtkmultivpaned.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/gtkmultivpaned.c
@@ -19,9 +19,9 @@
 #include <gtk/gtk.h>
 
 #include <lttvwindow/gtkmultivpaned.h>
-//#include "gtkintl.h"
 #include <lttvwindow/mainwindow.h>
-#include <lttvwindow/lttvwindow.h>
+#include <lttvwindow/mainwindow-private.h>
+//#include "gtkintl.h"
 
 static void gtk_multi_vpaned_class_init (GtkMultiVPanedClass    *klass);
 static void gtk_multi_vpaned_init       (GtkMultiVPaned         *multi_vpaned);
@@ -172,8 +172,9 @@ void gtk_multi_vpaned_set_adjust(GtkMultiVPaned * multi_vpaned, const TimeWindow
 {
   TimeInterval *time_span;
   double len, start;
+  Tab *tab = (Tab *)g_object_get_data(G_OBJECT(multi_vpaned), "Tab_Info");
   LttvTracesetContext *tsc = 
-    LTTV_TRACESET_CONTEXT(multi_vpaned->tab->traceset_info->traceset_context);
+    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
 
   
   if(first_time){
@@ -218,6 +219,7 @@ void gtk_multi_vpaned_widget_add(GtkMultiVPaned * multi_vpaned, GtkWidget * widg
 {
   GtkPaned * tmpPane; 
   GtkWidget * w;
+  Tab *tab = (Tab *)g_object_get_data(G_OBJECT(multi_vpaned), "Tab_Info");
   
   g_return_if_fail(GTK_IS_MULTI_VPANED(multi_vpaned));
   g_object_ref(G_OBJECT(widget1));
@@ -231,7 +233,7 @@ void gtk_multi_vpaned_widget_add(GtkMultiVPaned * multi_vpaned, GtkWidget * widg
     gtk_widget_show(multi_vpaned->hscrollbar);
 
     multi_vpaned->hadjust = gtk_range_get_adjustment(GTK_RANGE(multi_vpaned->hscrollbar));
-    gtk_multi_vpaned_set_adjust(multi_vpaned, &multi_vpaned->tab->time_window, TRUE);
+    gtk_multi_vpaned_set_adjust(multi_vpaned, &tab->time_window, TRUE);
 
     gtk_range_set_update_policy (GTK_RANGE(multi_vpaned->hscrollbar),
 																 GTK_UPDATE_CONTINUOUS);
@@ -275,11 +277,12 @@ void gtk_multi_vpaned_widget_add(GtkMultiVPaned * multi_vpaned, GtkWidget * widg
 void gtk_multi_vpaned_widget_delete(GtkMultiVPaned * multi_vpaned)
 {
   GtkPaned * tmp, *prev, *next;
+  GtkWidget *widget;
 
   if(!multi_vpaned->focused_pane) return;
  
-  tmp = (GtkPaned*)multi_vpaned->focused_pane->child2; //widget in vpaned
-  g_object_unref(G_OBJECT(tmp));
+  widget = GTK_WIDGET(multi_vpaned->focused_pane->child2); //widget in vpaned
+  g_object_unref(G_OBJECT(widget));
 
   if(multi_vpaned->focused_pane == multi_vpaned->first_pane &&
      multi_vpaned->focused_pane == multi_vpaned->last_pane){
@@ -416,10 +419,11 @@ void gtk_multi_vpaned_scroll_value_changed(GtkAdjustment *adjust, gpointer multi
   GtkMultiVPaned * multi_vpaned = (GtkMultiVPaned*)multi_vpaned_arg;
   gdouble value = gtk_adjustment_get_value(adjust);
   gdouble upper, lower, ratio;
+  Tab *tab = (Tab *)g_object_get_data(G_OBJECT(multi_vpaned), "Tab_Info");
   LttvTracesetContext * tsc = 
-    LTTV_TRACESET_CONTEXT(multi_vpaned->tab->traceset_info->traceset_context);
+    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
 
-  time_window = multi_vpaned->tab->time_window;
+  time_window = tab->time_window;
 
   time_span = &tsc->time_span ;
   lower = multi_vpaned->hadjust->lower;
@@ -436,7 +440,7 @@ void gtk_multi_vpaned_scroll_value_changed(GtkAdjustment *adjust, gpointer multi
   if(ltt_time_compare(time,time_window.time_width) < 0){
     time_window.time_width = time;
   }
-  set_time_window(multi_vpaned->tab, &time_window);
+  set_time_window(tab, &time_window);
 }