[Gnash-commit] gnash configure.ac ChangeLog gui/gtk.cpp packag...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/03/29 23:55:49

Modified files:
        .              : configure.ac ChangeLog 
        gui            : gtk.cpp 
        packaging/redhat: gnash.spec 

Log message:
                * configure.ac: Add --disable-menus since an embedded systems
                probably won't want them.
                * gui/gtk.cpp: Disable most of the menu items if they're
                disabled.
                * packaging/redhat/gnash.spec: Build with --disable-menus for 
the
                OLPC. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.279&r2=1.280
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2722&r2=1.2723
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -b -r1.279 -r1.280
--- configure.ac        29 Mar 2007 06:54:09 -0000      1.279
+++ configure.ac        29 Mar 2007 23:55:49 -0000      1.280
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.279 2007/03/29 06:54:09 strk Exp $
+dnl $Id: configure.ac,v 1.280 2007/03/29 23:55:49 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -67,6 +67,19 @@
 fi
 AM_CONDITIONAL(DEBUGGER, test x$debugger = xyes)
 
+AC_ARG_ENABLE(menus,
+  AC_HELP_STRING([--disable-menus],[Disable the GUI menus]),
+[case "${enableval}" in
+  yes) menus=yes ;;
+  no)  menus=no ;;
+  *)   AC_MSG_ERROR([bad value ${enableval} for --disable-menus option]) ;;
+esac],menus=yes)
+
+if test x"$menu" = x"yes"; then
+  AC_DEFINE([USE_MENU], [], [GUI Menu support])
+fi
+AM_CONDITIONAL(MENU, test x$menu = xyes)
+
 dnl Write the file to disk in the plugin, if specified.
 AC_ARG_ENABLE(write,
   AC_HELP_STRING([--enable-write], [Makes the Mozilla plugin write the 
currently playing SWF movie to /tmp.]),
@@ -877,6 +890,7 @@
 utilities/Makefile
 doc/Makefile
 doc/C/Makefile
+doc/C/asspec/Makefile
 doc/Doxyfile
 testsuite/Makefile
 testsuite/libbase/Makefile

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2722
retrieving revision 1.2723
diff -u -b -r1.2722 -r1.2723
--- ChangeLog   29 Mar 2007 22:09:44 -0000      1.2722
+++ ChangeLog   29 Mar 2007 23:55:49 -0000      1.2723
@@ -1,5 +1,12 @@
 2007-03-29  Rob Savoye  <address@hidden>
 
+       * configure.ac: Add --disable-menus since an embedded systems
+       probably won't want them.
+       * gui/gtk.cpp: Disable most of the menu items if they're
+       disabled.
+       * packaging/redhat/gnash.spec: Build with --disable-menus for the
+       OLPC. 
+
        * doc/C/sources.xml: Fix mismatched sect tags.
        * doc/C/asspec: new directory to hold the ActionScript
        specification files, so as to not clutter the top level doc

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- gui/gtk.cpp 29 Mar 2007 20:59:45 -0000      1.78
+++ gui/gtk.cpp 29 Mar 2007 23:55:49 -0000      1.79
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.78 2007/03/29 20:59:45 nihilus Exp $ */
+/* $Id: gtk.cpp,v 1.79 2007/03/29 23:55:49 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -107,7 +107,9 @@
         _vbox = gtk_vbox_new(FALSE, 0);
         gtk_widget_show(_vbox);
         gtk_container_add(GTK_CONTAINER(_window), _vbox);
+#ifdef USE_MENUS
         createMenuBar();
+#endif
         gtk_box_pack_start(GTK_BOX(_vbox), _drawing_area, FALSE, FALSE, 0);
     }
 
@@ -327,9 +329,11 @@
 //    GtkAccelGroup *accel_group = gtk_accel_group_new();;
 //    gtk_window_add_accel_group (GTK_WINDOW (_popup_menu), accel_group);
  
+#ifdef USE_MENUS
     createFileMenu(GTK_WIDGET(_popup_menu));
     createEditMenu(GTK_WIDGET(_popup_menu));
     createControlMenu(GTK_WIDGET(_popup_menu));
+#endif
     createHelpMenu(GTK_WIDGET(_popup_menu));
     
 //     GtkMenuItem *menuitem_prefs =

Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- packaging/redhat/gnash.spec 28 Mar 2007 23:42:19 -0000      1.14
+++ packaging/redhat/gnash.spec 29 Mar 2007 23:55:49 -0000      1.15
@@ -123,7 +123,7 @@
 # targeted towards Fedora Core 6. The machine itself is too limited to
 # build RPMs on, so we do it this way.
   %if olpc
-    CROSS_OPTS="$CROSS_OPTS --disable-klash"
+    CROSS_OPTS="$CROSS_OPTS --disable-klash --disable-menus"
     SOUND="--enable-sound=sdl --with-mp3-decoder=mad --disable-static"
     RENDERER="$RENDERER --with-pixelformat=RGB565"
   %endif