About my XO -> About my Computer

6 files changed, 15 insertions, 16 deletions

diff --git a/extensions/cpsection/Makefile.am b/extensions/cpsection/Makefile.am
index 0e69fd1..73e5164 100644
--- a/extensions/cpsection/Makefile.am
+++ b/extensions/cpsection/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = aboutme aboutxo datetime frame language network power
+SUBDIRS = aboutme aboutcomputer datetime frame language network power
 
 sugardir = $(pkgdatadir)/extensions/cpsection
 sugar_PYTHON = __init__.py
diff --git a/extensions/cpsection/aboutcomputer/Makefile.am b/extensions/cpsection/aboutcomputer/Makefile.am
new file mode 100644
index 0000000..a3bdec8
--- /dev/null
+++ b/extensions/cpsection/aboutcomputer/Makefile.am
@@ -0,0 +1,6 @@
+sugardir = $(pkgdatadir)/extensions/cpsection/aboutcomputer
+
+sugar_PYTHON = 		\
+	__init__.py	\
+	model.py	\
+	view.py		
diff --git a/extensions/cpsection/aboutxo/__init__.py b/extensions/cpsection/aboutcomputer/__init__.py
index 4dc2cb2..ceb515a 100644
--- a/extensions/cpsection/aboutxo/__init__.py
+++ b/extensions/cpsection/aboutcomputer/__init__.py
@@ -16,7 +16,7 @@
 
 from gettext import gettext as _
 
-CLASS = 'AboutXO'
-ICON = 'module-about_my_xo'
-TITLE = _('About my XO')
+CLASS = 'AboutComputer'
+ICON = 'module-about_my_computer'
+TITLE = _('About my Computer')
 
diff --git a/extensions/cpsection/aboutxo/model.py b/extensions/cpsection/aboutcomputer/model.py
index 4b5b27e..5d53f54 100644
--- a/extensions/cpsection/aboutxo/model.py
+++ b/extensions/cpsection/aboutcomputer/model.py
@@ -21,16 +21,16 @@ import re
 import subprocess
 from gettext import gettext as _
 
-_logger = logging.getLogger('ControlPanel - AboutXO')
+_logger = logging.getLogger('ControlPanel - AboutComputer')
 _not_available = _('Not available')
 
-def get_aboutxo():        
+def get_aboutcomputer():
     msg = 'Serial Number: %s \nBuild Number: %s \nFirmware Number: %s \n' \
             % (get_serial_number(), get_build_number(), get_firmware_number())
     return msg
 
-def print_aboutxo():
-    print get_aboutxo()
+def print_aboutcomputer():
+    print get_aboutcomputer()
 
 def get_serial_number():
     serial_no = _read_file('/ofw/serial-number')
@@ -115,4 +115,3 @@ def get_license():
     except IOError:
         license_text = _not_available
     return license_text
-
diff --git a/extensions/cpsection/aboutxo/view.py b/extensions/cpsection/aboutcomputer/view.py
index bd2f27f..f9dfe93 100644
--- a/extensions/cpsection/aboutxo/view.py
+++ b/extensions/cpsection/aboutcomputer/view.py
@@ -23,7 +23,7 @@ from sugar.graphics import style
 
 from jarabe.controlpanel.sectionview import SectionView
 
-class AboutXO(SectionView):
+class AboutComputer(SectionView):
     def __init__(self, model, alerts=None):
         SectionView.__init__(self)
 
diff --git a/extensions/cpsection/aboutxo/Makefile.am b/extensions/cpsection/aboutxo/Makefile.am
deleted file mode 100644
index 3f71af0..0000000
--- a/extensions/cpsection/aboutxo/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-sugardir = $(pkgdatadir)/extensions/cpsection/aboutxo
-
-sugar_PYTHON = 		\
-	__init__.py	\
-	model.py	\
-	view.py