Index: Makefile.am
===================================================================
--- Makefile.am	(revision 25991)
+++ Makefile.am	(working copy)
@@ -33,8 +33,7 @@
 
 uidir = $(datadir)/Terminal
 ui_DATA = 								\
-	Terminal-toolbars.ui						\
-	Terminal.ui
+	Terminal-toolbars.ui
 
 EXTRA_DIST =								\
 	HACKING								\
Index: terminal/terminal-window-ui.xml
===================================================================
--- terminal/terminal-window-ui.xml	(revision 0)
+++ terminal/terminal-window-ui.xml	(revision 0)
@@ -0,0 +1,70 @@
+<ui>
+  <!--
+    $Id$
+
+    Copyright (c) 2004-2007 os-cillation
+  
+    Terminal User Interface description file, parsed by Terminal to create
+    the menu bar and the right click menu.
+  -->
+
+  <!-- The main menu bar -->
+  <menubar name="main-menu">
+    <menu action="file-menu">
+      <menuitem action="new-tab" />
+      <menuitem action="new-window" />
+      <separator />
+      <menuitem action="detach-tab" />
+      <separator />
+      <menuitem action="close-tab" />
+      <menuitem action="close-window" />
+    </menu>
+    <menu action="edit-menu">
+      <menuitem action="copy" />
+      <menuitem action="paste" />
+      <menuitem action="paste-selection" />
+      <separator />
+      <menuitem action="edit-toolbars" />
+      <menuitem action="preferences" />
+    </menu>
+    <menu action="view-menu">
+      <menuitem action="show-menubar" />
+      <menuitem action="show-toolbars" />
+      <menuitem action="show-borders" />
+      <menuitem action="fullscreen" />
+    </menu>
+    <menu action="terminal-menu">
+      <menuitem action="set-title" />
+      <menuitem action="reset" />
+      <menuitem action="reset-and-clear" />
+    </menu>
+    <menu action="go-menu">
+      <menuitem action="prev-tab" />
+      <menuitem action="next-tab" />
+    </menu>
+    <menu action="help-menu">
+      <menuitem action="contents" />
+      <menuitem action="report-bug" />
+      <menuitem action="about" />
+    </menu>
+  </menubar>
+
+  <!-- The right click menu -->
+  <popup name="popup-menu">
+    <menuitem action="new-window" />
+    <menuitem action="new-tab" />
+    <separator />
+    <menuitem action="copy" />
+    <menuitem action="paste" />
+    <separator />
+    <menuitem action="show-menubar" />
+    <menuitem action="fullscreen" />
+    <menuitem action="preferences" />
+    <separator />
+    <menuitem action="input-methods" />
+  </popup>
+</ui>
+
+<!--
+  vi:set ts=2 sw=2 ai et:
+-->
Index: terminal/terminal-window.c
===================================================================
--- terminal/terminal-window.c	(revision 25991)
+++ terminal/terminal-window.c	(working copy)
@@ -57,6 +57,7 @@
 #include <terminal/terminal-tab-header.h>
 #include <terminal/terminal-toolbars-view.h>
 #include <terminal/terminal-window.h>
+#include <terminal/terminal-window-ui.h>
 
 
 
@@ -286,9 +287,7 @@
   GtkWidget      *item;
   GtkWidget      *vbox;
   gboolean        bval;
-  GError         *error = NULL;
   gchar          *role;
-  gchar          *file;
 
   window->preferences = terminal_preferences_get ();
 
@@ -316,26 +315,8 @@
 
   window->ui_manager = gtk_ui_manager_new ();
   gtk_ui_manager_insert_action_group (window->ui_manager, window->action_group, 0);
-
-  xfce_resource_push_path (XFCE_RESOURCE_DATA, DATADIR);
-  file = xfce_resource_lookup (XFCE_RESOURCE_DATA, "Terminal/Terminal.ui");
-  xfce_resource_pop_path (XFCE_RESOURCE_DATA);
-
-  if (G_LIKELY (file != NULL))
-    {
-      if (gtk_ui_manager_add_ui_from_file (window->ui_manager, file, &error) == 0)
-        {
-          g_warning ("Unable to load %s: %s", file, error->message);
-          g_error_free (error);
-        }
-      gtk_ui_manager_ensure_update (window->ui_manager);
-      g_free (file);
-    }
-  else
-    {
-      g_warning ("Unable to locate Terminal/Terminal.ui, the menus won't be available");
-    }
-
+  gtk_ui_manager_add_ui_from_string (window->ui_manager, terminal_window_ui, terminal_window_ui_length, NULL);
+  
   accel_group = gtk_ui_manager_get_accel_group (window->ui_manager);
   gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
 
Index: terminal/Makefile.am
===================================================================
--- terminal/Makefile.am	(revision 25991)
+++ terminal/Makefile.am	(working copy)
@@ -42,7 +42,8 @@
 	terminal-toolbars-model.h					\
 	terminal-toolbars-view.h					\
 	terminal-widget.h						\
-	terminal-window.h
+	terminal-window.h						\
+	terminal-window-ui.h
 
 Terminal_SOURCES =							\
 	$(Terminal_built_sources)					\
@@ -94,6 +95,7 @@
 if HAVE_DBUS
 Terminal_CFLAGS +=							\
 	-DDBUS_API_SUBJECT_TO_CHANGE
+
 Terminal_SOURCES +=							\
 	$(Terminal_dbus_sources)
 endif
@@ -118,11 +120,16 @@
 DISTCLEANFILES =							\
 	stamp-terminal-enum-types.h					\
 	stamp-terminal-marshal.h					\
+	terminal-window-ui.h						\
 	$(Terminal_built_sources)
 
 BUILT_SOURCES =								\
+	terminal-window-ui.h						\
 	$(Terminal_built_sources)
 
+terminal-window-ui.h: Makefile $(srcdir)/terminal-window-ui.xml
+	exo-csource --strip-comments --strip-content --static --name=terminal_window_ui $(srcdir)/terminal-window-ui.xml > terminal-window-ui.h
+
 terminal-enum-types.h: stamp-terminal-enum-types.h
 	@true
 stamp-terminal-enum-types.h: $(Terminal_headers) Makefile
@@ -170,6 +177,7 @@
 
 EXTRA_DIST =								\
 	terminal-config.h.in						\
-	terminal-marshal.list
+	terminal-marshal.list						\
+	terminal-window-ui.xml
 
 # vi:set ts=8 sw=8 noet ai nocindent: