diff options
| author | Sebastian Silva <sebastian@sugarlabs.org> | 2011-07-30 05:46:54 (GMT) |
|---|---|---|
| committer | Sebastian Silva <sebastian@sugarlabs.org> | 2011-07-30 05:46:54 (GMT) |
| commit | 3b339eec82dee31d697daa6a2d5e692c6b5b372b (patch) | |
| tree | 6e02f10cf1e27cbac245b9d5e8b06051a9e82eea | |
| parent | 7583e144f3f875b739498eba3659d7d85ac80373 (diff) | |
| parent | d7e9cf36e1a949d3281fe7fe344e5c7efb59518e (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/screencast/screencast
Conflicts:
activity/screencast-icon.svg
pippy_app.py
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | activity/activity.info | 2 | ||||
| -rw-r--r-- | activity/screencast-icon.svg | 1 | ||||
| -rw-r--r-- | pippy_app.py | 1 |
4 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +3 + +*Fix for olpcau-#792 friendler journal name (seabstian silva sebastian@somosazucar.org) +*adding git ignore (sebastian silva sebastian@somosazucar.org) + 2 *New icon diff --git a/activity/activity.info b/activity/activity.info index e40af2b..3e033ca 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -4,5 +4,5 @@ bundle_id = org.laptop.Screencast service_name = org.laptop.Screencast class = pippy_app.ScreencastActivity icon = screencast-icon -activity_version = 2 +activity_version = 3 show_launcher = yes diff --git a/activity/screencast-icon.svg b/activity/screencast-icon.svg index 43ddba7..c2b487c 100644 --- a/activity/screencast-icon.svg +++ b/activity/screencast-icon.svg @@ -11,6 +11,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg2" diff --git a/pippy_app.py b/pippy_app.py index 6e07cce..5cbde7d 100644 --- a/pippy_app.py +++ b/pippy_app.py @@ -95,7 +95,6 @@ class ScreencastActivity(ViewSourceActivity): # Status label. self.status = gtk.Label(_("Status: Stopped")) - hbox.pack_start(self.record, expand=False, padding=40) hbox.pack_start(self.stop, expand=False, padding=40) |
