Remove conditional compilation of recent files

...and split chimara.menus into menus files for browser and player
windows. The conditional compilation can be removed because the bug on
OS X for which we introduced it doesn't exist anymore.

diff --git a/configure.ac b/configure.ac
index 9e73d1155372d449d84c34b3d40875d7dabe61cc..1ae23b307d326682c4588d70aaf7b33e9151102a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -85,18 +85,6 @@ AC_ARG_ENABLE([iliad],
        [enable_iliad=no])
 AM_CONDITIONAL(TARGET_ILIAD, $TEST "x$enable_iliad" = xyes)
 
-### BUILD WITHOUT RECENT FILES MANAGER #########################################
-# (to work around a bug on OS X)
-AC_ARG_ENABLE([recent],
-       [AS_HELP_STRING([--disable-recent],
-               [Omit recent files menu (to work around a bug on OS X])],
-       [],
-       [enable_recent=yes])
-AS_IF([$TEST "x$enable_recent" = "xyes"],
-       [OPEN_RECENT_MENU_ITEM="<menuitem action=\"recent\"/>"],
-       [OPEN_RECENT_MENU_ITEM="<!--  <menuitem action=\"recent\"/>-->"])
-AC_SUBST(OPEN_RECENT_MENU_ITEM)
-
 ### RPM CONFIGURATION ##########################################################
 # --enable-rpm requires rpm and rpmbuild
 AC_PATH_PROG([RPMBUILD], [rpmbuild], [notfound])
@@ -182,7 +170,6 @@ interpreters/glulxe/Makefile
 interpreters/git/Makefile
 tests/Makefile
 player/Makefile
-player/chimara.menus
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml

diff --git a/player/Makefile.am b/player/Makefile.am
index dd0d0cbafb6786f3c0dbc2e115ad95668479eccb..a8343b62ece044ebbd380d0b82a228a0eada5bc8 100644 (file)
--- a/player/Makefile.am
+++ b/player/Makefile.am
@@ -13,7 +13,7 @@ bin_PROGRAMS = chimara_iliad
 
 else
 
-dist_pkgdata_DATA = chimara.ui chimara.menus style.css
+dist_pkgdata_DATA = chimara.ui browser.menus player.menus style.css
 bin_PROGRAMS = chimara
 
 chimara_SOURCES = main.c \

diff --git a/player/browser.c b/player/browser.c
index e4b3e747228c33e0282d53b753164c0a17266b6c..4646eefddbb2169d1914916c9f20822631bf9e79 100644 (file)
--- a/player/browser.c
+++ b/player/browser.c
@@ -50,11 +50,11 @@ chimara_browser_init(ChimaraBrowser *self)
                NULL);
 
        GtkUIManager *uimanager = gtk_ui_manager_new();
-       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_DATA_DIR "/chimara.menus", &error) ) {
+       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_DATA_DIR "/browser.menus", &error) ) {
 #ifdef DEBUG
                g_error_free(error);
                error = NULL;
-               if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
+               if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/browser.menus", &error) ) {
 #endif /* DEBUG */
                        error_dialog(NULL, error, "Error while building interface: ");
                        return;

diff --git a/player/browser.menus b/player/browser.menus
new file mode 100644 (file)
index 0000000..a1151c9
--- /dev/null
+++ b/player/browser.menus
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<ui>
+  <menubar name="browser_menu">
+    <menu action="game">
+      <menuitem action="open"/>
+         <menuitem action="recent"/>
+      <separator/>
+      <menuitem action="quit_chimara"/>
+    </menu>
+    <menu action="edit">
+      <menuitem action="preferences"/>
+    </menu>
+    <menu action="help">
+      <menuitem action="about"/>
+    </menu>
+  </menubar>
+</ui>

diff --git a/player/chimara.menus.in b/player/chimara.menus.in
deleted file mode 100644 (file)
index a140a2e..0000000
--- a/player/chimara.menus.in
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<ui>
-  <menubar name="browser_menu">
-    <menu action="game">
-      <menuitem action="open"/>
-         @OPEN_RECENT_MENU_ITEM@
-      <separator/>
-      <menuitem action="quit_chimara"/>
-    </menu>
-    <menu action="edit">
-      <menuitem action="preferences"/>
-    </menu>
-    <menu action="help">
-      <menuitem action="about"/>
-    </menu>
-  </menubar>
-  <menubar name="player_menu">
-    <menu action="game">
-      <menuitem action="stop"/>
-    </menu>
-    <menu action="edit">
-      <menuitem action="copy"/>
-      <menuitem action="paste"/>
-      <separator/>
-      <menuitem action="preferences"/>
-    </menu>
-    <menu action="view">
-      <menuitem action="toolbar"/>
-    </menu>
-    <menu action="command">
-      <menuitem action="undo"/>
-      <menuitem action="save"/>
-      <menuitem action="restore"/>
-      <menuitem action="restart"/>
-      <menuitem action="quit"/>
-    </menu>
-    <menu action="help">
-      <menuitem action="about"/>
-    </menu>
-  </menubar>
-  <toolbar name="player_toolbar">
-    <toolitem action="open"/>
-    <separator/>
-    <toolitem action="restore"/>
-    <toolitem action="save"/>
-  </toolbar>
-</ui>

diff --git a/player/player.c b/player/player.c
index 0d8d629d016dfe407cf458c20f4ddec889a27e74..d8b094f236d90096be492ebbea1efdb7a4e5e9eb 100644 (file)
--- a/player/player.c
+++ b/player/player.c
@@ -132,11 +132,11 @@ chimara_player_init(ChimaraPlayer *self)
        //g_settings_bind(state_settings, "show-toolbar-default", toolbar_action, "active", G_SETTINGS_BIND_SET);
                
        GtkUIManager *uimanager = gtk_ui_manager_new();
-       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_DATA_DIR "/chimara.menus", &error) ) {
+       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_DATA_DIR "/player.menus", &error) ) {
 #ifdef DEBUG
                g_error_free(error);
                error = NULL;
-               if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
+               if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/player.menus", &error) ) {
 #endif /* DEBUG */
                        error_dialog(NULL, error, "Error while building interface: ");
                        return;

diff --git a/player/player.menus b/player/player.menus
new file mode 100644 (file)
index 0000000..3d80345
--- /dev/null
+++ b/player/player.menus
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<ui>
+  <menubar name="player_menu">
+    <menu action="game">
+      <menuitem action="stop"/>
+    </menu>
+    <menu action="edit">
+      <menuitem action="copy"/>
+      <menuitem action="paste"/>
+      <separator/>
+      <menuitem action="preferences"/>
+    </menu>
+    <menu action="view">
+      <menuitem action="toolbar"/>
+    </menu>
+    <menu action="command">
+      <menuitem action="undo"/>
+      <menuitem action="save"/>
+      <menuitem action="restore"/>
+      <menuitem action="restart"/>
+      <menuitem action="quit"/>
+    </menu>
+    <menu action="help">
+      <menuitem action="about"/>
+    </menu>
+  </menubar>
+  <toolbar name="player_toolbar">
+    <toolitem action="open"/>
+    <separator/>
+    <toolitem action="restore"/>
+    <toolitem action="save"/>
+  </toolbar>
+</ui>