[Commits] sugar-update-control branch master updated.

[C. Scott Ananian]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "/home/cscott/public_git/sugar-update-control".

The branch, master has been updated
       via  0af964c6a7f227c4c172065f1b397f01dda3b706 (commit)
       via  86536999cb30c5c03c08c66e9a0341a61a7e3c84 (commit)
       via  5cc68cf91f436a1c17a7cd24b644e55cb7d79db1 (commit)
      from  28680039e654edbbee651861f421dc77f21d2da7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

 bitfrost/{ => update}/__init__.py |    0 
 debian/control                    |    2 +-
 src/view.py                       |   13 +------------
 3 files changed, 2 insertions(+), 13 deletions(-)
 copy bitfrost/{ => update}/__init__.py (100%)

- Log -----------------------------------------------------------------
commit 0af964c6a7f227c4c172065f1b397f01dda3b706
Author: C. Scott Ananian <cscott at laptop.org>
Date:   Wed Dec 17 15:02:43 2008 -0500

    Debian packaging: New sugar-update-control can't be used with old sugar.

diff --git a/debian/control b/debian/control
index 97104b5..80e2914 100755
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: python-support (>= 0.6), debhelper (>= 5)
 
 Package: sugar-update-control
 Architecture: all
-Depends: ${python:Depends}, sugar
+Depends: ${python:Depends}, sugar (>= 0.83.0)
 #Provides: ${python:Provides}
 Description: Activity update control panel for Sugar.
  This package contains a control panel for the Sugar graphical environment

commit 86536999cb30c5c03c08c66e9a0341a61a7e3c84
Author: C. Scott Ananian <cscott at laptop.org>
Date:   Wed Dec 17 14:58:54 2008 -0500

    Re-add bitfrost/update/__init__.py, accidentally removed by dsd.
    
    This was removed in bf43f5062152b6d3bc3b15f53dc2d29fddea3146 and broke
    the RPM packaging.

diff --git a/bitfrost/update/__init__.py b/bitfrost/update/__init__.py
new file mode 100644
index 0000000..e69de29

commit 5cc68cf91f436a1c17a7cd24b644e55cb7d79db1
Author: C. Scott Ananian <cscott at laptop.org>
Date:   Wed Dec 17 14:53:27 2008 -0500

    Use gobject's markup escape function, instead of our home-grown one.

diff --git a/src/view.py b/src/view.py
index a1f9c12..049fee5 100755
--- a/src/view.py
+++ b/src/view.py
@@ -61,18 +61,7 @@ TITLE = _('Software update')
 _DEBUG_VIEW_ALL=False
 """View even activities with no pending updates."""
 
-def _escape_markup(s):
-    """Escape special characters in `s` so that it is safe to use in
-    Pango markup.  Equivalent to `g_markup_escape_text` in glib."""
-    entities = { '&': '&amp;',
-                 '<': '&lt;',
-                 '>': '&gt;',
-                 '"': '&quot;',
-                 "'": '&apos;', }
-    if s is None: return None
-    return re.sub("[&<>\"']", lambda m: entities[m.group(0)],
-                  s.decode('utf-8','ignore')).encode('utf-8')
-_e = _escape_markup
+_e = gobject.markup_escape_text
 """Useful abbreviation."""
 
 def _make_button(label_text, stock=None, name=None):
-----------------------------------------------------------------------


--
/home/cscott/public_git/sugar-update-control