thomasvs - in flumotion/branches/platform-3: . doc/random flumotion/common flumotion/ui

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Tue May  8 14:54:17 2007
New Revision: 4885

Modified:
   flumotion/branches/platform-3/   (props changed)
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/Makefile.am
   flumotion/branches/platform-3/doc/random/release
   flumotion/branches/platform-3/flumotion/common/common.py
   flumotion/branches/platform-3/flumotion/ui/glade.py
Log:
Merged revisions 4738-4739,4741 via svnmerge from 
https://svn.fluendo.com/svn/flumotion/trunk

........
  r4738 | msmith | 2007-04-04 11:55:40 +0200 (Wed, 04 Apr 2007) | 4 lines
  
          * flumotion/common/common.py:
            This function is deprecated, not depreciated.
........
  r4739 | wingo | 2007-04-04 11:56:40 +0200 (Wed, 04 Apr 2007) | 6 lines
  
  2007-04-04  Andy Wingo  <wingo at pobox.com>
  
  	* flumotion/ui/glade.py (flumotion_glade_custom_handler): Add a
  	comment.
........
  r4741 | thomasvs | 2007-04-04 18:55:13 +0200 (Wed, 04 Apr 2007) | 1 line
  
  dist RELEASE
........


Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Tue May  8 14:54:17 2007
@@ -1,3 +1,12 @@
+2007-05-08  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	Patch by: Michael Smith, Andy Wingo
+	merged from: trunk, 4739-4740, 4741
+	* flumotion/ui/glade.py (flumotion_glade_custom_handler): Add a
+	comment.
+	* flumotion/common/common.py:
+	  This function is deprecated, not depreciated.
+
 2007-04-30  Andy Wingo  <wingo at pobox.com>
 
 	* flumotion/twisted/portal.py (BouncerPortal.login): Return an

Modified: flumotion/branches/platform-3/Makefile.am
==============================================================================
--- flumotion/branches/platform-3/Makefile.am	(original)
+++ flumotion/branches/platform-3/Makefile.am	Tue May  8 14:54:17 2007
@@ -11,6 +11,7 @@
 
 EXTRA_DIST = \
 	env.in \
+	RELEASE \
 	LICENSE.GPL \
 	LICENSE.Flumotion \
 	flumotion.spec \

Modified: flumotion/branches/platform-3/doc/random/release
==============================================================================
--- flumotion/branches/platform-3/doc/random/release	(original)
+++ flumotion/branches/platform-3/doc/random/release	Tue May  8 14:54:17 2007
@@ -26,4 +26,4 @@
   using bin/data-put
 * fix up ticket list to do and milestone (trac)
 * add news entry on site (edit flumotion.net/src/htdocs/news/news.xml, then commit)
-* send out mail, see https://apestaart.org/thomas/trac/browser/src/moap/trunk/README. Example: moap doap -f ~/svn/flumotion-0.4.x/flumotion.doap -v 0.3.2 mail -f msmith at fluendo.com flumotion-devel at lists.fluendo.com
+* send out mail, see https://apestaart.org/thomas/trac/browser/src/moap/trunk/README. Example: moap doap -f ~/svn/flumotion-0.4.x/flumotion.doap -v 0.3.2 mail -f msmith at fluendo.com flumotion-devel at lists.fluendo.com theora at xiph.org

Modified: flumotion/branches/platform-3/flumotion/common/common.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/common/common.py	(original)
+++ flumotion/branches/platform-3/flumotion/common/common.py	Tue May  8 14:54:17 2007
@@ -510,7 +510,7 @@
     """
     Create a path string out of the name of a component and its parent.
 
-    @depreciated: Use @componentId instead
+    @deprecated: Use @componentId instead
     """
     return '/%s/%s' % (parentName, componentName)
 

Modified: flumotion/branches/platform-3/flumotion/ui/glade.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/ui/glade.py	(original)
+++ flumotion/branches/platform-3/flumotion/ui/glade.py	Tue May  8 14:54:17 2007
@@ -63,6 +63,11 @@
         raise RuntimeError('Failed call %s in module %s: %s'
                            % (code, module, msg))
     w.set_name(name)
+    # using custom widgets seems to bypass all property settings from
+    # the xml, so widgets are created as hidden. this show() call was
+    # added as a convenience, but sometimes it is irritating. end
+    # result, if you want to have an initially-hidden widget, hide it
+    # just after calling GladeBacked.__init__().
     w.show()
     return w
 # FIXME: what does this do ?