deleted: MANIFEST

deleted:    NEWS
modified:   activity/activity.info
modified:   mybutton.py
modified:   readsidebar.py
modified:   readtoolbar.py
modified:   setup.py
modified:   viewslides.py
modified:   xopower.py

Upgrade to use GTK3.

1 files changed, 7 insertions, 9 deletions

diff --git a/mybutton.py b/mybutton.py
index 38a7acb..38743ef 100644
--- a/mybutton.py
+++ b/mybutton.py
@@ -16,14 +16,14 @@
 # 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  US
-import gtk
+from gi.repository import Gtk
 import gconf
 
-from sugar.graphics.toolbarbox import ToolbarButton
-from sugar.activity.widgets import ActivityToolbar
-from sugar.graphics.xocolor import XoColor
-from sugar.graphics.icon import Icon
-from sugar.bundle.activitybundle import ActivityBundle
+from sugar3.graphics.toolbarbox import ToolbarButton
+from sugar3.activity.widgets import ActivityToolbar
+from sugar3.graphics.xocolor import XoColor
+from sugar3.graphics.icon import Icon
+from sugar3.bundle.activitybundle import ActivityBundle
 
 def _create_activity_icon(metadata):
     if metadata.get('icon-color', ''):
@@ -32,7 +32,7 @@ def _create_activity_icon(metadata):
         client = gconf.client_get_default()
         color = XoColor(client.get_string('/desktop/sugar/user/color'))
 
-    from sugar.activity.activity import get_bundle_path
+    from sugar3.activity.activity import get_bundle_path
     bundle = ActivityBundle(get_bundle_path())
     icon = Icon(file=bundle.get_icon(), xo_color=color)
 
@@ -42,8 +42,6 @@ class MyActivityToolbarButton(ToolbarButton):
 
     def __init__(self, activity, **kwargs):
         toolbar = ActivityToolbar(activity, orientation_left=True)
-        toolbar.stop.hide()
-        toolbar.keep.hide()
 
         ToolbarButton.__init__(self, page=toolbar, **kwargs)