X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FmainWin%2Fsrc%2Fcallbacks.c;fp=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FmainWin%2Fsrc%2Fcallbacks.c;h=3328582b873eb77fa75eb9122f09c956edbbe559;hb=bca3b81f050faa6295485fc7dbc3fef45f706d14;hp=93c063f91e40e9364404b7c6c9a7b82e08ffeb41;hpb=10f2da9501711d45ea6d3130efaa1337c7315e31;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
index 93c063f9..3328582b 100644
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
@@ -19,7 +19,6 @@
 #define PATH_LENGTH          256
 #define DEFAULT_TIME_WIDTH_S   1
 
-//extern LttvTracesetContext * gTracesetContext;
 extern LttTrace *g_init_trace ;
 
 
@@ -28,7 +27,7 @@ extern GSList * g_main_window_list;
 
 static int g_win_count = 0;
 
-mainWindow * get_window_data_struct(GtkWidget * widget);
+MainWindow * get_window_data_struct(GtkWidget * widget);
 char * get_unload_module(char ** loaded_module_name, int nb_module);
 char * get_remove_trace(char ** all_trace_name, int nb_trace);
 char * get_selection(char ** all_name, int nb, char *title, char * column_title);
@@ -56,12 +55,12 @@ insert_viewer_wrap(GtkMenuItem *menuitem, gpointer user_data)
 void insert_viewer(GtkWidget* widget, view_constructor constructor)
 {
   GtkCustom * custom;
-  mainWindow * mw_data;  
+  MainWindow * mw_data;  
   GtkWidget * viewer;
 
   mw_data = get_window_data_struct(widget);
-  if(!mw_data->CurrentTab) return;
-  custom = mw_data->CurrentTab->custom;
+  if(!mw_data->current_tab) return;
+  custom = mw_data->current_tab->custom;
 
   viewer = (GtkWidget*)constructor(mw_data);
   if(viewer)
@@ -114,10 +113,10 @@ void get_label(GtkWindow * mw, gchar * str, gchar* dialogue_title, gchar * label
   }
 }
 
-mainWindow * get_window_data_struct(GtkWidget * widget)
+MainWindow * get_window_data_struct(GtkWidget * widget)
 {
   GtkWidget * mw;
-  mainWindow * mw_data;
+  MainWindow * mw_data;
 
   mw = lookup_widget(widget, "MWindow");
   if(mw == NULL){
@@ -125,7 +124,7 @@ mainWindow * get_window_data_struct(GtkWidget * widget)
     return;
   }
   
-  mw_data = (mainWindow *) g_object_get_data(G_OBJECT(mw),"mainWindow");
+  mw_data = (MainWindow *) g_object_get_data(G_OBJECT(mw),"mainWindow");
   if(mw_data == NULL){
     g_printf("Main window data does not exist\n");
     return;
@@ -135,36 +134,36 @@ mainWindow * get_window_data_struct(GtkWidget * widget)
 
 void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone)
 {
-  mainWindow * parent = get_window_data_struct(widget);
+  MainWindow * parent = get_window_data_struct(widget);
 
   if(clone){
     g_printf("Clone : use the same traceset\n");
     construct_main_window(parent, NULL, FALSE);
   }else{
     g_printf("Empty : traceset is set to NULL\n");
-    construct_main_window(NULL, parent->winCreationData, FALSE);
+    construct_main_window(NULL, parent->win_creation_data, FALSE);
   }
 }
 
 void move_up_viewer(GtkWidget * widget, gpointer user_data)
 {
-  mainWindow * mw = get_window_data_struct(widget);
-  if(!mw->CurrentTab) return;
-  gtk_custom_widget_move_up(mw->CurrentTab->custom);
+  MainWindow * mw = get_window_data_struct(widget);
+  if(!mw->current_tab) return;
+  gtk_custom_widget_move_up(mw->current_tab->custom);
 }
 
 void move_down_viewer(GtkWidget * widget, gpointer user_data)
 {
-  mainWindow * mw = get_window_data_struct(widget);
-  if(!mw->CurrentTab) return;
-  gtk_custom_widget_move_down(mw->CurrentTab->custom);
+  MainWindow * mw = get_window_data_struct(widget);
+  if(!mw->current_tab) return;
+  gtk_custom_widget_move_down(mw->current_tab->custom);
 }
 
 void delete_viewer(GtkWidget * widget, gpointer user_data)
 {
-  mainWindow * mw = get_window_data_struct(widget);
-  if(!mw->CurrentTab) return;
-  gtk_custom_widget_delete(mw->CurrentTab->custom);
+  MainWindow * mw = get_window_data_struct(widget);
+  if(!mw->current_tab) return;
+  gtk_custom_widget_delete(mw->current_tab->custom);
 }
 
 void open_traceset(GtkWidget * widget, gpointer user_data)
@@ -172,7 +171,7 @@ void open_traceset(GtkWidget * widget, gpointer user_data)
   char ** dir;
   gint id;
   LttvTraceset * traceset;
-  mainWindow * mw_data = get_window_data_struct(widget);
+  MainWindow * mw_data = get_window_data_struct(widget);
   GtkFileSelection * file_selector = 
     (GtkFileSelection *)gtk_file_selection_new("Select a traceset");
 
@@ -203,7 +202,7 @@ void add_trace(GtkWidget * widget, gpointer user_data)
   LttvTraceset * traceset;
   char * dir;
   gint id;
-  mainWindow * mw_data = get_window_data_struct(widget);
+  MainWindow * mw_data = get_window_data_struct(widget);
   GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace");
   gtk_dir_selection_hide_fileop_buttons(file_selector);
   
@@ -215,16 +214,16 @@ void add_trace(GtkWidget * widget, gpointer user_data)
       trace = ltt_trace_open(dir);
       if(trace == NULL) g_critical("cannot open trace %s", dir);
       trace_v = lttv_trace_new(trace);
-      traceset = mw_data->Traceset_Info->traceset;
-      if(mw_data->Traceset_Info->TracesetContext != NULL){
-	lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext));
-	g_object_unref(mw_data->Traceset_Info->TracesetContext);
+      traceset = mw_data->traceset_info->traceset;
+      if(mw_data->traceset_info->traceset_context != NULL){
+	lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->traceset_info->traceset_context));
+	g_object_unref(mw_data->traceset_info->traceset_context);
       }
       lttv_traceset_add(traceset, trace_v);
-      mw_data->Traceset_Info->TracesetContext =
+      mw_data->traceset_info->traceset_context =
   	g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
       lttv_context_init(
-	LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext),traceset);      
+	LTTV_TRACESET_CONTEXT(mw_data->traceset_info->traceset_context),traceset);      
     case GTK_RESPONSE_REJECT:
     case GTK_RESPONSE_CANCEL:
     default:
@@ -242,12 +241,12 @@ void remove_trace(GtkWidget * widget, gpointer user_data)
   LttvTraceset * traceset;
   gint i, nb_trace;
   char ** name, *remove_trace_name;
-  mainWindow * mw_data = get_window_data_struct(widget);
+  MainWindow * mw_data = get_window_data_struct(widget);
   
-  nb_trace =lttv_traceset_number(mw_data->Traceset_Info->traceset); 
+  nb_trace =lttv_traceset_number(mw_data->traceset_info->traceset); 
   name = g_new(char*,nb_trace);
   for(i = 0; i < nb_trace; i++){
-    trace_v = lttv_traceset_get(mw_data->Traceset_Info->traceset, i);
+    trace_v = lttv_traceset_get(mw_data->traceset_info->traceset, i);
     trace = lttv_trace(trace_v);
     name[i] = trace->pathname;
   }
@@ -257,16 +256,16 @@ void remove_trace(GtkWidget * widget, gpointer user_data)
   if(remove_trace_name){
     for(i=0; i<nb_trace; i++){
       if(strcmp(remove_trace_name,name[i]) == 0){
-	traceset = mw_data->Traceset_Info->traceset;
-	if(mw_data->Traceset_Info->TracesetContext != NULL){
-	  lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext));
-	  g_object_unref(mw_data->Traceset_Info->TracesetContext);
+	traceset = mw_data->traceset_info->traceset;
+	if(mw_data->traceset_info->traceset_context != NULL){
+	  lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->traceset_info->traceset_context));
+	  g_object_unref(mw_data->traceset_info->traceset_context);
 	}
 	lttv_traceset_remove(traceset, i);
-	mw_data->Traceset_Info->TracesetContext =
+	mw_data->traceset_info->traceset_context =
 	  g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
 	lttv_context_init(
-	  LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext),traceset);      
+	  LTTV_TRACESET_CONTEXT(mw_data->traceset_info->traceset_context),traceset);      
 	break;
       }
     }
@@ -360,7 +359,7 @@ void
 on_close_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+  MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
   main_window_destructor(mw_data);  
 }
 
@@ -371,23 +370,23 @@ on_close_tab_activate                  (GtkMenuItem     *menuitem,
 {
   int count = 0;
   GtkWidget * notebook;
-  tab * tmp;
-  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+  Tab * tmp;
+  MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
   notebook = lookup_widget((GtkWidget*)menuitem, "MNotebook");
   if(notebook == NULL){
     g_printf("Notebook does not exist\n");
     return;
   }
   
-  if(mw_data->Tab == mw_data->CurrentTab){
-    //    tmp = mw_data->CurrentTab;
-    //    mw_data->Tab = mw_data->CurrentTab->Next;
+  if(mw_data->tab == mw_data->current_tab){
+    //    tmp = mw_data->current_tb;
+    //    mw_data->tab = mw_data->current_tab->next;
     g_printf("The default TAB can not be deleted\n");
     return;
   }else{
-    tmp = mw_data->Tab;
-    while(tmp != mw_data->CurrentTab){
-      tmp = tmp->Next;
+    tmp = mw_data->tab;
+    while(tmp != mw_data->current_tab){
+      tmp = tmp->next;
       count++;
     }
   }
@@ -539,7 +538,7 @@ on_load_module_activate                (GtkMenuItem     *menuitem,
   char ** dir;
   gint id;
   char str[PATH_LENGTH], *str1;
-  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+  MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
   GtkFileSelection * file_selector = (GtkFileSelection *)gtk_file_selection_new("Select a module");
   gtk_file_selection_hide_fileop_buttons(file_selector);
   
@@ -556,8 +555,8 @@ on_load_module_activate                (GtkMenuItem     *menuitem,
 	str1 = strrchr(str,'\\');
 	str1++;
       }
-      if(mw_data->winCreationData)
-	lttv_module_load(str1, mw_data->winCreationData->argc,mw_data->winCreationData->argv);
+      if(mw_data->win_creation_data)
+	lttv_module_load(str1, mw_data->win_creation_data->argc,mw_data->win_creation_data->argv);
       else
 	lttv_module_load(str1, 0,NULL);
       g_slist_foreach(g_main_window_list, insert_menu_toolbar_item, NULL);
@@ -580,7 +579,7 @@ on_unload_module_activate              (GtkMenuItem     *menuitem,
   char **name, *unload_module_name;
   guint nb;
   LttvModule ** modules, *module;
-  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+  MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
   
   modules = lttv_module_list(&nb);
   name  = g_new(char*, nb);
@@ -612,7 +611,7 @@ on_add_module_search_path_activate     (GtkMenuItem     *menuitem,
   char * dir;
   gint id;
 
-  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+  MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
 
   id = gtk_dialog_run(GTK_DIALOG(file_selector));
   switch(id){
@@ -784,7 +783,7 @@ void
 on_MWindow_destroy                     (GtkObject       *object,
                                         gpointer         user_data)
 {
-  mainWindow *Main_Window = (mainWindow*)user_data;
+  MainWindow *Main_Window = (MainWindow*)user_data;
   
   g_printf("There are : %d windows\n",g_slist_length(g_main_window_list));
 
@@ -800,14 +799,14 @@ on_MNotebook_switch_page               (GtkNotebook     *notebook,
                                         guint            page_num,
                                         gpointer         user_data)
 {
-  mainWindow * mw = get_window_data_struct((GtkWidget*)notebook);
-  tab * Tab = mw->Tab;
+  MainWindow * mw = get_window_data_struct((GtkWidget*)notebook);
+  Tab * tab = mw->tab;
  
   while(page_num){
-    Tab = Tab->Next;
+    tab = tab->next;
     page_num--;
   }
-  mw->CurrentTab = Tab;
+  mw->current_tab = tab;
 }
 
 char * get_remove_trace(char ** all_trace_name, int nb_trace)
@@ -901,7 +900,7 @@ void main_window_destroy_hash_data(gpointer data)
 }
 
 
-void insert_menu_toolbar_item(mainWindow * mw, gpointer user_data)
+void insert_menu_toolbar_item(MainWindow * mw, gpointer user_data)
 {
   int i;
   GdkPixbuf *pixbuf;
@@ -924,7 +923,7 @@ void insert_menu_toolbar_item(mainWindow * mw, gpointer user_data)
       tmp = g_hash_table_lookup(mw->hash_menu_item, g_strdup(menu_item->menuText));
       if(tmp)continue;
       constructor = menu_item->con;
-      tool_menu_title_menu = lookup_widget(mw->MWindow,"ToolMenuTitle_menu");
+      tool_menu_title_menu = lookup_widget(mw->mwindow,"ToolMenuTitle_menu");
       insert_view = gtk_menu_item_new_with_mnemonic (menu_item->menuText);
       gtk_widget_show (insert_view);
       gtk_container_add (GTK_CONTAINER (tool_menu_title_menu), insert_view);
@@ -946,7 +945,7 @@ void insert_menu_toolbar_item(mainWindow * mw, gpointer user_data)
       tmp = g_hash_table_lookup(mw->hash_toolbar_item, g_strdup(toolbar_item->tooltip));
       if(tmp)continue;
       constructor = toolbar_item->con;
-      tool_menu_title_menu = lookup_widget(mw->MWindow,"MToolbar2");
+      tool_menu_title_menu = lookup_widget(mw->mwindow,"MToolbar2");
       pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**)toolbar_item->pixmap);
       pixmap = gtk_image_new_from_pixbuf(pixbuf);
       insert_view = gtk_toolbar_append_element (GTK_TOOLBAR (tool_menu_title_menu),
@@ -965,18 +964,18 @@ void insert_menu_toolbar_item(mainWindow * mw, gpointer user_data)
   }
 }
 
-void construct_main_window(mainWindow * parent, WindowCreationData * win_creation_data,
+void construct_main_window(MainWindow * parent, WindowCreationData * win_creation_data,
 		      gboolean first_window)
 {
   g_critical("construct_main_window()");
   GtkWidget  * new_window; /* New generated main window */
-  mainWindow * new_m_window;/* New main window structure */
+  MainWindow * new_m_window;/* New main window structure */
   GtkNotebook * notebook;
   LttvIAttribute *attributes =
 	  LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
   LttvAttributeValue value;
          
-  new_m_window = g_new(mainWindow, 1);
+  new_m_window = g_new(MainWindow, 1);
 
   // Add the object's information to the module's array 
   g_main_window_list = g_slist_append(g_main_window_list, new_m_window);
@@ -985,78 +984,78 @@ void construct_main_window(mainWindow * parent, WindowCreationData * win_creatio
   new_window  = create_MWindow();
   gtk_widget_show (new_window);
     
-  new_m_window->Attributes = attributes;
+  new_m_window->attributes = attributes;
   
-  new_m_window->Traceset_Info = g_new(TracesetInfo,1);
-  new_m_window->Traceset_Info->path = NULL ;
+  new_m_window->traceset_info = g_new(TracesetInfo,1);
+  new_m_window->traceset_info->path = NULL ;
 
 
-  new_m_window->Traceset_Info->before_traceset = lttv_hooks_new();
-  new_m_window->Traceset_Info->after_traceset = lttv_hooks_new();
-  new_m_window->Traceset_Info->before_trace = lttv_hooks_new();
-  new_m_window->Traceset_Info->after_trace = lttv_hooks_new();
-  new_m_window->Traceset_Info->before_tracefile = lttv_hooks_new();
-  new_m_window->Traceset_Info->after_tracefile = lttv_hooks_new();
-  new_m_window->Traceset_Info->before_event = lttv_hooks_new();
-  new_m_window->Traceset_Info->after_event = lttv_hooks_new();
+  new_m_window->traceset_info->before_traceset = lttv_hooks_new();
+  new_m_window->traceset_info->after_traceset = lttv_hooks_new();
+  new_m_window->traceset_info->before_trace = lttv_hooks_new();
+  new_m_window->traceset_info->after_trace = lttv_hooks_new();
+  new_m_window->traceset_info->before_tracefile = lttv_hooks_new();
+  new_m_window->traceset_info->after_tracefile = lttv_hooks_new();
+  new_m_window->traceset_info->before_event = lttv_hooks_new();
+  new_m_window->traceset_info->after_event = lttv_hooks_new();
 
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/before",
       LTTV_POINTER, &value));
-  *(value.v_pointer) = new_m_window->Traceset_Info->before_traceset;
+  *(value.v_pointer) = new_m_window->traceset_info->before_traceset;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/after",
       LTTV_POINTER, &value));
-  *(value.v_pointer) = new_m_window->Traceset_Info->after_traceset;
+  *(value.v_pointer) = new_m_window->traceset_info->after_traceset;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/before",
       LTTV_POINTER, &value));
-  *(value.v_pointer) = new_m_window->Traceset_Info->before_trace;
+  *(value.v_pointer) = new_m_window->traceset_info->before_trace;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/after",
       LTTV_POINTER, &value));
-  *(value.v_pointer) = new_m_window->Traceset_Info->after_trace;
+  *(value.v_pointer) = new_m_window->traceset_info->after_trace;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/before",
       LTTV_POINTER, &value));
-  *(value.v_pointer) = new_m_window->Traceset_Info->before_tracefile;
+  *(value.v_pointer) = new_m_window->traceset_info->before_tracefile;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/after",
       LTTV_POINTER, &value));
-  *(value.v_pointer) = new_m_window->Traceset_Info->after_tracefile;
+  *(value.v_pointer) = new_m_window->traceset_info->after_tracefile;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/before",
       LTTV_POINTER, &value));
-  *(value.v_pointer) = new_m_window->Traceset_Info->before_event;
+  *(value.v_pointer) = new_m_window->traceset_info->before_event;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/after",
       LTTV_POINTER, &value));
-  *(value.v_pointer) = new_m_window->Traceset_Info->after_event;
+  *(value.v_pointer) = new_m_window->traceset_info->after_event;
  
   
-  new_m_window->MWindow = new_window;
-  new_m_window->Tab = NULL;
-  new_m_window->CurrentTab = NULL;
-  new_m_window->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
+  new_m_window->mwindow = new_window;
+  new_m_window->tab = NULL;
+  new_m_window->current_tab = NULL;
+  new_m_window->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
   if(parent){
-    new_m_window->Traceset_Info->traceset = 
-        lttv_traceset_copy(parent->Traceset_Info->traceset);
+    new_m_window->traceset_info->traceset = 
+        lttv_traceset_copy(parent->traceset_info->traceset);
     
 //FIXME copy not implemented in lower level
-    new_m_window->Traceset_Info->TracesetContext =
+    new_m_window->traceset_info->traceset_context =
   	g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
     lttv_context_init(
-	LTTV_TRACESET_CONTEXT(new_m_window->Traceset_Info->TracesetContext),
-	new_m_window->Traceset_Info->traceset);
+	LTTV_TRACESET_CONTEXT(new_m_window->traceset_info->traceset_context),
+	new_m_window->traceset_info->traceset);
   //new_m_window->traceset_context = parent->traceset_context;
-    new_m_window->winCreationData = parent->winCreationData;
+    new_m_window->win_creation_data = parent->win_creation_data;
   }else{
-    new_m_window->Traceset_Info->traceset = lttv_traceset_new();
+    new_m_window->traceset_info->traceset = lttv_traceset_new();
 
     /* Add the command line trace */
     if(g_init_trace != NULL && first_window)
-      lttv_traceset_add(new_m_window->Traceset_Info->traceset, g_init_trace);
+      lttv_traceset_add(new_m_window->traceset_info->traceset, g_init_trace);
     /* NOTE : the context must be recreated if we change the traceset,
      * ie : adding/removing traces */
-    new_m_window->Traceset_Info->TracesetContext =
+    new_m_window->traceset_info->traceset_context =
   	g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
     lttv_context_init(
-	LTTV_TRACESET_CONTEXT(new_m_window->Traceset_Info->TracesetContext),
-	new_m_window->Traceset_Info->traceset);
+	LTTV_TRACESET_CONTEXT(new_m_window->traceset_info->traceset_context),
+	new_m_window->traceset_info->traceset);
 
-    new_m_window->winCreationData = win_creation_data;
+    new_m_window->win_creation_data = win_creation_data;
   }
 
   new_m_window->hash_menu_item = g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -1071,17 +1070,17 @@ void construct_main_window(mainWindow * parent, WindowCreationData * win_creatio
   g_object_set_data(G_OBJECT(new_window), "mainWindow", (gpointer)new_m_window);    
 
   //create a default tab
-  notebook = (GtkNotebook *)lookup_widget(new_m_window->MWindow, "MNotebook");
+  notebook = (GtkNotebook *)lookup_widget(new_m_window->mwindow, "MNotebook");
   if(notebook == NULL){
     g_printf("Notebook does not exist\n");
     return;
   }
   //for now there is no name field in LttvTraceset structure
   //Use "Traceset" as the label for the default tab
-  create_tab(new_m_window->MWindow, notebook,"Traceset");
+  create_tab(new_m_window->mwindow, notebook,"Traceset");
 
   g_object_set_data_full(
-			G_OBJECT(new_m_window->MWindow),
+			G_OBJECT(new_m_window->mwindow),
 			"Main_Window_Data",
 			new_m_window,
 			(GDestroyNotify)main_window_free);
@@ -1089,20 +1088,20 @@ void construct_main_window(mainWindow * parent, WindowCreationData * win_creatio
   g_win_count++;
 }
 
-void tab_destructor(tab * tab_instance)
+void tab_destructor(Tab * tab_instance)
 {
-  if(tab_instance->Attributes)
-    g_object_unref(tab_instance->Attributes);  
+  if(tab_instance->attributes)
+    g_object_unref(tab_instance->attributes);  
 
-  if(tab_instance->mw->Tab == tab_instance){
-    tab_instance->mw->Tab = tab_instance->Next;
+  if(tab_instance->mw->tab == tab_instance){
+    tab_instance->mw->tab = tab_instance->next;
   }else{
-    tab * tmp1, *tmp = tab_instance->mw->Tab;
+    Tab * tmp1, *tmp = tab_instance->mw->tab;
     while(tmp != tab_instance){
       tmp1 = tmp;
-      tmp = tmp->Next;
+      tmp = tmp->next;
     }
-    tmp1->Next = tab_instance->Next;
+    tmp1->next = tab_instance->next;
   }
   g_free(tab_instance);
 }
@@ -1110,51 +1109,51 @@ void tab_destructor(tab * tab_instance)
 void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label)
 {
   GList * list;
-  tab * tmp_tab;
-  mainWindow * mw_data;
+  Tab * tmp_tab;
+  MainWindow * mw_data;
   LttTime tmp_time;
 
   mw_data = get_window_data_struct(parent);
-  tmp_tab = mw_data->Tab;
-  while(tmp_tab && tmp_tab->Next) tmp_tab = tmp_tab->Next;
+  tmp_tab = mw_data->tab;
+  while(tmp_tab && tmp_tab->next) tmp_tab = tmp_tab->next;
   if(!tmp_tab){
-    mw_data->CurrentTab = NULL;
-    tmp_tab = g_new(tab,1);
-    mw_data->Tab = tmp_tab;    
+    mw_data->current_tab = NULL;
+    tmp_tab = g_new(Tab,1);
+    mw_data->tab = tmp_tab;    
   }else{
-    tmp_tab->Next = g_new(tab,1);
-    tmp_tab = tmp_tab->Next;
+    tmp_tab->next = g_new(Tab,1);
+    tmp_tab = tmp_tab->next;
   }
-  if(mw_data->CurrentTab){
+  if(mw_data->current_tab){
  // Will have to read directly at the main window level, as we want
  // to be able to modify a traceset on the fly.
- //   tmp_tab->traceStartTime = mw_data->CurrentTab->traceStartTime;
- //   tmp_tab->traceEndTime   = mw_data->CurrentTab->traceEndTime;
-    tmp_tab->Time_Window      = mw_data->CurrentTab->Time_Window;
-    tmp_tab->currentTime    = mw_data->CurrentTab->currentTime;
+ //   tmp_tab->traceStartTime = mw_data->current_tab->traceStartTime;
+ //   tmp_tab->traceEndTime   = mw_data->current_tab->traceEndTime;
+    tmp_tab->time_window      = mw_data->current_tab->time_window;
+    tmp_tab->current_time     = mw_data->current_tab->current_time;
   }else{
  // Will have to read directly at the main window level, as we want
  // to be able to modify a traceset on the fly.
   //  getTracesetTimeSpan(mw_data,&tmp_tab->traceStartTime, &tmp_tab->traceEndTime);
-    tmp_tab->Time_Window.startTime   = 
-	    LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext)->Time_Span->startTime;
+    tmp_tab->time_window.start_time   = 
+	    LTTV_TRACESET_CONTEXT(mw_data->traceset_info->traceset_context)->Time_Span->startTime;
     if(DEFAULT_TIME_WIDTH_S <
-              LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext)->Time_Span->endTime.tv_sec)
+              LTTV_TRACESET_CONTEXT(mw_data->traceset_info->traceset_context)->Time_Span->endTime.tv_sec)
       tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S;
     else
       tmp_time.tv_sec =
-              LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext)->Time_Span->endTime.tv_sec;
+              LTTV_TRACESET_CONTEXT(mw_data->traceset_info->traceset_context)->Time_Span->endTime.tv_sec;
     tmp_time.tv_nsec = 0;
-    tmp_tab->Time_Window.Time_Width = tmp_time ;
-    tmp_tab->currentTime.tv_sec = tmp_time.tv_sec / 2;
-    tmp_tab->currentTime.tv_nsec = 0 ;
+    tmp_tab->time_window.time_width = tmp_time ;
+    tmp_tab->current_time.tv_sec = tmp_time.tv_sec / 2;
+    tmp_tab->current_time.tv_nsec = 0 ;
   }
-  tmp_tab->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
-  //  mw_data->CurrentTab = tmp_tab;
+  tmp_tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
+  //  mw_data->current_tab = tmp_tab;
   tmp_tab->custom = (GtkCustom*)gtk_custom_new();
   tmp_tab->custom->mw = mw_data;
   gtk_widget_show((GtkWidget*)tmp_tab->custom);
-  tmp_tab->Next = NULL;    
+  tmp_tab->next = NULL;    
   tmp_tab->mw   = mw_data;
 
   tmp_tab->label = gtk_label_new (label);
@@ -1173,11 +1172,11 @@ void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label)
 
 void remove_menu_item(gpointer main_win, gpointer user_data)
 {
-  mainWindow * mw = (mainWindow *) main_win;
+  MainWindow * mw = (MainWindow *) main_win;
   lttv_menu_closure *menu_item = (lttv_menu_closure *)user_data;
   GtkWidget * tool_menu_title_menu, *insert_view;
 
-  tool_menu_title_menu = lookup_widget(mw->MWindow,"ToolMenuTitle_menu");
+  tool_menu_title_menu = lookup_widget(mw->mwindow,"ToolMenuTitle_menu");
   insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_menu_item,
 						menu_item->menuText);
   if(insert_view){
@@ -1188,12 +1187,12 @@ void remove_menu_item(gpointer main_win, gpointer user_data)
 
 void remove_toolbar_item(gpointer main_win, gpointer user_data)
 {
-  mainWindow * mw = (mainWindow *) main_win;
+  MainWindow * mw = (MainWindow *) main_win;
   lttv_toolbar_closure *toolbar_item = (lttv_toolbar_closure *)user_data;
   GtkWidget * tool_menu_title_menu, *insert_view;
 
 
-  tool_menu_title_menu = lookup_widget(mw->MWindow,"MToolbar2");
+  tool_menu_title_menu = lookup_widget(mw->mwindow,"MToolbar2");
   insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_toolbar_item,
 						toolbar_item->tooltip);
   if(insert_view){