X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Finterface.c;h=74f0d3ef671c1d98f839cc55506a52e26be1f6dd;hb=c381e4dc228d0f404f6e505fb068289f9cbe09f8;hp=007b33e6f632df5aeecf7b22f2349a3ae1805b08;hpb=f61f4dca50e13aa52b1ca3941c8f420848f4353f;p=lttv.git

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/interface.c b/lttv/modules/gui/lttvwindow/lttvwindow/interface.c
index 007b33e6..74f0d3ef 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/interface.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/interface.c
@@ -80,7 +80,6 @@ create_MWindow (void)
   GtkWidget *ZoomIn;
   GtkWidget *ZoomOut;
   GtkWidget *ZoomExtended;
-  GtkWidget *ViewMenuSeparator;
   //  GtkWidget *GoToTime;
   //  GtkWidget *ShowTimeFrame;
   GtkWidget *ToolMenuTitle;
@@ -107,7 +106,6 @@ create_MWindow (void)
   //  GtkWidget *OptMenuSeparator;
   //  GtkWidget *OpenFilter;
   //  GtkWidget *SaveConfiguration;
-  GtkWidget *MenuHelp;
   GtkWidget *HelpMenuTitle;
   GtkWidget *HelpMenu;
   GtkWidget *Content;
@@ -133,7 +131,6 @@ create_MWindow (void)
   GtkWidget *tlbMoveViewerUp;
   GtkWidget *tlbMoveViewerDown;
   GtkWidget *tlbRemoveViewer;
-  GtkWidget *MToolbar2;
   GtkWidget *MNotebook;
   //  GtkWidget *empty_notebook_page;
   //  GtkWidget *label1;
@@ -276,10 +273,6 @@ create_MWindow (void)
   gtk_widget_show (ZoomExtended);
   gtk_container_add (GTK_CONTAINER (ViewMenuTitle_menu), ZoomExtended);
 
-  ViewMenuSeparator = gtk_menu_item_new ();
-  gtk_widget_show (ViewMenuSeparator);
-  gtk_container_add (GTK_CONTAINER (ViewMenuTitle_menu), ViewMenuSeparator);
-  gtk_widget_set_sensitive (ViewMenuSeparator, FALSE);
 /*
   GoToTime = gtk_menu_item_new_with_mnemonic ("Go to time");
   gtk_widget_show (GoToTime);
@@ -385,13 +378,10 @@ create_MWindow (void)
   gtk_widget_show (SaveConfiguration);
   gtk_container_add (GTK_CONTAINER (OptionMenuTitle_menu), SaveConfiguration);
 */
-  MenuHelp = gtk_menu_bar_new ();
-  gtk_widget_show (MenuHelp);
-  gtk_box_pack_end (GTK_BOX (MMenuBox), MenuHelp, FALSE, FALSE, 0);
 
   HelpMenuTitle = gtk_menu_item_new_with_mnemonic ("_Help");
   gtk_widget_show (HelpMenuTitle);
-  gtk_container_add (GTK_CONTAINER (MenuHelp), HelpMenuTitle);
+  gtk_container_add (GTK_CONTAINER (MenuMain), HelpMenuTitle);
 
   HelpMenu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (HelpMenuTitle), HelpMenu);
@@ -877,7 +867,6 @@ create_MWindow (void)
   GLADE_HOOKUP_OBJECT (MWindow, ZoomIn, "ZoomIn");
   GLADE_HOOKUP_OBJECT (MWindow, ZoomOut, "ZoomOut");
   GLADE_HOOKUP_OBJECT (MWindow, ZoomExtended, "ZoomExtended");
-  GLADE_HOOKUP_OBJECT (MWindow, ViewMenuSeparator, "ViewMenuSeparator");
   //  GLADE_HOOKUP_OBJECT (MWindow, GoToTime, "GoToTime");
   //  GLADE_HOOKUP_OBJECT (MWindow, ShowTimeFrame, "ShowTimeFrame");
   GLADE_HOOKUP_OBJECT (MWindow, ToolMenuTitle, "ToolMenuTitle");
@@ -904,7 +893,6 @@ create_MWindow (void)
   //  GLADE_HOOKUP_OBJECT (MWindow, OptMenuSeparator, "OptMenuSeparator");
   //  GLADE_HOOKUP_OBJECT (MWindow, OpenFilter, "OpenFilter");
   //  GLADE_HOOKUP_OBJECT (MWindow, SaveConfiguration, "SaveConfiguration");
-  GLADE_HOOKUP_OBJECT (MWindow, MenuHelp, "MenuHelp");
   GLADE_HOOKUP_OBJECT (MWindow, HelpMenuTitle, "HelpMenuTitle");
   GLADE_HOOKUP_OBJECT (MWindow, HelpMenu, "HelpMenu");
   GLADE_HOOKUP_OBJECT (MWindow, Content, "Content");