From 48d4956ee0b1a6b950a9ac87ca2b4ca07cf51687 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Sat, 1 Sep 2012 19:23:03 +0200
Subject: [PATCH] Port all extensions to the new symbolic icon handling

St.IconType was removed from master, St.Icon users are expected to add '-symbolic'
themselves.
---
 extensions/alternate-tab/extension.js | 1 -
 extensions/apps-menu/extension.js     | 2 +-
 extensions/drive-menu/extension.js    | 5 ++---
 extensions/gajim/extension.js         | 1 -
 extensions/places-menu/extension.js   | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/extensions/alternate-tab/extension.js b/extensions/alternate-tab/extension.js
index de4bbb2c..24cf9be5 100644
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -379,7 +379,6 @@ const WindowIcon = new Lang.Class({
 		this.appIcon.x_expand = this.appIcon.y_expand = true;
 	    } else {
 		this.appIcon = new St.Icon({ icon_name: 'icon-missing',
-					     icon_type: St.IconType.FULLCOLOR,
 					     icon_size: size,
 					     x_expand: true,
 					     y_expand: true });
diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
index 8a458b7f..38ba2d2e 100644
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -38,7 +38,7 @@ const ApplicationsButton = new Lang.Class({
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-        this.parent('start-here');
+        this.parent('start-here-symbolic');
 
         this._appSys = Shell.AppSystem.get_default();
         this._installedChangedId = this._appSys.connect('installed-changed', Lang.bind(this, this._refresh));
diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
index f301c66e..e96f41fd 100644
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -30,8 +30,7 @@ const DriveMenuItem = new Lang.Class({
 	this.addActor(this.label);
         this.actor.label_actor = this.label;
 
-	let ejectIcon = new St.Icon({ icon_name: 'media-eject',
-				      icon_type: St.IconType.SYMBOLIC,
+	let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
 				      style_class: 'popup-menu-icon ' });
 	let ejectButton = new St.Button({ child: ejectIcon });
 	ejectButton.connect('clicked', Lang.bind(this, this._eject));
@@ -54,7 +53,7 @@ const DriveMenu = new Lang.Class({
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-	this.parent('media-eject', _("Removable devices"));
+	this.parent('media-eject-symbolic', _("Removable devices"));
 
 	this._manager = new PlaceDisplay.PlacesManager();
 	this._updatedId = this._manager.connect('mounts-updated', Lang.bind(this, this._update));
diff --git a/extensions/gajim/extension.js b/extensions/gajim/extension.js
index 47ca9151..f29c8b43 100644
--- a/extensions/gajim/extension.js
+++ b/extensions/gajim/extension.js
@@ -141,7 +141,6 @@ Source.prototype = {
 
         if (!this._iconUri) {
             iconBox.child = new St.Icon({ icon_name: 'avatar-default',
-                                          icon_type: St.IconType.FULLCOLOR,
                                           icon_size: iconBox._size });
         } else {
             let textureCache = St.TextureCache.get_default();
diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js
index a84c6d79..26b9f90a 100644
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -26,7 +26,7 @@ const PlacesMenu = new Lang.Class({
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-        this.parent('folder');
+        this.parent('folder-symbolic');
         this.placesManager = new PlaceDisplay.PlacesManager();
 
         this.defaultItems = [];