Revert "set window icon"

This reverts commit 9d4532b0ea53dfbcd45590ce4f317835c3d954a7.

Conflicts:

	src/sugar/activity/activity.py

1 files changed, 1 insertions, 32 deletions

diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index 0daf391..0bda2ea 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -70,15 +70,13 @@ from telepathy.interfaces import CHANNEL, \
 from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT
 
 from sugar import util
-from sugar.bundle.activitybundle import ActivityBundle
 from sugar.presence import presenceservice
 from sugar.activity.activityservice import ActivityService
 from sugar.activity.namingalert import NamingAlert
 from sugar.graphics import style
 from sugar.graphics.window import Window
 from sugar.graphics.alert import Alert
-from sugar.graphics.icon import Icon, get_surface
-from sugar.graphics.xocolor import XoColor
+from sugar.graphics.icon import Icon
 from sugar.datastore import datastore
 from sugar.session import XSMPClient
 from sugar import wm
@@ -404,35 +402,6 @@ class Activity(Window, gtk.Container):
         self._set_up_sharing(mesh_instance, SCOPE_PRIVATE)
         wait_loop.quit()
 
-        logging.debug('pre-icon')
-        icon_pixbuf = self._get_icon_pixbuf(icon_color)
-        gtk.window_set_default_icon(icon_pixbuf)
-        self.set_icon(icon_pixbuf)
-        logging.debug('post-icon')
-
-    def _get_icon_pixbuf(self, icon_color):
-        """Return colored activity icon as a Pixbuf."""
-        bundle = ActivityBundle(get_bundle_path())
-        xo_color = XoColor(icon_color)
-        # FIXME: without background_color there's garbage in the output
-        surface = get_surface(file_name=bundle.get_icon(),
-            fill_color=xo_color.get_fill_color(),
-            stroke_color=xo_color.get_stroke_color(),
-            background_color=style.COLOR_WHITE.get_gdk_color())
-        width, height = surface.get_width(), surface.get_height()
-        colormap = gtk.gdk.colormap_get_system()
-        pixmap = gtk.gdk.Pixmap(self.window, width, height,
-            colormap.get_visual().depth)
-        pixmap.set_colormap(colormap)
-        cr = pixmap.cairo_create()
-        cr.set_source_surface(surface, 0, 0)
-        cr.paint()
-        pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True,
-            colormap.get_visual().bits_per_rgb, width, height)
-        pixbuf = pixbuf.get_from_drawable(pixmap, colormap, 0, 0, 0, 0,
-            width, height)
-        return pixbuf
-
     def get_active(self):
         return self._active