Merge commit 'origin/lp349874'

Conflicts:

	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/filterstests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/gtkutilstests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py

1 files changed, 27 insertions, 0 deletions

diff --git a/src/sugar/tutorius/uam/gobjectparser.py b/src/sugar/tutorius/uam/gobjectparser.py
new file mode 100644
index 0000000..c1fba3d
--- /dev/null
+++ b/src/sugar/tutorius/uam/gobjectparser.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2009, Tutorius.org
+# Copyright (C) 2009, Vincent Vinet <vince.vinet@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+"""
+UAM Parser for gobject subscheme
+
+To be completed
+"""
+
+SCHEME="gobject"
+
+def parse_gobject(parsed_uri):
+    """Do nothing for now"""
+    return parsed_uri