[Gnash-commit] gnash ChangeLog Makefile.am server/edit_text_ch...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/10 22:51:07

Modified files:
        .              : ChangeLog Makefile.am 
        server         : edit_text_character.cpp 

Log message:
        * Makefile.am: replaced backend/ with gui/
        * server/edit_text_character.cpp: fixed tu_string => std::string 
attempt bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.486&r2=1.487
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -b -r1.486 -r1.487
--- ChangeLog   10 Jul 2006 16:20:15 -0000      1.486
+++ ChangeLog   10 Jul 2006 22:51:07 -0000      1.487
@@ -1,5 +1,8 @@
 2006-07-10 Sandro Santilli <address@hidden>
 
+       * Makefile.am: replaced backend/ with gui/
+       * server/edit_text_character.cpp: fixed tu_string => std::string
+       attempt bug.
        * testsuite/actionscript.all/swf_exists.exp:
        use gprocessor -v rather then backend/gnash (we/re moving to gui).
        clean up also <file>.swf.frame0.pp (new preprocessor output name

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Makefile.am 23 May 2006 07:59:21 -0000      1.24
+++ Makefile.am 10 Jul 2006 22:51:07 -0000      1.25
@@ -37,7 +37,7 @@
 AUTOMAKE_OPTIONS = dejagnu
 ACLOCAL_AMFLAGS = -I macros
 
-STD_DIRS = libbase libgeometry server backend utilities # gui
+STD_DIRS = libbase libgeometry server gui utilities # backend
 
 if PLUGIN
 PLUGIN_DIRS = plugin
@@ -50,7 +50,7 @@
 SUBDIRS      = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS)
 
 # libamf isn't used yet, but we still want it in the distribution
-DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf plugin gui
+DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf plugin 
 
 #EXTRA_DIST = macros
 # if HTTP

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/edit_text_character.cpp      10 Jul 2006 13:47:12 -0000      1.6
+++ server/edit_text_character.cpp      10 Jul 2006 22:51:07 -0000      1.7
@@ -157,7 +157,7 @@
 
                case event_id::KEY_PRESS:
                {
-                       std::string s = m_text;
+                       std::string s(m_text.c_str());
                        std::string c;
                        c = (char) id.m_key_code;