[Gnash-commit] gnash ChangeLog macros/pango.m4 server/characte...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/13 12:59:33

Modified files:
        .              : ChangeLog 
        macros         : pango.m4 
        server         : character.cpp character.h 

Log message:
        * macros/pango.m4: fixed pango version detection.
        * server/character.cpp: moved ".." path reference from root handling
          back to get_relative_target_common (a workaround for non-const return
          from const method get_parent)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.630&r2=1.631
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.630
retrieving revision 1.631
diff -u -b -r1.630 -r1.631
--- ChangeLog   13 Aug 2006 12:19:15 -0000      1.630
+++ ChangeLog   13 Aug 2006 12:59:32 -0000      1.631
@@ -1,3 +1,7 @@
+2006-08-13 Patrice Dumas <address@hidden>
+
+       * macros/pango.m4: fixed pango version detection.
+
 2006-08-13  Sandro Santilli  <address@hidden>
 
        * server/character.cpp, server/character.h:

Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- macros/pango.m4     10 Aug 2006 16:46:56 -0000      1.13
+++ macros/pango.m4     13 Aug 2006 12:59:33 -0000      1.14
@@ -56,7 +56,6 @@
   dnl Attempt to find the top level directory, which unfortunately has a
   dnl version number attached. At least on Debain based systems, this
   dnl doesn't seem to get a directory that is unversioned.
-  if test x"${ac_cv_path_pango_incl}" = x; then
     AC_MSG_CHECKING([for the Pango Version])
       pathlist="/sw/include /usr/local/include /opt/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
@@ -71,7 +70,6 @@
           fi
         done
       done
-  fi                   dnl if pango_incl
 
   if test x"${gnash_pango_topdir}" = x; then
     AC_MSG_RESULT(none)
@@ -127,7 +125,9 @@
   dnl a hugly complex configure test.
   if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_lib}" = x; then
     ac_cv_path_pango_lib=`$PKG_CONFIG --libs pango`
+    if test x"$gnash_pango_version" = x; then
     gnash_pango_version=`echo ${ac_cv_path_pango_lib} | cut -f 1 -d ' ' | sed 
-e 's/-lpango-//'`
+    fi
     ac_cv_path_pango_lib="${ac_cv_path_pango_lib} 
-lpangox-${gnash_pango_version}"
   fi
 

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/character.cpp        13 Aug 2006 12:19:15 -0000      1.4
+++ server/character.cpp        13 Aug 2006 12:59:33 -0000      1.5
@@ -152,7 +152,13 @@
        {
                // Never NULL
                character* parent = get_parent();
-               assert(parent);
+               if ( ! parent )
+               {
+                       // AS code trying to access something before the root
+                       log_warning("ActionScript code trying to refrence"
+                               " before the root MovieClip");
+                       parent = this;
+               }
                return parent;
        }
        else if (name == "_level0"

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/character.h  13 Aug 2006 12:19:16 -0000      1.12
+++ server/character.h  13 Aug 2006 12:59:33 -0000      1.13
@@ -116,22 +116,12 @@
     int        get_id() const { return m_id; }
 
        /// \brief
-       /// Return the parent of this character, or 'this' if
+       /// Return the parent of this character, or NULL if
        /// the character has no parent.
        character* get_parent() const
        {
-               if ( m_parent )
-               {
                        return m_parent;
                }
-               else
-               {
-                       // AS code trying to access something before the root
-                       log_warning("ActionScript code trying to refrence"
-                               " before the root MovieClip");
-                       return this;
-               }
-       }
 
     // for extern movie
     void set_parent(character* parent) { m_parent = parent; }