X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FmainWin%2Fsrc%2Fcallbacks.c;h=b38072057c7e773be11d2fdcfc256cd3629f4a4c;hb=86e73802a690fcfd694b581020d0932bda380e70;hp=44f5e61c3b866ec297a83f51bfdff27a4e1a4a82;hpb=f7afe191fd58f0bf4bab9c9514c261535b99d32b;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 44f5e61c..b3807205 100644
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
@@ -30,9 +30,10 @@ static int gWinCount = 0;
 
 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);
 void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label);
 
-/* test part */
 void insertView(GtkWidget* widget, view_constructor constructor);
 
 enum
@@ -41,16 +42,6 @@ enum
   N_COLUMNS
 };
 
-void
-on_textview1_grab_focus                     (GtkTextView     *text_view,
-					  gpointer         user_data)
-{
-  GtkWidget * widget;
-  GtkCustom * custom = (GtkCustom*)user_data;
-  widget = gtk_widget_get_parent((GtkWidget*)text_view);
-  widget = gtk_widget_get_parent(widget);
-  gtk_custom_set_focus((GtkWidget*)custom, (gpointer)widget);
-}
 
 void
 insertViewTest(GtkMenuItem *menuitem, gpointer user_data)
@@ -60,43 +51,6 @@ insertViewTest(GtkMenuItem *menuitem, gpointer user_data)
   //  selected_hook(&val);
 }
 
-void
-on_insert_viewer_test_activate         (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-  GtkWidget *scrolledwindow1, *textview1, *label;
-  static int count = 0;
-  char str[64];
-  GtkCustom * custom;
-  GtkTextBuffer* buf;
-  
-  mainWindow * mwData;  
-  mwData = get_window_data_struct((GtkWidget*)menuitem);
-  if(!mwData->CurrentTab) return;
-  custom = mwData->CurrentTab->custom;
-
-  sprintf(str,"label : %d",++count);
-  scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow1);
-  label = gtk_label_new(str);
-  gtk_widget_show(label);
-
-  gtk_custom_widget_add(custom, scrolledwindow1);
-  gtk_widget_set_size_request ((GtkWidget*)scrolledwindow1, 800, 100);
-  
-  textview1 = gtk_text_view_new ();
-  gtk_widget_show (textview1);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow1), textview1);
-  buf =  gtk_text_view_get_buffer((GtkTextView*)textview1);
-  sprintf(str,"text view : %d",count);
-  gtk_text_buffer_set_text(buf,str, -1);
-  
-  g_signal_connect ((gpointer) textview1, "grab_focus",
-		    G_CALLBACK (on_textview1_grab_focus), custom);
-}
-
-/* end of test part */
-
 
 /* internal functions */
 void insertView(GtkWidget* widget, view_constructor constructor)
@@ -183,12 +137,12 @@ void createNewWindow(GtkWidget* widget, gpointer user_data, gboolean clone)
 {
   mainWindow * parent = get_window_data_struct(widget);
 
-  constructMainWin(parent, NULL);
-
   if(clone){
     g_printf("Clone : use the same traceset\n");
+    constructMainWin(parent, NULL, FALSE);
   }else{
     g_printf("Empty : traceset is set to NULL\n");
+    constructMainWin(NULL, parent->winCreationData, FALSE);
   }
 }
 
@@ -215,16 +169,110 @@ void delete_viewer(GtkWidget * widget, gpointer user_data)
 
 void open_traceset(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Open a trace set\n");
+  char ** dir;
+  gint id;
+  LttvTraceset * traceset;
+  mainWindow * mwData = get_window_data_struct(widget);
+  GtkFileSelection * fileSelector = 
+    (GtkFileSelection *)gtk_file_selection_new("Select a traceset");
+
+  gtk_file_selection_hide_fileop_buttons(fileSelector);
+  
+  id = gtk_dialog_run(GTK_DIALOG(fileSelector));
+  switch(id){
+    case GTK_RESPONSE_ACCEPT:
+    case GTK_RESPONSE_OK:
+      dir = gtk_file_selection_get_selections (fileSelector);
+      traceset = lttv_traceset_load(dir[0]);
+      g_printf("Open a trace set %s\n", dir[0]); 
+      //Not finished yet
+      g_strfreev(dir);
+    case GTK_RESPONSE_REJECT:
+    case GTK_RESPONSE_CANCEL:
+    default:
+      gtk_widget_destroy((GtkWidget*)fileSelector);
+      break;
+  }
+
 }
 
 void add_trace(GtkWidget * widget, gpointer user_data)
 {
+  LttTrace *trace;
+  LttvTrace * trace_v;
+  LttvTraceset * traceset;
+  char * dir;
+  gint id;
+  mainWindow * mwData = get_window_data_struct(widget);
+  GtkDirSelection * fileSelector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace");
+  gtk_dir_selection_hide_fileop_buttons(fileSelector);
+  
+  id = gtk_dialog_run(GTK_DIALOG(fileSelector));
+  switch(id){
+    case GTK_RESPONSE_ACCEPT:
+    case GTK_RESPONSE_OK:
+      dir = gtk_dir_selection_get_dir (fileSelector);
+      trace = ltt_trace_open(dir);
+      if(trace == NULL) g_critical("cannot open trace %s", dir);
+      trace_v = lttv_trace_new(trace);
+      traceset = mwData->Traceset_Info->traceset;
+      if(mwData->Traceset_Info->TracesetContext != NULL){
+	lttv_context_fini(LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext));
+	g_object_unref(mwData->Traceset_Info->TracesetContext);
+      }
+      lttv_traceset_add(traceset, trace_v);
+      mwData->Traceset_Info->TracesetContext =
+  	g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
+      lttv_context_init(
+	LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext),traceset);      
+    case GTK_RESPONSE_REJECT:
+    case GTK_RESPONSE_CANCEL:
+    default:
+      gtk_widget_destroy((GtkWidget*)fileSelector);
+      break;
+  }
+
   g_printf("add a trace to a trace set\n");
 }
 
 void remove_trace(GtkWidget * widget, gpointer user_data)
 {
+  LttTrace *trace;
+  LttvTrace * trace_v;
+  LttvTraceset * traceset;
+  gint i, nb_trace;
+  char ** name, *remove_trace_name;
+  mainWindow * mwData = get_window_data_struct(widget);
+  
+  nb_trace =lttv_traceset_number(mwData->Traceset_Info->traceset); 
+  name = g_new(char*,nb_trace);
+  for(i = 0; i < nb_trace; i++){
+    trace_v = lttv_traceset_get(mwData->Traceset_Info->traceset, i);
+    trace = lttv_trace(trace_v);
+    name[i] = trace->pathname;
+  }
+
+  remove_trace_name = get_remove_trace(name, nb_trace);
+
+  if(remove_trace_name){
+    for(i=0; i<nb_trace; i++){
+      if(strcmp(remove_trace_name,name[i]) == 0){
+	traceset = mwData->Traceset_Info->traceset;
+	if(mwData->Traceset_Info->TracesetContext != NULL){
+	  lttv_context_fini(LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext));
+	  g_object_unref(mwData->Traceset_Info->TracesetContext);
+	}
+	lttv_traceset_remove(traceset, i);
+	mwData->Traceset_Info->TracesetContext =
+	  g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
+	lttv_context_init(
+	  LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext),traceset);      
+	break;
+      }
+    }
+  }
+
+  g_free(name);
   g_printf("remove a trace from a trace set\n");
 }
 
@@ -312,7 +360,8 @@ void
 on_close_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Close\n");
+  mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
+  mainWindow_Destructor(mwData);  
 }
 
 
@@ -320,7 +369,30 @@ void
 on_close_tab_activate                  (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Close tab\n");
+  int count = 0;
+  GtkWidget * notebook;
+  tab * tmp;
+  mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
+  notebook = lookup_widget((GtkWidget*)menuitem, "MNotebook");
+  if(notebook == NULL){
+    g_printf("Notebook does not exist\n");
+    return;
+  }
+  
+  if(mwData->Tab == mwData->CurrentTab){
+    //    tmp = mwData->CurrentTab;
+    //    mwData->Tab = mwData->CurrentTab->Next;
+    g_printf("The default TAB can not be deleted\n");
+    return;
+  }else{
+    tmp = mwData->Tab;
+    while(tmp != mwData->CurrentTab){
+      tmp = tmp->Next;
+      count++;
+    }
+  }
+
+  gtk_notebook_remove_page((GtkNotebook*)notebook, count);  
 }
 
 
@@ -360,8 +432,7 @@ void
 on_quit_activate                       (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
-  mainWindow_Destructor(mwData);  
+  gtk_main_quit ();
 }
 
 
@@ -467,7 +538,7 @@ on_load_module_activate                (GtkMenuItem     *menuitem,
 {
   char ** dir;
   gint id;
-  char str[PATH_LENGTH];
+  char str[PATH_LENGTH], *str1;
   mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
   GtkFileSelection * fileSelector = (GtkFileSelection *)gtk_file_selection_new("Select a module");
   gtk_file_selection_hide_fileop_buttons(fileSelector);
@@ -479,10 +550,17 @@ on_load_module_activate                (GtkMenuItem     *menuitem,
     case GTK_RESPONSE_OK:
       dir = gtk_file_selection_get_selections (fileSelector);
       sprintf(str,dir[0]);
+      str1 = strrchr(str,'/');
+      if(str1)str1++;
+      else{
+	str1 = strrchr(str,'\\');
+	str1++;
+      }
       if(mwData->winCreationData)
-	lttv_module_load(str, mwData->winCreationData->argc,mwData->winCreationData->argv);
+	lttv_module_load(str1, mwData->winCreationData->argc,mwData->winCreationData->argv);
       else
-	lttv_module_load(str, 0,NULL);
+	lttv_module_load(str1, 0,NULL);
+      g_slist_foreach(Main_Window_List, insertMenuToolbarItem, NULL);
       g_strfreev(dir);
     case GTK_RESPONSE_REJECT:
     case GTK_RESPONSE_CANCEL:
@@ -732,7 +810,19 @@ on_MNotebook_switch_page               (GtkNotebook     *notebook,
   mw->CurrentTab = Tab;
 }
 
+char * get_remove_trace(char ** all_trace_name, int nb_trace)
+{
+  return get_selection(all_trace_name, nb_trace, 
+		       "Select a trace", "Trace pathname");
+}
 char * get_unload_module(char ** loaded_module_name, int nb_module)
+{
+  return get_selection(loaded_module_name, nb_module, 
+		       "Select an unload module", "Module pathname");
+}
+
+char * get_selection(char ** loaded_module_name, int nb_module,
+		     char *title, char * column_title)
 {
   GtkWidget         * dialogue;
   GtkWidget         * scroll_win;
@@ -745,7 +835,7 @@ char * get_unload_module(char ** loaded_module_name, int nb_module)
   gint                id, i;
   char              * unload_module_name = NULL;
 
-  dialogue = gtk_dialog_new_with_buttons("Select an unload module",
+  dialogue = gtk_dialog_new_with_buttons(title,
 					 NULL,
 					 GTK_DIALOG_MODAL,
 					 GTK_STOCK_OK,GTK_RESPONSE_ACCEPT,
@@ -764,7 +854,7 @@ char * get_unload_module(char ** loaded_module_name, int nb_module)
   g_object_unref (G_OBJECT (store));
 		
   renderer = gtk_cell_renderer_text_new ();
-  column   = gtk_tree_view_column_new_with_attributes ("MODULE NAME",
+  column   = gtk_tree_view_column_new_with_attributes (column_title,
 						     renderer,
 						     "text", MODULE_COLUMN,
 						     NULL);
@@ -801,7 +891,17 @@ char * get_unload_module(char ** loaded_module_name, int nb_module)
   return unload_module_name;
 }
 
-void insertMenuToolbarItem(mainWindow * mw)
+void main_window_destroy_hash_key(gpointer key)
+{
+  g_free(key);
+}
+
+void main_window_destroy_hash_data(gpointer data)
+{
+}
+
+
+void insertMenuToolbarItem(mainWindow * mw, gpointer user_data)
 {
   int i;
   GdkPixbuf *pixbuf;
@@ -812,7 +912,7 @@ void insertMenuToolbarItem(mainWindow * mw)
   lttv_toolbar_closure *toolbarItem;
   LttvAttributeValue value;
   LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
-  GtkWidget * ToolMenuTitle_menu, *insert_view, *pixmap;
+  GtkWidget * ToolMenuTitle_menu, *insert_view, *pixmap, *tmp;
 
   g_assert(lttv_iattribute_find_by_path(attributes,
 	   "viewers/menu", LTTV_POINTER, &value));
@@ -821,6 +921,8 @@ void insertMenuToolbarItem(mainWindow * mw)
   if(menu){
     for(i=0;i<menu->len;i++){
       menuItem = &g_array_index(menu, lttv_menu_closure, i);
+      tmp = g_hash_table_lookup(mw->hash_menu_item, g_strdup(menuItem->menuText));
+      if(tmp)continue;
       constructor = menuItem->con;
       ToolMenuTitle_menu = lookup_widget(mw->MWindow,"ToolMenuTitle_menu");
       insert_view = gtk_menu_item_new_with_mnemonic (menuItem->menuText);
@@ -829,6 +931,8 @@ void insertMenuToolbarItem(mainWindow * mw)
       g_signal_connect ((gpointer) insert_view, "activate",
 			G_CALLBACK (insertViewTest),
 			constructor);  
+      g_hash_table_insert(mw->hash_menu_item, g_strdup(menuItem->menuText),
+			  insert_view);
     }
   }
 
@@ -839,6 +943,8 @@ void insertMenuToolbarItem(mainWindow * mw)
   if(toolbar){
     for(i=0;i<toolbar->len;i++){
       toolbarItem = &g_array_index(toolbar, lttv_toolbar_closure, i);
+      tmp = g_hash_table_lookup(mw->hash_toolbar_item, g_strdup(toolbarItem->tooltip));
+      if(tmp)continue;
       constructor = toolbarItem->con;
       ToolMenuTitle_menu = lookup_widget(mw->MWindow,"MToolbar2");
       pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**)toolbarItem->pixmap);
@@ -853,24 +959,23 @@ void insertMenuToolbarItem(mainWindow * mw)
       gtk_widget_show (insert_view);
       gtk_container_set_border_width (GTK_CONTAINER (insert_view), 1);
       g_signal_connect ((gpointer) insert_view, "clicked",G_CALLBACK (insertViewTest),constructor);       
+      g_hash_table_insert(mw->hash_toolbar_item, g_strdup(toolbarItem->tooltip),
+			  insert_view);
     }
   }
 }
 
-void constructMainWin(mainWindow * parent, WindowCreationData * win_creation_data)
+void constructMainWin(mainWindow * parent, WindowCreationData * win_creation_data,
+		      gboolean first_window)
 {
   g_critical("constructMainWin()");
-  //  systemView * sv = NULL; /* System view */
-  //systemView * newSv;     /* New system view displayed in the new window */
   GtkWidget  * newWindow; /* New generated main window */
   mainWindow * newMWindow;/* New main window structure */
   GtkNotebook * notebook;
   LttvIAttribute *attributes =
 	  LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
   LttvAttributeValue value;
-     
-  //  if(parent) sv = parent->SystemView;
-    
+         
   newMWindow = g_new(mainWindow, 1);
 
   // Add the object's information to the module's array 
@@ -880,18 +985,6 @@ void constructMainWin(mainWindow * parent, WindowCreationData * win_creation_dat
   newWindow  = create_MWindow();
   gtk_widget_show (newWindow);
     
-  //newSv = g_new(systemView, 1);
-  //  if(sv){
-  //    while(sv->Next) sv = sv->Next;
-  //    sv->Next = newSv;
-  //  }
-
-  //newSv->EventDB = NULL;
-  //newSv->SystemInfo = NULL;
-  //newSv->Options  = NULL;
-  //newSv->Next = NULL;
-  //newSv->Window = newMWindow;
-  
   newMWindow->Attributes = attributes;
   
   newMWindow->Traceset_Info = g_new(TracesetInfo,1);
@@ -936,7 +1029,6 @@ void constructMainWin(mainWindow * parent, WindowCreationData * win_creation_dat
   newMWindow->MWindow = newWindow;
   newMWindow->Tab = NULL;
   newMWindow->CurrentTab = NULL;
-  //newMWindow->SystemView = newSv;
   newMWindow->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
   if(parent){
     newMWindow->Traceset_Info->traceset = 
@@ -954,7 +1046,7 @@ void constructMainWin(mainWindow * parent, WindowCreationData * win_creation_dat
     newMWindow->Traceset_Info->traceset = lttv_traceset_new();
 
     /* Add the command line trace */
-    if(gInit_Trace != NULL)
+    if(gInit_Trace != NULL && first_window)
       lttv_traceset_add(newMWindow->Traceset_Info->traceset, gInit_Trace);
     /* NOTE : the context must be recreated if we change the traceset,
      * ie : adding/removing traces */
@@ -967,9 +1059,15 @@ void constructMainWin(mainWindow * parent, WindowCreationData * win_creation_dat
     newMWindow->winCreationData = win_creation_data;
   }
 
-  insertMenuToolbarItem(newMWindow);
+  newMWindow->hash_menu_item = g_hash_table_new_full (g_str_hash, g_str_equal,
+					      main_window_destroy_hash_key, 
+					      main_window_destroy_hash_data);
+  newMWindow->hash_toolbar_item = g_hash_table_new_full (g_str_hash, g_str_equal,
+					      main_window_destroy_hash_key, 
+					      main_window_destroy_hash_data);
+
+  insertMenuToolbarItem(newMWindow, NULL);
   
-  //g_object_set_data(G_OBJECT(newWindow), "systemView", (gpointer)newSv);    
   g_object_set_data(G_OBJECT(newWindow), "mainWindow", (gpointer)newMWindow);    
 
   //create a default tab
@@ -994,7 +1092,18 @@ void constructMainWin(mainWindow * parent, WindowCreationData * win_creation_dat
 void Tab_Destructor(tab *Tab)
 {
   if(Tab->Attributes)
-    g_object_unref(Tab->Attributes);
+    g_object_unref(Tab->Attributes);  
+
+  if(Tab->mw->Tab == Tab){
+    Tab->mw->Tab = Tab->Next;
+  }else{
+    tab * tmp1, *tmp = Tab->mw->Tab;
+    while(tmp != Tab){
+      tmp1 = tmp;
+      tmp = tmp->Next;
+    }
+    tmp1->Next = Tab->Next;
+  }
   g_free(Tab);
 }
 
@@ -1046,6 +1155,7 @@ void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label)
   tmpTab->custom->mw = mwData;
   gtk_widget_show((GtkWidget*)tmpTab->custom);
   tmpTab->Next = NULL;    
+  tmpTab->mw   = mwData;
 
   tmpTab->label = gtk_label_new (label);
   gtk_widget_show (tmpTab->label);
@@ -1060,3 +1170,87 @@ void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label)
   list = gtk_container_get_children(GTK_CONTAINER(notebook));
   gtk_notebook_set_current_page(notebook,g_list_length(list)-1);
 }
+
+void remove_menu_item(gpointer main_win, gpointer user_data)
+{
+  mainWindow * mw = (mainWindow *) main_win;
+  lttv_menu_closure *menuItem = (lttv_menu_closure *)user_data;
+  GtkWidget * ToolMenuTitle_menu, *insert_view;
+
+  ToolMenuTitle_menu = lookup_widget(mw->MWindow,"ToolMenuTitle_menu");
+  insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_menu_item,
+						menuItem->menuText);
+  if(insert_view){
+    g_hash_table_remove(mw->hash_menu_item, menuItem->menuText);
+    gtk_container_remove (GTK_CONTAINER (ToolMenuTitle_menu), insert_view);
+  }
+}
+
+void remove_toolbar_item(gpointer main_win, gpointer user_data)
+{
+  mainWindow * mw = (mainWindow *) main_win;
+  lttv_toolbar_closure *toolbarItem = (lttv_toolbar_closure *)user_data;
+  GtkWidget * ToolMenuTitle_menu, *insert_view;
+
+
+  ToolMenuTitle_menu = lookup_widget(mw->MWindow,"MToolbar2");
+  insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_toolbar_item,
+						toolbarItem->tooltip);
+  if(insert_view){
+    g_hash_table_remove(mw->hash_toolbar_item, toolbarItem->tooltip);
+    gtk_container_remove (GTK_CONTAINER (ToolMenuTitle_menu), insert_view);
+  }
+}
+
+/**
+ * Remove menu and toolbar item when a module unloaded
+ */
+
+void main_window_remove_menu_item(lttv_constructor constructor)
+{
+  int i;
+  LttvMenus * menu;
+  lttv_menu_closure *menuItem;
+  LttvAttributeValue value;
+  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
+
+  g_assert(lttv_iattribute_find_by_path(attributes,
+	   "viewers/menu", LTTV_POINTER, &value));
+  menu = (LttvMenus*)*(value.v_pointer);
+
+  if(menu){
+    for(i=0;i<menu->len;i++){
+      menuItem = &g_array_index(menu, lttv_menu_closure, i);
+      if(menuItem->con != constructor) continue;
+      if(Main_Window_List){
+	g_slist_foreach(Main_Window_List, remove_menu_item, menuItem);
+      }
+      break;
+    }
+  }
+  
+}
+
+void main_window_remove_toolbar_item(lttv_constructor constructor)
+{
+  int i;
+  LttvToolbars * toolbar;
+  lttv_toolbar_closure *toolbarItem;
+  LttvAttributeValue value;
+  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
+
+  g_assert(lttv_iattribute_find_by_path(attributes,
+	   "viewers/toolbar", LTTV_POINTER, &value));
+  toolbar = (LttvToolbars*)*(value.v_pointer);
+
+  if(toolbar){
+    for(i=0;i<toolbar->len;i++){
+      toolbarItem = &g_array_index(toolbar, lttv_toolbar_closure, i);
+      if(toolbarItem->con != constructor) continue;
+      if(Main_Window_List){
+	g_slist_foreach(Main_Window_List, remove_toolbar_item, toolbarItem);
+      }
+      break;
+    }
+  }
+}