Rename the module to sugar3

The old gtk-2 based module will be present in
the 0.94 branch in the sugar-toolkit.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>

103 files changed, 25 insertions, 25 deletions

diff --git a/configure.ac b/configure.ac
index 1c84fa5..a12f071 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sugar-toolkit],[0.95.1],[],[sugar-toolkit])
+AC_INIT([sugar-toolkit-gtk3],[0.95.1],[],[sugar-toolkit-gtk3])
 
 AC_PREREQ([2.59])
 
@@ -38,11 +38,11 @@ AM_GLIB_GNU_GETTEXT
 AC_OUTPUT([
 Makefile
 src/Makefile
-src/sugar/Makefile
-src/sugar/activity/Makefile
-src/sugar/bundle/Makefile
-src/sugar/graphics/Makefile
-src/sugar/presence/Makefile
-src/sugar/datastore/Makefile
+src/sugar3/Makefile
+src/sugar3/activity/Makefile
+src/sugar3/bundle/Makefile
+src/sugar3/graphics/Makefile
+src/sugar3/presence/Makefile
+src/sugar3/datastore/Makefile
 po/Makefile.in
 ])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c9a8443..ffbaa64 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
-src/sugar/activity/activity.py
-src/sugar/activity/namingalert.py
-src/sugar/activity/widgets.py
-src/sugar/graphics/alert.py
-src/sugar/graphics/colorbutton.py
-src/sugar/graphics/objectchooser.py
-src/sugar/util.py
+src/sugar3/activity/activity.py
+src/sugar3/activity/namingalert.py
+src/sugar3/activity/widgets.py
+src/sugar3/graphics/alert.py
+src/sugar3/graphics/colorbutton.py
+src/sugar3/graphics/objectchooser.py
+src/sugar3/util.py
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index a656b5a..8dd3dfe 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,6 @@
 # We don't care about these string, they are in code which we don't really
 # use and is there solely to not diverge too much from the "upstream"
 # versions of these files.
-src/sugar/eggdesktopfile.c
-src/sugar/eggsmclient.c
-src/sugar/gsm-xsmp.c
+src/sugar3/eggdesktopfile.c
+src/sugar3/eggsmclient.c
+src/sugar3/gsm-xsmp.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 4fa44db..8bfdc00 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = sugar
+SUBDIRS = sugar3
diff --git a/src/sugar/.gitignore b/src/sugar3/.gitignore
index de24e35..de24e35 100644
--- a/src/sugar/.gitignore
+++ b/src/sugar3/.gitignore
diff --git a/src/sugar/.license b/src/sugar3/.license
index 6989ebe..6989ebe 100644
--- a/src/sugar/.license
+++ b/src/sugar3/.license
diff --git a/src/sugar/Makefile.am b/src/sugar3/Makefile.am
index c1ff933..a66b741 100644
--- a/src/sugar/Makefile.am
+++ b/src/sugar3/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = activity bundle graphics presence datastore
 
-sugardir = $(pythondir)/sugar
+sugardir = $(pythondir)/sugar3
 sugar_PYTHON =		\
 	env.py		\
         network.py	\
@@ -9,7 +9,7 @@ sugar_PYTHON =		\
 	util.py		\
 	wm.py
 
-pkgpyexecdir = $(pythondir)/sugar
+pkgpyexecdir = $(pythondir)/sugar3
 
 pkgpyexec_LTLIBRARIES = _sugarext.la
 
diff --git a/src/sugar/_sugarext.defs b/src/sugar3/_sugarext.defs
index 070fb5b..070fb5b 100644
--- a/src/sugar/_sugarext.defs
+++ b/src/sugar3/_sugarext.defs
diff --git a/src/sugar/_sugarext.override b/src/sugar3/_sugarext.override
index def0927..def0927 100644
--- a/src/sugar/_sugarext.override
+++ b/src/sugar3/_sugarext.override
diff --git a/src/sugar/_sugarextmodule.c b/src/sugar3/_sugarextmodule.c
index dc5dfca..dc5dfca 100644
--- a/src/sugar/_sugarextmodule.c
+++ b/src/sugar3/_sugarextmodule.c
diff --git a/src/sugar/acme-volume-alsa.c b/src/sugar3/acme-volume-alsa.c
index 42bbf4e..42bbf4e 100644
--- a/src/sugar/acme-volume-alsa.c
+++ b/src/sugar3/acme-volume-alsa.c
diff --git a/src/sugar/acme-volume-alsa.h b/src/sugar3/acme-volume-alsa.h
index b179a24..b179a24 100644
--- a/src/sugar/acme-volume-alsa.h
+++ b/src/sugar3/acme-volume-alsa.h
diff --git a/src/sugar/acme-volume.c b/src/sugar3/acme-volume.c
index 09ae1d2..09ae1d2 100644
--- a/src/sugar/acme-volume.c
+++ b/src/sugar3/acme-volume.c
diff --git a/src/sugar/acme-volume.h b/src/sugar3/acme-volume.h
index ec5ee3d..ec5ee3d 100644
--- a/src/sugar/acme-volume.h
+++ b/src/sugar3/acme-volume.h
diff --git a/src/sugar/activity/Makefile.am b/src/sugar3/activity/Makefile.am
index 2c2eff1..50e12a5 100644
--- a/src/sugar/activity/Makefile.am
+++ b/src/sugar3/activity/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/sugar/activity
+sugardir = $(pythondir)/sugar3/activity
 sugar_PYTHON =              \
 	__init__.py             \
 	activity.py             \
diff --git a/src/sugar/activity/__init__.py b/src/sugar3/activity/__init__.py
index b69646c..b69646c 100644
--- a/src/sugar/activity/__init__.py
+++ b/src/sugar3/activity/__init__.py
diff --git a/src/sugar/activity/activity.py b/src/sugar3/activity/activity.py
index 6548b61..6548b61 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar3/activity/activity.py
diff --git a/src/sugar/activity/activityfactory.py b/src/sugar3/activity/activityfactory.py
index a206d15..a206d15 100644
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar3/activity/activityfactory.py
diff --git a/src/sugar/activity/activityhandle.py b/src/sugar3/activity/activityhandle.py
index b29973e..b29973e 100644
--- a/src/sugar/activity/activityhandle.py
+++ b/src/sugar3/activity/activityhandle.py
diff --git a/src/sugar/activity/activityservice.py b/src/sugar3/activity/activityservice.py
index 3fafe8a..3fafe8a 100644
--- a/src/sugar/activity/activityservice.py
+++ b/src/sugar3/activity/activityservice.py
diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py
index 65105ab..65105ab 100644
--- a/src/sugar/activity/bundlebuilder.py
+++ b/src/sugar3/activity/bundlebuilder.py
diff --git a/src/sugar/activity/i18n.py b/src/sugar3/activity/i18n.py
index 1ddbd79..1ddbd79 100644
--- a/src/sugar/activity/i18n.py
+++ b/src/sugar3/activity/i18n.py
diff --git a/src/sugar/activity/main.py b/src/sugar3/activity/main.py
index d2a9302..d2a9302 100644
--- a/src/sugar/activity/main.py
+++ b/src/sugar3/activity/main.py
diff --git a/src/sugar/activity/namingalert.py b/src/sugar3/activity/namingalert.py
index 078c27a..078c27a 100644
--- a/src/sugar/activity/namingalert.py
+++ b/src/sugar3/activity/namingalert.py
diff --git a/src/sugar/activity/widgets.py b/src/sugar3/activity/widgets.py
index e5c4063..e5c4063 100644
--- a/src/sugar/activity/widgets.py
+++ b/src/sugar3/activity/widgets.py
diff --git a/src/sugar/bundle/Makefile.am b/src/sugar3/bundle/Makefile.am
index 50c93de..50b5681 100644
--- a/src/sugar/bundle/Makefile.am
+++ b/src/sugar3/bundle/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/sugar/bundle
+sugardir = $(pythondir)/sugar3/bundle
 sugar_PYTHON =				\
 	__init__.py			\
 	bundle.py			\
diff --git a/src/sugar/bundle/__init__.py b/src/sugar3/bundle/__init__.py
index 85ebced..85ebced 100644
--- a/src/sugar/bundle/__init__.py
+++ b/src/sugar3/bundle/__init__.py
diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar3/bundle/activitybundle.py
index 542fa00..542fa00 100644
--- a/src/sugar/bundle/activitybundle.py
+++ b/src/sugar3/bundle/activitybundle.py
diff --git a/src/sugar/bundle/bundle.py b/src/sugar3/bundle/bundle.py
index e61a0b6..e61a0b6 100644
--- a/src/sugar/bundle/bundle.py
+++ b/src/sugar3/bundle/bundle.py
diff --git a/src/sugar/bundle/bundleversion.py b/src/sugar3/bundle/bundleversion.py
index e763231..e763231 100644
--- a/src/sugar/bundle/bundleversion.py
+++ b/src/sugar3/bundle/bundleversion.py
diff --git a/src/sugar/bundle/contentbundle.py b/src/sugar3/bundle/contentbundle.py
index e4f6eb1..e4f6eb1 100644
--- a/src/sugar/bundle/contentbundle.py
+++ b/src/sugar3/bundle/contentbundle.py
diff --git a/src/sugar/datastore/Makefile.am b/src/sugar3/datastore/Makefile.am
index 81d760c..63a1136 100644
--- a/src/sugar/datastore/Makefile.am
+++ b/src/sugar3/datastore/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/sugar/datastore
+sugardir = $(pythondir)/sugar3/datastore
 sugar_PYTHON =		\
 	__init__.py	\
 	datastore.py
diff --git a/src/sugar/datastore/__init__.py b/src/sugar3/datastore/__init__.py
index bdb658b..bdb658b 100644
--- a/src/sugar/datastore/__init__.py
+++ b/src/sugar3/datastore/__init__.py
diff --git a/src/sugar/datastore/datastore.py b/src/sugar3/datastore/datastore.py
index ed05634..ed05634 100644
--- a/src/sugar/datastore/datastore.py
+++ b/src/sugar3/datastore/datastore.py
diff --git a/src/sugar/eggaccelerators.c b/src/sugar3/eggaccelerators.c
index 0487db0..0487db0 100644
--- a/src/sugar/eggaccelerators.c
+++ b/src/sugar3/eggaccelerators.c
diff --git a/src/sugar/eggaccelerators.h b/src/sugar3/eggaccelerators.h
index 96d5390..96d5390 100644
--- a/src/sugar/eggaccelerators.h
+++ b/src/sugar3/eggaccelerators.h
diff --git a/src/sugar/eggdesktopfile.c b/src/sugar3/eggdesktopfile.c
index d095a2f..d095a2f 100644
--- a/src/sugar/eggdesktopfile.c
+++ b/src/sugar3/eggdesktopfile.c
diff --git a/src/sugar/eggdesktopfile.h b/src/sugar3/eggdesktopfile.h
index 270aec8..270aec8 100644
--- a/src/sugar/eggdesktopfile.h
+++ b/src/sugar3/eggdesktopfile.h
diff --git a/src/sugar/eggsmclient-private.h b/src/sugar3/eggsmclient-private.h
index d2958c9..d2958c9 100644
--- a/src/sugar/eggsmclient-private.h
+++ b/src/sugar3/eggsmclient-private.h
diff --git a/src/sugar/eggsmclient-xsmp.c b/src/sugar3/eggsmclient-xsmp.c
index 2a9532a..2a9532a 100644
--- a/src/sugar/eggsmclient-xsmp.c
+++ b/src/sugar3/eggsmclient-xsmp.c
diff --git a/src/sugar/eggsmclient.c b/src/sugar3/eggsmclient.c
index a59cea0..a59cea0 100644
--- a/src/sugar/eggsmclient.c
+++ b/src/sugar3/eggsmclient.c
diff --git a/src/sugar/eggsmclient.h b/src/sugar3/eggsmclient.h
index 52d85de..52d85de 100644
--- a/src/sugar/eggsmclient.h
+++ b/src/sugar3/eggsmclient.h
diff --git a/src/sugar/env.py b/src/sugar3/env.py
index e681f4f..e681f4f 100644
--- a/src/sugar/env.py
+++ b/src/sugar3/env.py
diff --git a/src/sugar/graphics/Makefile.am b/src/sugar3/graphics/Makefile.am
index 7334288..a4bc0b0 100644
--- a/src/sugar/graphics/Makefile.am
+++ b/src/sugar3/graphics/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/sugar/graphics
+sugardir = $(pythondir)/sugar3/graphics
 sugar_PYTHON =              \
 	alert.py                \
 	animator.py             \
diff --git a/src/sugar/graphics/__init__.py b/src/sugar3/graphics/__init__.py
index 1e7e0f9..1e7e0f9 100644
--- a/src/sugar/graphics/__init__.py
+++ b/src/sugar3/graphics/__init__.py
diff --git a/src/sugar/graphics/alert.py b/src/sugar3/graphics/alert.py
index b5aa0c0..b5aa0c0 100644
--- a/src/sugar/graphics/alert.py
+++ b/src/sugar3/graphics/alert.py
diff --git a/src/sugar/graphics/animator.py b/src/sugar3/graphics/animator.py
index 8fb298b..8fb298b 100644
--- a/src/sugar/graphics/animator.py
+++ b/src/sugar3/graphics/animator.py
diff --git a/src/sugar/graphics/canvastextview.py b/src/sugar3/graphics/canvastextview.py
index 853af9f..853af9f 100644
--- a/src/sugar/graphics/canvastextview.py
+++ b/src/sugar3/graphics/canvastextview.py
diff --git a/src/sugar/graphics/colorbutton.py b/src/sugar3/graphics/colorbutton.py
index 1fed96d..1fed96d 100644
--- a/src/sugar/graphics/colorbutton.py
+++ b/src/sugar3/graphics/colorbutton.py
diff --git a/src/sugar/graphics/combobox.py b/src/sugar3/graphics/combobox.py
index 09554e5..09554e5 100644
--- a/src/sugar/graphics/combobox.py
+++ b/src/sugar3/graphics/combobox.py
diff --git a/src/sugar/graphics/entry.py b/src/sugar3/graphics/entry.py
index 6afafa0..6afafa0 100644
--- a/src/sugar/graphics/entry.py
+++ b/src/sugar3/graphics/entry.py
diff --git a/src/sugar/graphics/icon.py b/src/sugar3/graphics/icon.py
index 62a79f6..62a79f6 100644
--- a/src/sugar/graphics/icon.py
+++ b/src/sugar3/graphics/icon.py
diff --git a/src/sugar/graphics/iconentry.py b/src/sugar3/graphics/iconentry.py
index c652331..c652331 100644
--- a/src/sugar/graphics/iconentry.py
+++ b/src/sugar3/graphics/iconentry.py
diff --git a/src/sugar/graphics/menuitem.py b/src/sugar3/graphics/menuitem.py
index 655f7cc..655f7cc 100644
--- a/src/sugar/graphics/menuitem.py
+++ b/src/sugar3/graphics/menuitem.py
diff --git a/src/sugar/graphics/notebook.py b/src/sugar3/graphics/notebook.py
index 603b7c9..603b7c9 100644
--- a/src/sugar/graphics/notebook.py
+++ b/src/sugar3/graphics/notebook.py
diff --git a/src/sugar/graphics/objectchooser.py b/src/sugar3/graphics/objectchooser.py
index af9142d..af9142d 100644
--- a/src/sugar/graphics/objectchooser.py
+++ b/src/sugar3/graphics/objectchooser.py
diff --git a/src/sugar/graphics/palette.py b/src/sugar3/graphics/palette.py
index 46f167b..46f167b 100644
--- a/src/sugar/graphics/palette.py
+++ b/src/sugar3/graphics/palette.py
diff --git a/src/sugar/graphics/palettegroup.py b/src/sugar3/graphics/palettegroup.py
index 3f39163..3f39163 100644
--- a/src/sugar/graphics/palettegroup.py
+++ b/src/sugar3/graphics/palettegroup.py
diff --git a/src/sugar/graphics/palettewindow.py b/src/sugar3/graphics/palettewindow.py
index 5281e54..5281e54 100644
--- a/src/sugar/graphics/palettewindow.py
+++ b/src/sugar3/graphics/palettewindow.py
diff --git a/src/sugar/graphics/panel.py b/src/sugar3/graphics/panel.py
index 441e7a9..441e7a9 100644
--- a/src/sugar/graphics/panel.py
+++ b/src/sugar3/graphics/panel.py
diff --git a/src/sugar/graphics/radiopalette.py b/src/sugar3/graphics/radiopalette.py
index 8199165..8199165 100644
--- a/src/sugar/graphics/radiopalette.py
+++ b/src/sugar3/graphics/radiopalette.py
diff --git a/src/sugar/graphics/radiotoolbutton.py b/src/sugar3/graphics/radiotoolbutton.py
index b5fabf2..b5fabf2 100644
--- a/src/sugar/graphics/radiotoolbutton.py
+++ b/src/sugar3/graphics/radiotoolbutton.py
diff --git a/src/sugar/graphics/roundbox.py b/src/sugar3/graphics/roundbox.py
index 75141f0..75141f0 100644
--- a/src/sugar/graphics/roundbox.py
+++ b/src/sugar3/graphics/roundbox.py
diff --git a/src/sugar/graphics/style.py b/src/sugar3/graphics/style.py
index 7f48d9a..7f48d9a 100644
--- a/src/sugar/graphics/style.py
+++ b/src/sugar3/graphics/style.py
diff --git a/src/sugar/graphics/toggletoolbutton.py b/src/sugar3/graphics/toggletoolbutton.py
index 012c2b0..012c2b0 100644
--- a/src/sugar/graphics/toggletoolbutton.py
+++ b/src/sugar3/graphics/toggletoolbutton.py
diff --git a/src/sugar/graphics/toolbarbox.py b/src/sugar3/graphics/toolbarbox.py
index 60e030e..60e030e 100644
--- a/src/sugar/graphics/toolbarbox.py
+++ b/src/sugar3/graphics/toolbarbox.py
diff --git a/src/sugar/graphics/toolbox.py b/src/sugar3/graphics/toolbox.py
index 9790a49..9790a49 100644
--- a/src/sugar/graphics/toolbox.py
+++ b/src/sugar3/graphics/toolbox.py
diff --git a/src/sugar/graphics/toolbutton.py b/src/sugar3/graphics/toolbutton.py
index 25833b6..25833b6 100644
--- a/src/sugar/graphics/toolbutton.py
+++ b/src/sugar3/graphics/toolbutton.py
diff --git a/src/sugar/graphics/toolcombobox.py b/src/sugar3/graphics/toolcombobox.py
index 1b2fdb0..1b2fdb0 100644
--- a/src/sugar/graphics/toolcombobox.py
+++ b/src/sugar3/graphics/toolcombobox.py
diff --git a/src/sugar/graphics/tray.py b/src/sugar3/graphics/tray.py
index fb98d89..fb98d89 100644
--- a/src/sugar/graphics/tray.py
+++ b/src/sugar3/graphics/tray.py
diff --git a/src/sugar/graphics/window.py b/src/sugar3/graphics/window.py
index dbac464..dbac464 100644
--- a/src/sugar/graphics/window.py
+++ b/src/sugar3/graphics/window.py
diff --git a/src/sugar/graphics/xocolor.py b/src/sugar3/graphics/xocolor.py
index 395e345..395e345 100644
--- a/src/sugar/graphics/xocolor.py
+++ b/src/sugar3/graphics/xocolor.py
diff --git a/src/sugar/gsm-app.c b/src/sugar3/gsm-app.c
index 96b65ce..96b65ce 100644
--- a/src/sugar/gsm-app.c
+++ b/src/sugar3/gsm-app.c
diff --git a/src/sugar/gsm-app.h b/src/sugar3/gsm-app.h
index 038caee..038caee 100644
--- a/src/sugar/gsm-app.h
+++ b/src/sugar3/gsm-app.h
diff --git a/src/sugar/gsm-client-xsmp.c b/src/sugar3/gsm-client-xsmp.c
index 632dec9..632dec9 100644
--- a/src/sugar/gsm-client-xsmp.c
+++ b/src/sugar3/gsm-client-xsmp.c
diff --git a/src/sugar/gsm-client-xsmp.h b/src/sugar3/gsm-client-xsmp.h
index 46e34a5..46e34a5 100644
--- a/src/sugar/gsm-client-xsmp.h
+++ b/src/sugar3/gsm-client-xsmp.h
diff --git a/src/sugar/gsm-client.c b/src/sugar3/gsm-client.c
index 31554d4..31554d4 100644
--- a/src/sugar/gsm-client.c
+++ b/src/sugar3/gsm-client.c
diff --git a/src/sugar/gsm-client.h b/src/sugar3/gsm-client.h
index 4cfd7ed..4cfd7ed 100644
--- a/src/sugar/gsm-client.h
+++ b/src/sugar3/gsm-client.h
diff --git a/src/sugar/gsm-session.c b/src/sugar3/gsm-session.c
index 6430a94..6430a94 100644
--- a/src/sugar/gsm-session.c
+++ b/src/sugar3/gsm-session.c
diff --git a/src/sugar/gsm-session.h b/src/sugar3/gsm-session.h
index 31d2762..31d2762 100644
--- a/src/sugar/gsm-session.h
+++ b/src/sugar3/gsm-session.h
diff --git a/src/sugar/gsm-xsmp.c b/src/sugar3/gsm-xsmp.c
index aa9dff1..aa9dff1 100644
--- a/src/sugar/gsm-xsmp.c
+++ b/src/sugar3/gsm-xsmp.c
diff --git a/src/sugar/gsm-xsmp.h b/src/sugar3/gsm-xsmp.h
index b4b535f..b4b535f 100644
--- a/src/sugar/gsm-xsmp.h
+++ b/src/sugar3/gsm-xsmp.h
diff --git a/src/sugar/network.py b/src/sugar3/network.py
index 217c077..217c077 100644
--- a/src/sugar/network.py
+++ b/src/sugar3/network.py
diff --git a/src/sugar/presence/Makefile.am b/src/sugar3/presence/Makefile.am
index 6d87fe7..7322ecb 100644
--- a/src/sugar/presence/Makefile.am
+++ b/src/sugar3/presence/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/sugar/presence
+sugardir = $(pythondir)/sugar3/presence
 sugar_PYTHON =			\
 	__init__.py		\
 	activity.py		\
diff --git a/src/sugar/presence/__init__.py b/src/sugar3/presence/__init__.py
index 9756612..9756612 100644
--- a/src/sugar/presence/__init__.py
+++ b/src/sugar3/presence/__init__.py
diff --git a/src/sugar/presence/activity.py b/src/sugar3/presence/activity.py
index 750a73c..750a73c 100644
--- a/src/sugar/presence/activity.py
+++ b/src/sugar3/presence/activity.py
diff --git a/src/sugar/presence/buddy.py b/src/sugar3/presence/buddy.py
index eaba3e3..eaba3e3 100644
--- a/src/sugar/presence/buddy.py
+++ b/src/sugar3/presence/buddy.py
diff --git a/src/sugar/presence/connectionmanager.py b/src/sugar3/presence/connectionmanager.py
index 502b7a8..502b7a8 100644
--- a/src/sugar/presence/connectionmanager.py
+++ b/src/sugar3/presence/connectionmanager.py
diff --git a/src/sugar/presence/presenceservice.py b/src/sugar3/presence/presenceservice.py
index b6c581e..b6c581e 100644
--- a/src/sugar/presence/presenceservice.py
+++ b/src/sugar3/presence/presenceservice.py
diff --git a/src/sugar/presence/sugartubeconn.py b/src/sugar3/presence/sugartubeconn.py
index 954ef67..954ef67 100644
--- a/src/sugar/presence/sugartubeconn.py
+++ b/src/sugar3/presence/sugartubeconn.py
diff --git a/src/sugar/presence/test_presence.txt b/src/sugar3/presence/test_presence.txt
index d0736a9..d0736a9 100644
--- a/src/sugar/presence/test_presence.txt
+++ b/src/sugar3/presence/test_presence.txt
diff --git a/src/sugar/presence/tubeconn.py b/src/sugar3/presence/tubeconn.py
index 1014a46..1014a46 100644
--- a/src/sugar/presence/tubeconn.py
+++ b/src/sugar3/presence/tubeconn.py
diff --git a/src/sugar/profile.py b/src/sugar3/profile.py
index c1dffd7..c1dffd7 100644
--- a/src/sugar/profile.py
+++ b/src/sugar3/profile.py
diff --git a/src/sugar/session.py b/src/sugar3/session.py
index 4ebc590..4ebc590 100644
--- a/src/sugar/session.py
+++ b/src/sugar3/session.py
diff --git a/src/sugar/sugar-grid.c b/src/sugar3/sugar-grid.c
index 3fa7de5..3fa7de5 100644
--- a/src/sugar/sugar-grid.c
+++ b/src/sugar3/sugar-grid.c
diff --git a/src/sugar/sugar-grid.h b/src/sugar3/sugar-grid.h
index d493a60..d493a60 100644
--- a/src/sugar/sugar-grid.h
+++ b/src/sugar3/sugar-grid.h
diff --git a/src/sugar/sugar-key-grabber.c b/src/sugar3/sugar-key-grabber.c
index 8a00a80..8a00a80 100644
--- a/src/sugar/sugar-key-grabber.c
+++ b/src/sugar3/sugar-key-grabber.c
diff --git a/src/sugar/sugar-key-grabber.h b/src/sugar3/sugar-key-grabber.h
index ab02870..ab02870 100644
--- a/src/sugar/sugar-key-grabber.h
+++ b/src/sugar3/sugar-key-grabber.h
diff --git a/src/sugar/sugar-marshal.list b/src/sugar3/sugar-marshal.list
index cb5ec08..cb5ec08 100644
--- a/src/sugar/sugar-marshal.list
+++ b/src/sugar3/sugar-marshal.list
diff --git a/src/sugar/sugar-menu.c b/src/sugar3/sugar-menu.c
index f19dc4b..f19dc4b 100644
--- a/src/sugar/sugar-menu.c
+++ b/src/sugar3/sugar-menu.c
diff --git a/src/sugar/sugar-menu.h b/src/sugar3/sugar-menu.h
index 74ce891..74ce891 100644
--- a/src/sugar/sugar-menu.h
+++ b/src/sugar3/sugar-menu.h
diff --git a/src/sugar/util.py b/src/sugar3/util.py
index baec3b1..baec3b1 100644
--- a/src/sugar/util.py
+++ b/src/sugar3/util.py
diff --git a/src/sugar/wm.py b/src/sugar3/wm.py
index 8f1903f..8f1903f 100644
--- a/src/sugar/wm.py
+++ b/src/sugar3/wm.py