Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-10-16 09:04:59 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-10-16 09:04:59 (GMT)
commit6240c1cf6fbd47da6743d4a66ebee21cf07fa6a5 (patch)
tree2c5276f5c820d2b5174bcc95cd15328adc98d7be
parent087856f23317537dbc6b112564c64db68601410e (diff)
Cleanup the source structure
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac23
-rw-r--r--lib/Makefile.am51
-rw-r--r--lib/sugar/.gitignore2
-rw-r--r--lib/sugar/.license (renamed from lib/.license)0
-rw-r--r--lib/sugar/Makefile.am74
-rw-r--r--lib/sugar/_sugarext.defs (renamed from sugar/_sugaruiext.defs)0
-rw-r--r--lib/sugar/_sugarext.override (renamed from sugar/_sugaruiext.override)0
-rw-r--r--lib/sugar/_sugarextmodule.c (renamed from sugar/_sugaruiextmodule.c)16
-rw-r--r--lib/sugar/activity/Makefile.am (renamed from sugar/activity/Makefile.am)0
-rw-r--r--lib/sugar/activity/__init__.py (renamed from sugar/activity/__init__.py)0
-rw-r--r--lib/sugar/activity/__init__py (renamed from sugar/activity/__init__py)0
-rw-r--r--lib/sugar/activity/activity.py (renamed from sugar/activity/activity.py)0
-rw-r--r--lib/sugar/activity/activityfactory.py (renamed from sugar/activity/activityfactory.py)0
-rw-r--r--lib/sugar/activity/activityhandle.py (renamed from sugar/activity/activityhandle.py)0
-rw-r--r--lib/sugar/activity/activityservice.py (renamed from sugar/activity/activityservice.py)0
-rw-r--r--lib/sugar/activity/bundlebuilder.py (renamed from sugar/activity/bundlebuilder.py)0
-rw-r--r--lib/sugar/activity/registry.py (renamed from sugar/activity/registry.py)0
-rw-r--r--lib/sugar/bundle/Makefile.am (renamed from sugar/bundle/Makefile.am)0
-rw-r--r--lib/sugar/bundle/__init__.py (renamed from sugar/bundle/__init__.py)0
-rw-r--r--lib/sugar/bundle/activitybundle.py (renamed from sugar/bundle/activitybundle.py)0
-rw-r--r--lib/sugar/bundle/bundle.py (renamed from sugar/bundle/bundle.py)0
-rw-r--r--lib/sugar/bundle/contentbundle.py (renamed from sugar/bundle/contentbundle.py)0
-rw-r--r--lib/sugar/clipboard/Makefile.am (renamed from sugar/clipboard/Makefile.am)0
-rw-r--r--lib/sugar/clipboard/__init__.py (renamed from sugar/clipboard/__init__.py)0
-rw-r--r--lib/sugar/clipboard/clipboardservice.py (renamed from sugar/clipboard/clipboardservice.py)0
-rw-r--r--lib/sugar/datastore/Makefile.am (renamed from sugar/datastore/Makefile.am)0
-rw-r--r--lib/sugar/datastore/__init__.py (renamed from sugar/datastore/__init__.py)0
-rw-r--r--lib/sugar/datastore/datastore.py (renamed from sugar/datastore/datastore.py)0
-rw-r--r--lib/sugar/datastore/dbus_helpers.py (renamed from sugar/datastore/dbus_helpers.py)0
-rw-r--r--lib/sugar/eggaccelerators.c (renamed from lib/eggaccelerators.c)0
-rw-r--r--lib/sugar/eggaccelerators.h (renamed from lib/eggaccelerators.h)0
-rw-r--r--lib/sugar/env.py (renamed from sugar/env.py)0
-rw-r--r--lib/sugar/graphics/Makefile.am (renamed from sugar/graphics/Makefile.am)0
-rw-r--r--lib/sugar/graphics/__init__.py (renamed from sugar/graphics/__init__.py)0
-rw-r--r--lib/sugar/graphics/alert.py (renamed from sugar/graphics/alert.py)0
-rw-r--r--lib/sugar/graphics/animator.py (renamed from sugar/graphics/animator.py)0
-rw-r--r--lib/sugar/graphics/combobox.py (renamed from sugar/graphics/combobox.py)0
-rw-r--r--lib/sugar/graphics/entry.py (renamed from sugar/graphics/entry.py)0
-rw-r--r--lib/sugar/graphics/icon.py (renamed from sugar/graphics/icon.py)0
-rw-r--r--lib/sugar/graphics/iconentry.py (renamed from sugar/graphics/iconentry.py)10
-rw-r--r--lib/sugar/graphics/menuitem.py (renamed from sugar/graphics/menuitem.py)0
-rw-r--r--lib/sugar/graphics/notebook.py (renamed from sugar/graphics/notebook.py)0
-rw-r--r--lib/sugar/graphics/objectchooser.py (renamed from sugar/graphics/objectchooser.py)0
-rw-r--r--lib/sugar/graphics/palette.py (renamed from sugar/graphics/palette.py)8
-rw-r--r--lib/sugar/graphics/palettegroup.py (renamed from sugar/graphics/palettegroup.py)0
-rw-r--r--lib/sugar/graphics/panel.py (renamed from sugar/graphics/panel.py)0
-rw-r--r--lib/sugar/graphics/radiotoolbutton.py (renamed from sugar/graphics/radiotoolbutton.py)0
-rw-r--r--lib/sugar/graphics/roundbox.py (renamed from sugar/graphics/roundbox.py)0
-rw-r--r--lib/sugar/graphics/spreadlayout.py (renamed from sugar/graphics/spreadlayout.py)0
-rw-r--r--lib/sugar/graphics/style.py (renamed from sugar/graphics/style.py)0
-rw-r--r--lib/sugar/graphics/toggletoolbutton.py (renamed from sugar/graphics/toggletoolbutton.py)0
-rw-r--r--lib/sugar/graphics/toolbox.py (renamed from sugar/graphics/toolbox.py)0
-rw-r--r--lib/sugar/graphics/toolbutton.py (renamed from sugar/graphics/toolbutton.py)0
-rw-r--r--lib/sugar/graphics/toolcombobox.py (renamed from sugar/graphics/toolcombobox.py)0
-rw-r--r--lib/sugar/graphics/tray.py (renamed from sugar/graphics/tray.py)0
-rw-r--r--lib/sugar/graphics/window.py (renamed from sugar/graphics/window.py)0
-rw-r--r--lib/sugar/graphics/xocolor.py (renamed from sugar/graphics/xocolor.py)0
-rw-r--r--lib/sugar/network.py (renamed from sugar/network.py)0
-rw-r--r--lib/sugar/objects/Makefile.am (renamed from sugar/objects/Makefile.am)0
-rw-r--r--lib/sugar/objects/__init__.py (renamed from sugar/objects/__init__.py)0
-rw-r--r--lib/sugar/objects/objecttype.py (renamed from sugar/objects/objecttype.py)0
-rw-r--r--lib/sugar/presence/Makefile.am (renamed from sugar/presence/Makefile.am)0
-rw-r--r--lib/sugar/presence/__init__.py (renamed from sugar/presence/__init__.py)0
-rw-r--r--lib/sugar/presence/activity.py (renamed from sugar/presence/activity.py)0
-rw-r--r--lib/sugar/presence/buddy.py (renamed from sugar/presence/buddy.py)0
-rw-r--r--lib/sugar/presence/presenceservice.py (renamed from sugar/presence/presenceservice.py)0
-rw-r--r--lib/sugar/presence/test_presence.txt (renamed from sugar/presence/test_presence.txt)0
-rw-r--r--lib/sugar/presence/tubeconn.py (renamed from sugar/presence/tubeconn.py)0
-rw-r--r--lib/sugar/profile.py (renamed from sugar/profile.py)0
-rw-r--r--lib/sugar/sexy-icon-entry.c (renamed from lib/sexy-icon-entry.c)0
-rw-r--r--lib/sugar/sexy-icon-entry.h (renamed from lib/sexy-icon-entry.h)0
-rw-r--r--lib/sugar/sugar-address-entry.c (renamed from lib/sugar-address-entry.c)0
-rw-r--r--lib/sugar/sugar-address-entry.h (renamed from lib/sugar-address-entry.h)0
-rw-r--r--lib/sugar/sugar-key-grabber.c (renamed from lib/sugar-key-grabber.c)0
-rw-r--r--lib/sugar/sugar-key-grabber.h (renamed from lib/sugar-key-grabber.h)0
-rw-r--r--lib/sugar/sugar-marshal.list (renamed from lib/sugar-marshal.list)0
-rw-r--r--lib/sugar/sugar-menu.c (renamed from lib/sugar-menu.c)0
-rw-r--r--lib/sugar/sugar-menu.h (renamed from lib/sugar-menu.h)0
-rw-r--r--lib/sugar/sugar-x11-util.c (renamed from lib/sugar-x11-util.c)0
-rw-r--r--lib/sugar/sugar-x11-util.h (renamed from lib/sugar-x11-util.h)0
-rw-r--r--lib/sugar/util.py (renamed from sugar/util.py)0
-rw-r--r--lib/sugar/wm.py (renamed from sugar/wm.py)10
-rw-r--r--shell/view/keyhandler.py2
-rw-r--r--sugar/.gitignore2
-rw-r--r--sugar/.license1
-rw-r--r--sugar/Makefile.am48
87 files changed, 110 insertions, 139 deletions
diff --git a/Makefile.am b/Makefile.am
index 7287eac..e53e118 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = bin data lib po shell sugar services
+SUBDIRS = bin data lib po shell services
bin_SCRIPTS = \
sugar-emulator
diff --git a/configure.ac b/configure.ac
index 11b7089..6eec565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,12 +19,7 @@ AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
PKG_CHECK_MODULES(SHELL, pygtk-2.0 gtk+-2.0)
-PKG_CHECK_MODULES(NATIVE_FACTORY, dbus-1)
-
-PKG_CHECK_MODULES(LIBUI, gtk+-2.0)
-PKG_CHECK_MODULES(LIBUI_BINDINGS, pygtk-2.0)
-
-PKG_CHECK_MODULES(LIB_BINDINGS, pygobject-2.0)
+PKG_CHECK_MODULES(LIB, pygtk-2.0 gtk+-2.0)
PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
AC_SUBST(PYGTK_DEFSDIR)
@@ -52,6 +47,14 @@ bin/Makefile
data/Makefile
data/icons/Makefile
lib/Makefile
+lib/sugar/Makefile
+lib/sugar/activity/Makefile
+lib/sugar/bundle/Makefile
+lib/sugar/clipboard/Makefile
+lib/sugar/graphics/Makefile
+lib/sugar/objects/Makefile
+lib/sugar/presence/Makefile
+lib/sugar/datastore/Makefile
services/Makefile
services/shell/Makefile
shell/Makefile
@@ -83,13 +86,5 @@ services/console/interface/network/Makefile
services/console/interface/logviewer/Makefile
services/console/interface/terminal/Makefile
services/console/interface/xserver/Makefile
-sugar/Makefile
-sugar/activity/Makefile
-sugar/bundle/Makefile
-sugar/clipboard/Makefile
-sugar/graphics/Makefile
-sugar/objects/Makefile
-sugar/presence/Makefile
-sugar/datastore/Makefile
po/Makefile.in
])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5c432be..4fa44db 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,50 +1 @@
-libsugarui_la_CPPFLAGS = \
- $(LIBUI_CFLAGS)
-
-noinst_LTLIBRARIES = libsugarui.la
-
-libsugarui_la_LIBADD = \
- $(LIBUI_LIBS)
-
-libsugarui_la_SOURCES = \
- $(BUILT_SOURCES) \
- eggaccelerators.c \
- eggaccelerators.h \
- sexy-icon-entry.h \
- sexy-icon-entry.c \
- sugar-address-entry.c \
- sugar-address-entry.h \
- sugar-key-grabber.c \
- sugar-key-grabber.h \
- sugar-menu.h \
- sugar-menu.c \
- sugar-x11-util.c \
- sugar-x11-util.h
-
-BUILT_SOURCES = \
- sugar-marshal.c \
- sugar-marshal.h
-
-stamp_files = \
- stamp-sugar-marshal.c \
- stamp-sugar-marshal.h
-
-sugar-marshal.c: stamp-sugar-marshal.c
- @true
-stamp-sugar-marshal.c: sugar-marshal.list
- $(GLIB_GENMARSHAL) --prefix=sugar_marshal \
- $(srcdir)/sugar-marshal.list --header --body > \
- sugar-marshal.c && echo timestamp > $(@F)
-
-sugar-marshal.h: stamp-sugar-marshal.h
- @true
-stamp-sugar-marshal.h: sugar-marshal.list
- $(GLIB_GENMARSHAL) --prefix=sugar_marshal \
- $(srcdir)/sugar-marshal.list --header > \
- sugar-marshal.h && echo timestamp > $(@F)
-
-CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
-DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
-
-EXTRA_DIST = sugar-marshal.list
+SUBDIRS = sugar
diff --git a/lib/sugar/.gitignore b/lib/sugar/.gitignore
new file mode 100644
index 0000000..f880b0e
--- /dev/null
+++ b/lib/sugar/.gitignore
@@ -0,0 +1,2 @@
+_sugarext.c
+_sugarext.c
diff --git a/lib/.license b/lib/sugar/.license
index 6989ebe..6989ebe 100644
--- a/lib/.license
+++ b/lib/sugar/.license
diff --git a/lib/sugar/Makefile.am b/lib/sugar/Makefile.am
new file mode 100644
index 0000000..a88d23a
--- /dev/null
+++ b/lib/sugar/Makefile.am
@@ -0,0 +1,74 @@
+SUBDIRS = activity bundle clipboard graphics objects presence datastore
+
+sugardir = $(pythondir)/sugar
+sugar_PYTHON = \
+ env.py \
+ network.py \
+ profile.py \
+ util.py \
+ wm.py
+
+pkgpyexecdir = $(pythondir)/sugar
+
+pkgpyexec_LTLIBRARIES = _sugarext.la
+
+_sugarext_la_CFLAGS = \
+ $(LIB_CFLAGS) \
+ $(PYTHON_INCLUDES)
+
+_sugarext_la_LDFLAGS = -module -avoid-version
+_sugarext_la_LIBADD = $(LIB_LIBS)
+
+_sugarext_la_SOURCES = \
+ $(BUILT_SOURCES) \
+ _sugarextmodule.c \
+ eggaccelerators.c \
+ eggaccelerators.h \
+ sexy-icon-entry.h \
+ sexy-icon-entry.c \
+ sugar-address-entry.c \
+ sugar-address-entry.h \
+ sugar-key-grabber.c \
+ sugar-key-grabber.h \
+ sugar-menu.h \
+ sugar-menu.c \
+ sugar-x11-util.c \
+ sugar-x11-util.h
+
+nodist__sugarext_la_SOURCES = \
+ _sugarext.c \
+ sugar-marshal.c \
+ sugar-marshal.h
+
+_sugarext.c: _sugarext.defs _sugarext.override
+
+.defs.c:
+ (cd $(srcdir)\
+ && $(PYGTK_CODEGEN) \
+ --register $(PYGTK_DEFSDIR)/gdk-types.defs \
+ --register $(PYGTK_DEFSDIR)/gtk-types.defs \
+ --override $*.override \
+ --prefix py$* $*.defs) > gen-$*.c \
+ && cp gen-$*.c $*.c \
+ && rm -f gen-$*.c
+
+stamp_files = \
+ stamp-sugar-marshal.c \
+ stamp-sugar-marshal.h
+
+sugar-marshal.c: stamp-sugar-marshal.c
+ @true
+stamp-sugar-marshal.c: sugar-marshal.list
+ $(GLIB_GENMARSHAL) --prefix=sugar_marshal \
+ $(srcdir)/sugar-marshal.list --header --body > \
+ sugar-marshal.c && echo timestamp > $(@F)
+
+sugar-marshal.h: stamp-sugar-marshal.h
+ @true
+stamp-sugar-marshal.h: sugar-marshal.list
+ $(GLIB_GENMARSHAL) --prefix=sugar_marshal \
+ $(srcdir)/sugar-marshal.list --header > \
+ sugar-marshal.h && echo timestamp > $(@F)
+
+CLEANFILES = $(stamp_files)
+EXTRA_DIST = sugar-marshal.list _sugarext.defs _sugarext.override
diff --git a/sugar/_sugaruiext.defs b/lib/sugar/_sugarext.defs
index 6a9129d..6a9129d 100644
--- a/sugar/_sugaruiext.defs
+++ b/lib/sugar/_sugarext.defs
diff --git a/sugar/_sugaruiext.override b/lib/sugar/_sugarext.override
index beeaad0..beeaad0 100644
--- a/sugar/_sugaruiext.override
+++ b/lib/sugar/_sugarext.override
diff --git a/sugar/_sugaruiextmodule.c b/lib/sugar/_sugarextmodule.c
index 719b153..6f6af6d 100644
--- a/sugar/_sugaruiextmodule.c
+++ b/lib/sugar/_sugarextmodule.c
@@ -24,25 +24,25 @@
/* include this first, before NO_IMPORT_PYGOBJECT is defined */
#include <pygobject.h>
-extern PyMethodDef py_sugaruiext_functions[];
+extern PyMethodDef py_sugarext_functions[];
-void py_sugaruiext_register_classes (PyObject *d);
-void py_sugaruiext_add_constants (PyObject *module, const gchar *strip_prefix);
+void py_sugarext_register_classes (PyObject *d);
+void py_sugarext_add_constants (PyObject *module, const gchar *strip_prefix);
DL_EXPORT(void)
-init_sugaruiext(void)
+init_sugarext(void)
{
PyObject *m, *d;
init_pygobject ();
- m = Py_InitModule ("_sugaruiext", py_sugaruiext_functions);
+ m = Py_InitModule ("_sugarext", py_sugarext_functions);
d = PyModule_GetDict (m);
- py_sugaruiext_register_classes (d);
- py_sugaruiext_add_constants(m, "SEXY_");
+ py_sugarext_register_classes (d);
+ py_sugarext_add_constants(m, "SEXY_");
if (PyErr_Occurred ()) {
- Py_FatalError ("can't initialise module _sugaruiext");
+ Py_FatalError ("can't initialise module _sugarext");
}
}
diff --git a/sugar/activity/Makefile.am b/lib/sugar/activity/Makefile.am
index 9dfc8de..9dfc8de 100644
--- a/sugar/activity/Makefile.am
+++ b/lib/sugar/activity/Makefile.am
diff --git a/sugar/activity/__init__.py b/lib/sugar/activity/__init__.py
index 8a984ad..8a984ad 100644
--- a/sugar/activity/__init__.py
+++ b/lib/sugar/activity/__init__.py
diff --git a/sugar/activity/__init__py b/lib/sugar/activity/__init__py
index e69de29..e69de29 100644
--- a/sugar/activity/__init__py
+++ b/lib/sugar/activity/__init__py
diff --git a/sugar/activity/activity.py b/lib/sugar/activity/activity.py
index c581c15..c581c15 100644
--- a/sugar/activity/activity.py
+++ b/lib/sugar/activity/activity.py
diff --git a/sugar/activity/activityfactory.py b/lib/sugar/activity/activityfactory.py
index ae08ada..ae08ada 100644
--- a/sugar/activity/activityfactory.py
+++ b/lib/sugar/activity/activityfactory.py
diff --git a/sugar/activity/activityhandle.py b/lib/sugar/activity/activityhandle.py
index f91651e..f91651e 100644
--- a/sugar/activity/activityhandle.py
+++ b/lib/sugar/activity/activityhandle.py
diff --git a/sugar/activity/activityservice.py b/lib/sugar/activity/activityservice.py
index b2f7e15..b2f7e15 100644
--- a/sugar/activity/activityservice.py
+++ b/lib/sugar/activity/activityservice.py
diff --git a/sugar/activity/bundlebuilder.py b/lib/sugar/activity/bundlebuilder.py
index c2e3278..c2e3278 100644
--- a/sugar/activity/bundlebuilder.py
+++ b/lib/sugar/activity/bundlebuilder.py
diff --git a/sugar/activity/registry.py b/lib/sugar/activity/registry.py
index a279aa9..a279aa9 100644
--- a/sugar/activity/registry.py
+++ b/lib/sugar/activity/registry.py
diff --git a/sugar/bundle/Makefile.am b/lib/sugar/bundle/Makefile.am
index f1af791..f1af791 100644
--- a/sugar/bundle/Makefile.am
+++ b/lib/sugar/bundle/Makefile.am
diff --git a/sugar/bundle/__init__.py b/lib/sugar/bundle/__init__.py
index 85ebced..85ebced 100644
--- a/sugar/bundle/__init__.py
+++ b/lib/sugar/bundle/__init__.py
diff --git a/sugar/bundle/activitybundle.py b/lib/sugar/bundle/activitybundle.py
index 8ba61fe..8ba61fe 100644
--- a/sugar/bundle/activitybundle.py
+++ b/lib/sugar/bundle/activitybundle.py
diff --git a/sugar/bundle/bundle.py b/lib/sugar/bundle/bundle.py
index 8ce3dda..8ce3dda 100644
--- a/sugar/bundle/bundle.py
+++ b/lib/sugar/bundle/bundle.py
diff --git a/sugar/bundle/contentbundle.py b/lib/sugar/bundle/contentbundle.py
index 517ee9a..517ee9a 100644
--- a/sugar/bundle/contentbundle.py
+++ b/lib/sugar/bundle/contentbundle.py
diff --git a/sugar/clipboard/Makefile.am b/lib/sugar/clipboard/Makefile.am
index 0d61c29..0d61c29 100644
--- a/sugar/clipboard/Makefile.am
+++ b/lib/sugar/clipboard/Makefile.am
diff --git a/sugar/clipboard/__init__.py b/lib/sugar/clipboard/__init__.py
index deee8dd..deee8dd 100644
--- a/sugar/clipboard/__init__.py
+++ b/lib/sugar/clipboard/__init__.py
diff --git a/sugar/clipboard/clipboardservice.py b/lib/sugar/clipboard/clipboardservice.py
index d975330..d975330 100644
--- a/sugar/clipboard/clipboardservice.py
+++ b/lib/sugar/clipboard/clipboardservice.py
diff --git a/sugar/datastore/Makefile.am b/lib/sugar/datastore/Makefile.am
index a5f16b7..a5f16b7 100644
--- a/sugar/datastore/Makefile.am
+++ b/lib/sugar/datastore/Makefile.am
diff --git a/sugar/datastore/__init__.py b/lib/sugar/datastore/__init__.py
index bdb658b..bdb658b 100644
--- a/sugar/datastore/__init__.py
+++ b/lib/sugar/datastore/__init__.py
diff --git a/sugar/datastore/datastore.py b/lib/sugar/datastore/datastore.py
index a865c30..a865c30 100644
--- a/sugar/datastore/datastore.py
+++ b/lib/sugar/datastore/datastore.py
diff --git a/sugar/datastore/dbus_helpers.py b/lib/sugar/datastore/dbus_helpers.py
index a5ce9c8..a5ce9c8 100644
--- a/sugar/datastore/dbus_helpers.py
+++ b/lib/sugar/datastore/dbus_helpers.py
diff --git a/lib/eggaccelerators.c b/lib/sugar/eggaccelerators.c
index 0a39d51..0a39d51 100644
--- a/lib/eggaccelerators.c
+++ b/lib/sugar/eggaccelerators.c
diff --git a/lib/eggaccelerators.h b/lib/sugar/eggaccelerators.h
index d2276d2..d2276d2 100644
--- a/lib/eggaccelerators.h
+++ b/lib/sugar/eggaccelerators.h
diff --git a/sugar/env.py b/lib/sugar/env.py
index 65b8b0c..65b8b0c 100644
--- a/sugar/env.py
+++ b/lib/sugar/env.py
diff --git a/sugar/graphics/Makefile.am b/lib/sugar/graphics/Makefile.am
index df2f472..df2f472 100644
--- a/sugar/graphics/Makefile.am
+++ b/lib/sugar/graphics/Makefile.am
diff --git a/sugar/graphics/__init__.py b/lib/sugar/graphics/__init__.py
index 1e7e0f9..1e7e0f9 100644
--- a/sugar/graphics/__init__.py
+++ b/lib/sugar/graphics/__init__.py
diff --git a/sugar/graphics/alert.py b/lib/sugar/graphics/alert.py
index ef93a5a..ef93a5a 100644
--- a/sugar/graphics/alert.py
+++ b/lib/sugar/graphics/alert.py
diff --git a/sugar/graphics/animator.py b/lib/sugar/graphics/animator.py
index 459851b..459851b 100644
--- a/sugar/graphics/animator.py
+++ b/lib/sugar/graphics/animator.py
diff --git a/sugar/graphics/combobox.py b/lib/sugar/graphics/combobox.py
index 5584267..5584267 100644
--- a/sugar/graphics/combobox.py
+++ b/lib/sugar/graphics/combobox.py
diff --git a/sugar/graphics/entry.py b/lib/sugar/graphics/entry.py
index 95510e5..95510e5 100644
--- a/sugar/graphics/entry.py
+++ b/lib/sugar/graphics/entry.py
diff --git a/sugar/graphics/icon.py b/lib/sugar/graphics/icon.py
index cbff3f9..cbff3f9 100644
--- a/sugar/graphics/icon.py
+++ b/lib/sugar/graphics/icon.py
diff --git a/sugar/graphics/iconentry.py b/lib/sugar/graphics/iconentry.py
index 2f7584f..83bc864 100644
--- a/sugar/graphics/iconentry.py
+++ b/lib/sugar/graphics/iconentry.py
@@ -17,12 +17,12 @@
import gtk
-from sugar import _sugaruiext
+from sugar import _sugarext
-ICON_ENTRY_PRIMARY = _sugaruiext.ICON_ENTRY_PRIMARY
-ICON_ENTRY_SECONDARY = _sugaruiext.ICON_ENTRY_SECONDARY
+ICON_ENTRY_PRIMARY = _sugarext.ICON_ENTRY_PRIMARY
+ICON_ENTRY_SECONDARY = _sugarext.ICON_ENTRY_SECONDARY
-class IconEntry(_sugaruiext.IconEntry):
+class IconEntry(_sugarext.IconEntry):
def set_icon_from_name(self, position, name):
icon_theme = gtk.icon_theme_get_default()
icon_info = icon_theme.lookup_icon(name,
@@ -41,5 +41,5 @@ class IconEntry(_sugaruiext.IconEntry):
if image.get_storage_type() not in [gtk.IMAGE_PIXBUF, gtk.IMAGE_STOCK]:
raise ValueError('Image must have a storage type of pixbuf or ' +
'stock, not %r.' % image.get_storage_type())
- _sugaruiext.IconEntry.set_icon(self, position, image)
+ _sugarext.IconEntry.set_icon(self, position, image)
diff --git a/sugar/graphics/menuitem.py b/lib/sugar/graphics/menuitem.py
index 5b457a5..5b457a5 100644
--- a/sugar/graphics/menuitem.py
+++ b/lib/sugar/graphics/menuitem.py
diff --git a/sugar/graphics/notebook.py b/lib/sugar/graphics/notebook.py
index 2d49b1f..2d49b1f 100644
--- a/sugar/graphics/notebook.py
+++ b/lib/sugar/graphics/notebook.py
diff --git a/sugar/graphics/objectchooser.py b/lib/sugar/graphics/objectchooser.py
index 114665f..114665f 100644
--- a/sugar/graphics/objectchooser.py
+++ b/lib/sugar/graphics/objectchooser.py
diff --git a/sugar/graphics/palette.py b/lib/sugar/graphics/palette.py
index 70cf453..b337133 100644
--- a/sugar/graphics/palette.py
+++ b/lib/sugar/graphics/palette.py
@@ -25,7 +25,7 @@ import hippo
from sugar.graphics import palettegroup
from sugar.graphics import animator
from sugar.graphics import style
-from sugar import _sugaruiext
+from sugar import _sugarext
# Helper function to find the gap position and size of widget a
def _calculate_gap(a, b):
@@ -435,15 +435,15 @@ class PaletteActionBar(gtk.HButtonBox):
self.pack_start(button)
button.show()
-class _Menu(_sugaruiext.Menu):
+class _Menu(_sugarext.Menu):
__gtype_name__ = 'SugarPaletteMenu'
def __init__(self, palette):
- _sugaruiext.Menu.__init__(self)
+ _sugarext.Menu.__init__(self)
self._palette = palette
def do_insert(self, item, position):
- _sugaruiext.Menu.do_insert(self, item, position)
+ _sugarext.Menu.do_insert(self, item, position)
self._palette._update_separators()
self.show()
diff --git a/sugar/graphics/palettegroup.py b/lib/sugar/graphics/palettegroup.py
index 40d4ca2..40d4ca2 100644
--- a/sugar/graphics/palettegroup.py
+++ b/lib/sugar/graphics/palettegroup.py
diff --git a/sugar/graphics/panel.py b/lib/sugar/graphics/panel.py
index bf3ed24..bf3ed24 100644
--- a/sugar/graphics/panel.py
+++ b/lib/sugar/graphics/panel.py
diff --git a/sugar/graphics/radiotoolbutton.py b/lib/sugar/graphics/radiotoolbutton.py
index cb4ae25..cb4ae25 100644
--- a/sugar/graphics/radiotoolbutton.py
+++ b/lib/sugar/graphics/radiotoolbutton.py
diff --git a/sugar/graphics/roundbox.py b/lib/sugar/graphics/roundbox.py
index 51b9e7d..51b9e7d 100644
--- a/sugar/graphics/roundbox.py
+++ b/lib/sugar/graphics/roundbox.py
diff --git a/sugar/graphics/spreadlayout.py b/lib/sugar/graphics/spreadlayout.py
index 7bd1ff1..7bd1ff1 100644
--- a/sugar/graphics/spreadlayout.py
+++ b/lib/sugar/graphics/spreadlayout.py
diff --git a/sugar/graphics/style.py b/lib/sugar/graphics/style.py
index c9e4f68..c9e4f68 100644
--- a/sugar/graphics/style.py
+++ b/lib/sugar/graphics/style.py
diff --git a/sugar/graphics/toggletoolbutton.py b/lib/sugar/graphics/toggletoolbutton.py
index 3d05cc0..3d05cc0 100644
--- a/sugar/graphics/toggletoolbutton.py
+++ b/lib/sugar/graphics/toggletoolbutton.py
diff --git a/sugar/graphics/toolbox.py b/lib/sugar/graphics/toolbox.py
index e4e831a..e4e831a 100644
--- a/sugar/graphics/toolbox.py
+++ b/lib/sugar/graphics/toolbox.py
diff --git a/sugar/graphics/toolbutton.py b/lib/sugar/graphics/toolbutton.py
index b4c8eb3..b4c8eb3 100644
--- a/sugar/graphics/toolbutton.py
+++ b/lib/sugar/graphics/toolbutton.py
diff --git a/sugar/graphics/toolcombobox.py b/lib/sugar/graphics/toolcombobox.py
index 460dcee..460dcee 100644
--- a/sugar/graphics/toolcombobox.py
+++ b/lib/sugar/graphics/toolcombobox.py
diff --git a/sugar/graphics/tray.py b/lib/sugar/graphics/tray.py
index b779ac9..b779ac9 100644
--- a/sugar/graphics/tray.py
+++ b/lib/sugar/graphics/tray.py
diff --git a/sugar/graphics/window.py b/lib/sugar/graphics/window.py
index e6081fe..e6081fe 100644
--- a/sugar/graphics/window.py
+++ b/lib/sugar/graphics/window.py
diff --git a/sugar/graphics/xocolor.py b/lib/sugar/graphics/xocolor.py
index d37eab1..d37eab1 100644
--- a/sugar/graphics/xocolor.py
+++ b/lib/sugar/graphics/xocolor.py
diff --git a/sugar/network.py b/lib/sugar/network.py
index 49d4882..49d4882 100644
--- a/sugar/network.py
+++ b/lib/sugar/network.py
diff --git a/sugar/objects/Makefile.am b/lib/sugar/objects/Makefile.am
index 0f89830..0f89830 100644
--- a/sugar/objects/Makefile.am
+++ b/lib/sugar/objects/Makefile.am
diff --git a/sugar/objects/__init__.py b/lib/sugar/objects/__init__.py
index 85ebced..85ebced 100644
--- a/sugar/objects/__init__.py
+++ b/lib/sugar/objects/__init__.py
diff --git a/sugar/objects/objecttype.py b/lib/sugar/objects/objecttype.py
index a819216..a819216 100644
--- a/sugar/objects/objecttype.py
+++ b/lib/sugar/objects/objecttype.py
diff --git a/sugar/presence/Makefile.am b/lib/sugar/presence/Makefile.am
index cb52a41..cb52a41 100644
--- a/sugar/presence/Makefile.am
+++ b/lib/sugar/presence/Makefile.am
diff --git a/sugar/presence/__init__.py b/lib/sugar/presence/__init__.py
index 3834ab2..3834ab2 100644
--- a/sugar/presence/__init__.py
+++ b/lib/sugar/presence/__init__.py
diff --git a/sugar/presence/activity.py b/lib/sugar/presence/activity.py
index c37b63a..c37b63a 100644
--- a/sugar/presence/activity.py
+++ b/lib/sugar/presence/activity.py
diff --git a/sugar/presence/buddy.py b/lib/sugar/presence/buddy.py
index 2748299..2748299 100644
--- a/sugar/presence/buddy.py
+++ b/lib/sugar/presence/buddy.py
diff --git a/sugar/presence/presenceservice.py b/lib/sugar/presence/presenceservice.py
index e652f42..e652f42 100644
--- a/sugar/presence/presenceservice.py
+++ b/lib/sugar/presence/presenceservice.py
diff --git a/sugar/presence/test_presence.txt b/lib/sugar/presence/test_presence.txt
index d0736a9..d0736a9 100644
--- a/sugar/presence/test_presence.txt
+++ b/lib/sugar/presence/test_presence.txt
diff --git a/sugar/presence/tubeconn.py b/lib/sugar/presence/tubeconn.py
index b487391..b487391 100644
--- a/sugar/presence/tubeconn.py
+++ b/lib/sugar/presence/tubeconn.py
diff --git a/sugar/profile.py b/lib/sugar/profile.py
index 10a2b6c..10a2b6c 100644
--- a/sugar/profile.py
+++ b/lib/sugar/profile.py
diff --git a/lib/sexy-icon-entry.c b/lib/sugar/sexy-icon-entry.c
index ca35209..ca35209 100644
--- a/lib/sexy-icon-entry.c
+++ b/lib/sugar/sexy-icon-entry.c
diff --git a/lib/sexy-icon-entry.h b/lib/sugar/sexy-icon-entry.h
index eb83fed..eb83fed 100644
--- a/lib/sexy-icon-entry.h
+++ b/lib/sugar/sexy-icon-entry.h
diff --git a/lib/sugar-address-entry.c b/lib/sugar/sugar-address-entry.c
index 1f8c983..1f8c983 100644
--- a/lib/sugar-address-entry.c
+++ b/lib/sugar/sugar-address-entry.c
diff --git a/lib/sugar-address-entry.h b/lib/sugar/sugar-address-entry.h
index 60c56ab..60c56ab 100644
--- a/lib/sugar-address-entry.h
+++ b/lib/sugar/sugar-address-entry.h
diff --git a/lib/sugar-key-grabber.c b/lib/sugar/sugar-key-grabber.c
index baddab5..baddab5 100644
--- a/lib/sugar-key-grabber.c
+++ b/lib/sugar/sugar-key-grabber.c
diff --git a/lib/sugar-key-grabber.h b/lib/sugar/sugar-key-grabber.h
index 5b734e7..5b734e7 100644
--- a/lib/sugar-key-grabber.h
+++ b/lib/sugar/sugar-key-grabber.h
diff --git a/lib/sugar-marshal.list b/lib/sugar/sugar-marshal.list
index 41ce620..41ce620 100644
--- a/lib/sugar-marshal.list
+++ b/lib/sugar/sugar-marshal.list
diff --git a/lib/sugar-menu.c b/lib/sugar/sugar-menu.c
index f19dc4b..f19dc4b 100644
--- a/lib/sugar-menu.c
+++ b/lib/sugar/sugar-menu.c
diff --git a/lib/sugar-menu.h b/lib/sugar/sugar-menu.h
index 8773a31..8773a31 100644
--- a/lib/sugar-menu.h
+++ b/lib/sugar/sugar-menu.h
diff --git a/lib/sugar-x11-util.c b/lib/sugar/sugar-x11-util.c
index b57d051..b57d051 100644
--- a/lib/sugar-x11-util.c
+++ b/lib/sugar/sugar-x11-util.c
diff --git a/lib/sugar-x11-util.h b/lib/sugar/sugar-x11-util.h
index 54655a9..54655a9 100644
--- a/lib/sugar-x11-util.h
+++ b/lib/sugar/sugar-x11-util.h
diff --git a/sugar/util.py b/lib/sugar/util.py
index 8a3fb4a..8a3fb4a 100644
--- a/sugar/util.py
+++ b/lib/sugar/util.py
diff --git a/sugar/wm.py b/lib/sugar/wm.py
index 999e07a..6610889 100644
--- a/sugar/wm.py
+++ b/lib/sugar/wm.py
@@ -17,22 +17,22 @@
import gtk
-import _sugaruiext
+import _sugarext
def get_activity_id(wnck_window):
window = gtk.gdk.window_foreign_new(wnck_window.get_xid())
- return _sugaruiext.x11_get_string_property(
+ return _sugarext.x11_get_string_property(
window, '_SUGAR_ACTIVITY_ID')
def get_bundle_id(wnck_window):
window = gtk.gdk.window_foreign_new(wnck_window.get_xid())
- return _sugaruiext.x11_get_string_property(
+ return _sugarext.x11_get_string_property(
window, '_SUGAR_BUNDLE_ID')
def set_activity_id(window, activity_id):
- _sugaruiext.x11_set_string_property(
+ _sugarext.x11_set_string_property(
window, '_SUGAR_ACTIVITY_ID', activity_id)
def set_bundle_id(window, bundle_id):
- _sugaruiext.x11_set_string_property(
+ _sugarext.x11_set_string_property(
window, '_SUGAR_BUNDLE_ID', bundle_id)
diff --git a/shell/view/keyhandler.py b/shell/view/keyhandler.py
index a463a75..6a8fb9b 100644
--- a/shell/view/keyhandler.py
+++ b/shell/view/keyhandler.py
@@ -24,7 +24,7 @@ import gtk
from hardware import hardwaremanager
from model.shellmodel import ShellModel
-from sugar._sugaruiext import KeyGrabber
+from sugar._sugarext import KeyGrabber
_BRIGHTNESS_STEP = 2
_VOLUME_STEP = 10
diff --git a/sugar/.gitignore b/sugar/.gitignore
deleted file mode 100644
index 191b96c..0000000
--- a/sugar/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-_sugarext.c
-_sugaruiext.c
diff --git a/sugar/.license b/sugar/.license
deleted file mode 100644
index 6989ebe..0000000
--- a/sugar/.license
+++ /dev/null
@@ -1 +0,0 @@
-LGPL
diff --git a/sugar/Makefile.am b/sugar/Makefile.am
deleted file mode 100644
index 0f5da84..0000000
--- a/sugar/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-SUBDIRS = activity bundle clipboard graphics objects presence datastore
-
-sugardir = $(pythondir)/sugar
-sugar_PYTHON = \
- env.py \
- network.py \
- profile.py \
- util.py \
- wm.py
-
-pkgpyexecdir = $(pythondir)/sugar
-
-pkgpyexec_LTLIBRARIES = _sugaruiext.la
-
-_sugaruiext_la_CFLAGS = \
- $(LIBUI_CFLAGS) \
- $(LIBUI_BINDINGS_CFLAGS) \
- $(PYTHON_INCLUDES) \
- -I$(top_srcdir)/lib
-
-_sugaruiext_la_LDFLAGS = -module -avoid-version
-_sugaruiext_la_LIBADD = \
- $(LIBUI_BINDINGS_LIBS) \
- $(LIBUI_LIBS) \
- $(top_builddir)/lib/libsugarui.la
-
-_sugaruiext_la_SOURCES = \
- _sugaruiextmodule.c
-
-nodist__sugaruiext_la_SOURCES = _sugaruiext.c
-
-_sugaruiext.c: _sugaruiext.defs _sugaruiext.override
-
-CLEANFILES = _sugaruiext.c
-
-EXTRA_DIST = \
- _sugaruiext.defs \
- _sugaruiext.override
-
-.defs.c:
- (cd $(srcdir)\
- && $(PYGTK_CODEGEN) \
- --register $(PYGTK_DEFSDIR)/gdk-types.defs \
- --register $(PYGTK_DEFSDIR)/gtk-types.defs \
- --override $*.override \
- --prefix py$* $*.defs) > gen-$*.c \
- && cp gen-$*.c $*.c \
- && rm -f gen-$*.c