Module mainwin: clean up, following gtk convention

[lttv.git] / ltt / branches / poly / lttv / modules / gui / API / gtkTraceSet.c

diff --git a/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c b/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c
index 8d0c4d35a701e61f1c46d3d577b6f96a5deeed75..65d87b070e1107030c3e72262a54cc356953c119 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c
+++ b/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c
@@ -26,27 +26,6 @@
  * Internal function parts
  */
 
-/**
- * Function to remove toolbar from the GUI
- * @param view_constructor constructor of the viewer.
- */
-
-void RemoveToolbar(lttv_constructor view_constructor)
-{
-  g_printf("Toolbar for the viewer will be removed\n");
-}
-
-/**
- * Function to remove menu entry from the GUI
- * @param view_constructor constructor of the viewer.
- */
-
-void RemoveMenu(lttv_constructor view_constructor)
-{
-  g_printf("Menu entry for the viewer will be removed\n");
-}
-
-
 /**
  * Function to set/update traceset for the viewers
  * @param main_win main window 
@@ -136,8 +115,9 @@ void ToolbarItemUnreg(lttv_constructor view_constructor)
           "viewers/toolbar", LTTV_POINTER, &value));
   toolbar = (LttvToolbars*)*(value.v_pointer);
   
-  if(lttv_toolbars_remove(toolbar, view_constructor))
-    RemoveToolbar(view_constructor);
+  main_window_remove_toolbar_item(view_constructor);
+
+  lttv_toolbars_remove(toolbar, view_constructor);
 }
 
 
@@ -185,8 +165,9 @@ void MenuItemUnreg(lttv_constructor view_constructor)
                               "viewers/menu", LTTV_POINTER, &value));
   menu = (LttvMenus*)*(value.v_pointer);
 
-  if(lttv_menus_remove(menu, view_constructor))  
-    RemoveMenu(view_constructor);
+  main_window_remove_menu_item(view_constructor);
+
+  lttv_menus_remove(menu, view_constructor);
 }
 
 
@@ -599,7 +580,7 @@ void processTraceset(mainWindow *main_win, LttTime start,
                     LttTime end, unsigned maxNumEvents)
 {
   lttv_process_traceset_seek_time(main_win->Traceset_Info->TracesetContext, start);
-  lttv_process_trace(main_win->Traceset_Info->TracesetContext, end, maxNumEvents);
+  lttv_process_traceset(main_win->Traceset_Info->TracesetContext, end, maxNumEvents);
 }
 
 /**