linuxmint/Cinnamon — pull request #1228 by dalcde (2012-09-30 10:33:52+00:00)
Title: [Cleanup code] Applet code cleanup

Cleanup includes:
- Remove trailing whitespaces
- Replace tabs with spaces
- Don't use try/catch in _init as applet manager already does that

Certain applets have pull requests pending and are not included in cleanup.
These include:
- Window list
- Show Desktop
- Menu

Diff (ignore whitespaces changes)
===========================
diff --git a/files/usr/share/cinnamon/applets/a11y@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/a11y@cinnamon.org/applet.js
index ac9f746..a9af7ab 100644
--- a/files/usr/share/cinnamon/applets/a11y@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/a11y@cinnamon.org/applet.js
@@ -39,7 +39,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.set_applet_icon_symbolic_name("preferences-desktop-accessibility");
this.set_applet_tooltip(_("Accessibility"));

@@ -61,10 +60,6 @@ MyApplet.prototype = {
let textZoom = this._buildFontItem();
this.menu.addMenuItem(textZoom);

- // let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
- // 'screen-reader-enabled');
- // this.menu.addMenuItem(screenReader);
-
let screenKeyboard = this._buildItem(_("Screen Keyboard"), APPLICATIONS_SCHEMA,
'screen-keyboard-enabled');
this.menu.addMenuItem(screenKeyboard);
@@ -86,10 +81,6 @@ MyApplet.prototype = {

this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this.menu.addSettingsAction(_("Universal Access Settings"), 'gnome-universal-access-panel.desktop');
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
diff --git a/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
index 22543c7..71c670d 100644
--- a/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
@@ -207,7 +207,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.TextIconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.menuManager = new PopupMenu.PopupMenuManager(this);
this.menu = new Applet.AppletPopupMenu(this, orientation);
this.menuManager.addMenu(this.menu);
@@ -276,18 +275,12 @@ MyApplet.prototype = {
this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest));
this._applet.connect('auth-request', Lang.bind(this, this._authRequest));
this._applet.connect('cancel-request', Lang.bind(this, this._cancelRequest));
-
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
this.menu.toggle();
},

-
_updateKillswitch: function() {
let current_state = this._applet.killswitch_state;
let on = current_state == Bluetooth.KillswitchState.UNBLOCKED;
diff --git a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
index 75139fe..cb392f3 100644
--- a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
@@ -22,11 +22,11 @@ const PowerManagerInterface = {
{ name: 'GetPercentage', inSignature: '', outSignature: 'u' },
{ name: 'SetPercentage', inSignature: 'u', outSignature: 'u' },
{ name: 'StepUp', inSignature: '', outSignature: 'u' },
- { name: 'StepDown', inSignature: '', outSignature: 'u' },
+ { name: 'StepDown', inSignature: '', outSignature: 'u' }
],
signals:
[
- { name: 'Changed', inSignature: '', outSignature: '' },
+ { name: 'Changed', inSignature: '', outSignature: '' }
]
};

@@ -85,8 +85,8 @@ TextImageMenuItem.prototype = {
let icon_uri = file.get_uri();

return St.TextureCache.get_default().load_uri_sync(1, icon_uri, 16, 16);
- },
-}
+ }
+};
/* end of TextImageMenuItem */

function MyApplet(orientation, panel_height) {
@@ -99,7 +99,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this._proxy = new PowerManagerProxy(DBus.session, PowerBusName, PowerObjectPath);

this.menuManager = new PopupMenu.PopupMenuManager(this);
@@ -147,10 +146,6 @@ MyApplet.prototype = {

this.menu.addSettingsAction(_("Settings"), "gnome-screen-panel.desktop");
}));
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
diff --git a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js
index fd54e45..b163950 100644
--- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js
@@ -35,7 +35,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.TextApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.menuManager = new PopupMenu.PopupMenuManager(this);

this._orientation = orientation;
@@ -86,11 +85,6 @@ MyApplet.prototype = {

// Start the clock
this._updateClockAndDate();
-
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
diff --git a/files/usr/share/cinnamon/applets/expo@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/expo@cinnamon.org/applet.js
index e367b6d..d98d7ca 100644
--- a/files/usr/share/cinnamon/applets/expo@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/expo@cinnamon.org/applet.js
@@ -13,7 +13,6 @@ MyApplet.prototype = {
_init: function(metadata, orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
Gtk.IconTheme.get_default().append_search_path(metadata.path);
this.set_applet_icon_symbolic_name("cinnamon-expo");
this.set_applet_tooltip(_("Expo"));
@@ -22,10 +21,6 @@ MyApplet.prototype = {
global.settings.connect('changed::expo-applet-hover', Lang.bind(this, this._reload_settings));
this.actor.connect('enter-event', Lang.bind(this, this._onEntered));
this._reload_settings();
- }
- catch (e) {
- global.logError(e);
- }
},

on_panel_edit_mode_changed: function () {
diff --git a/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
index 59c27ce..507e300 100644
--- a/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
@@ -42,7 +42,6 @@ MyApplet.prototype = {
_init: function(metadata, orientation, panel_height) {
Applet.TextIconApplet.prototype._init.call(this, orientation, panel_height);

- try {
Gtk.IconTheme.get_default().append_search_path(metadata.path + "/flags");
this.menuManager = new PopupMenu.PopupMenuManager(this);
this.menu = new Applet.AppletPopupMenu(this, orientation);
@@ -76,11 +75,6 @@ MyApplet.prototype = {
this.show_flags_switch = new PopupMenu.PopupSwitchMenuItem(_("Show flags"), this._showFlags);
this._applet_context_menu.addMenuItem(this.show_flags_switch);
this.show_flags_switch.connect('toggled', Lang.bind(this, this._toggle_flags));
-
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
diff --git a/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js
index 44b7be4..7ec6a57 100644
--- a/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js
@@ -1608,7 +1608,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.menuManager = new PopupMenu.PopupMenuManager(this);
this.menu = new Applet.AppletPopupMenu(this, orientation);
this.menuManager.addMenu(this.menu);
@@ -1720,13 +1719,7 @@ MyApplet.prototype = {
this._settings.connect('new-connection', Lang.bind(this, this._newConnection));
}
}));
-
this._periodicUpdateIcon();
-
- }
- catch (e) {
- global.logError(e);
- }
},

_setIcon: function(name) {
@@ -2187,8 +2180,7 @@ MyApplet.prototype = {
break;
}
}
- }
- catch (e) {
+ } catch (e) {
global.logError(e);
}
},
diff --git a/files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js
index 8dcfa15..8ee881c 100644
--- a/files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js
@@ -24,7 +24,6 @@ MyApplet.prototype = {
_init: function(metadata, orientation, panel_height) {
Applet.TextIconApplet.prototype._init.call(this, orientation, panel_height);

- try {
Gtk.IconTheme.get_default().append_search_path(metadata.path);
this._orientation = orientation;
this.menuManager = new PopupMenu.PopupMenuManager(this);
@@ -68,10 +67,6 @@ MyApplet.prototype = {
this._alt_crit_icon = new St.Icon({icon_name: 'alt-critical-notif', icon_type: St.IconType.SYMBOLIC, reactive: true, track_hover: true, style_class: 'system-status-icon' });
this._blinking = false;
this._blink_toggle = false;
- }
- catch (e) {
- global.logError(e);
- }
},

_notification_added: function (mtray, notification) {
@@ -88,7 +83,7 @@ MyApplet.prototype = {
notification._inNotificationBin = true;
this.notifications.push(notification);
notification.expand();
- this._notificationbin.add(notification.actor)
+ this._notificationbin.add(notification.actor);
notification.actor._parent_container = this._notificationbin;
notification.actor.add_style_class_name('notification-applet-padding');
notification.connect('clicked', Lang.bind(this, this._item_clicked));
diff --git a/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/applet.js
index 56c47e5..5b3379e 100644
--- a/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/applet.js
@@ -280,7 +280,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.Applet.prototype._init.call(this, orientation, panel_height);

- try {
this.orientation = orientation;
this._dragPlaceholder = null;
this._dragPlaceholderPos = -1;
@@ -297,10 +296,6 @@ MyApplet.prototype = {
this.actor.add(this.myactor);
this.actor.reactive = global.settings.get_boolean(PANEL_EDIT_MODE_KEY);
global.settings.connect('changed::' + PANEL_EDIT_MODE_KEY, Lang.bind(this, this._onPanelEditModeChanged));
- }
- catch (e) {
- global.logError(e);
- }
},

_onPanelEditModeChanged: function() {
diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
index 0b5ba2e..ada9981 100644
--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
@@ -6,7 +6,7 @@ const St = imports.gi.St;
const PopupMenu = imports.ui.popupMenu;
const Pango = imports.gi.Pango;

-const POWER_SCHEMA = "org.cinnamon.power"
+const POWER_SCHEMA = "org.cinnamon.power";
const SHOW_PERCENTAGE_KEY = "power-label";
const BUS_NAME = 'org.gnome.SettingsDaemon';
const OBJECT_PATH = '/org/gnome/SettingsDaemon/Power';
@@ -46,13 +46,13 @@ const PowerManagerInterface = {
name: 'org.gnome.SettingsDaemon.Power',
methods: [
{ name: 'GetDevices', inSignature: '', outSignature: 'a(susdut)' },
- { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' },
+ { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' }
],
signals: [
- { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' },
+ { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' }
],
properties: [
- { name: 'Icon', signature: 's', access: 'read' },
+ { name: 'Icon', signature: 's', access: 'read' }
]
};
let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
@@ -139,7 +139,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.TextIconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.menuManager = new PopupMenu.PopupMenuManager(this);
this.menu = new Applet.AppletPopupMenu(this, orientation);
this.menuManager.addMenu(this.menu);
@@ -203,10 +202,6 @@ MyApplet.prototype = {

this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged));
this._devicesChanged();
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
@@ -355,7 +350,6 @@ MyApplet.prototype = {
this._mainLabel.set_text("");
}));
}
-
};

function main(metadata, orientation, panel_height) {
diff --git a/files/usr/share/cinnamon/applets/recent@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/recent@cinnamon.org/applet.js
index 56cc620..37ae601 100644
--- a/files/usr/share/cinnamon/applets/recent@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/recent@cinnamon.org/applet.js
@@ -36,7 +36,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.set_applet_icon_symbolic_name("document-open-recent");
this.set_applet_tooltip(_("Recent documents"));

@@ -47,10 +46,6 @@ MyApplet.prototype = {
this.RecentManager = new DocInfo.DocManager();
this._display();
this.RecentManager.connect('changed', Lang.bind(this, this._redisplay));
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
diff --git a/files/usr/share/cinnamon/applets/removable-drives@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/removable-drives@cinnamon.org/applet.js
index c4fad21..284e1ff 100644
--- a/files/usr/share/cinnamon/applets/removable-drives@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/removable-drives@cinnamon.org/applet.js
@@ -48,7 +48,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.set_applet_icon_symbolic_name("drive-harddisk");
this.set_applet_tooltip(_("Removable drives"));

@@ -69,10 +68,6 @@ MyApplet.prototype = {
});

Main.placesManager.connect('mounts-updated', Lang.bind(this, this._update));
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
diff --git a/files/usr/share/cinnamon/applets/scale@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/scale@cinnamon.org/applet.js
index f2b86a1..168c970 100644
--- a/files/usr/share/cinnamon/applets/scale@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/scale@cinnamon.org/applet.js
@@ -13,7 +13,6 @@ MyApplet.prototype = {
_init: function(metadata, orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
Gtk.IconTheme.get_default().append_search_path(metadata.path);
this.set_applet_icon_symbolic_name("cinnamon-scale");
this.set_applet_tooltip(_("Scale"));
@@ -22,10 +21,6 @@ MyApplet.prototype = {
global.settings.connect('changed::scale-applet-hover', Lang.bind(this, this._reload_settings));
this.actor.connect('enter-event', Lang.bind(this, this._onEntered));
this._reload_settings();
- }
- catch (e) {
- global.logError(e);
- }
},

on_panel_edit_mode_changed: function () {
diff --git a/files/usr/share/cinnamon/applets/settings@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/settings@cinnamon.org/applet.js
index 8fab806..bb5c5b6 100644
--- a/files/usr/share/cinnamon/applets/settings@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/settings@cinnamon.org/applet.js
@@ -23,16 +23,10 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.set_applet_icon_symbolic_name("go-up");
this.set_applet_tooltip(_("Settings"));
this.menuManager = new PopupMenu.PopupMenuManager(this);
this._buildMenu(orientation);
-
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
index a761d10..d2b5dec 100644
--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
@@ -31,7 +31,7 @@ const MediaServer2IFace = {
access: 'read'},
{ name: 'CanQuit',
signature: 'b',
- access: 'read'}],
+ access: 'read'}]
};

const MediaServer2PlayerIFace = {
@@ -121,7 +121,7 @@ Prop.prototype = {
DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
}
}
-DBus.proxifyPrototype(Prop.prototype, PropIFace)
+DBus.proxifyPrototype(Prop.prototype, PropIFace);

function MediaServer2() {
this._init.apply(this, arguments);
@@ -146,7 +146,7 @@ MediaServer2.prototype = {
}));
}
}
-DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace)
+DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace);

function MediaServer2Player() {
this._init.apply(this, arguments);
@@ -210,22 +210,22 @@ MediaServer2Player.prototype = {
function(repeat, ex) {
if (!ex) {
if (repeat == "None")
- repeat = false
+ repeat = false;
else
- repeat = true
+ repeat = true;
callback(this, repeat);
}
}));
},
setRepeat: function(value) {
if (value)
- value = "Playlist"
+ value = "Playlist";
else
- value = "None"
+ value = "None";
this.SetRemote('LoopStatus', value);
}
}
-DBus.proxifyPrototype(MediaServer2Player.prototype, MediaServer2PlayerIFace)
+DBus.proxifyPrototype(MediaServer2Player.prototype, MediaServer2PlayerIFace);

function TrackInfo() {
this._init.apply(this, arguments);
@@ -253,7 +253,7 @@ TrackInfo.prototype = {
},
show: function() {
this.actor.show();
- },
+ }
};

function ControlButton() {
@@ -269,7 +269,7 @@ ControlButton.prototype = {
icon_type: St.IconType.SYMBOLIC,
icon_name: icon,
icon_size: 16,
- style_class: 'sound-button-icon',
+ style_class: 'sound-button-icon'
});
this.button.set_child(this.icon);
this.actor.add_actor(this.button);
@@ -279,7 +279,7 @@ ControlButton.prototype = {
},
setIcon: function(icon) {
this.icon.icon_name = icon;
- },
+ }
}

function TextImageMenuItem() {
@@ -331,8 +331,8 @@ TextImageMenuItem.prototype = {
let icon_uri = file.get_uri();

return St.TextureCache.get_default().load_uri_async(icon_uri, 16, 16);
- },
-}
+ }
+};

function Player() {
this._init.apply(this, arguments);
@@ -362,7 +362,7 @@ Player.prototype = {
this._trackControls = new St.Bin({style_class: 'sound-playback-control', x_align: St.Align.MIDDLE});

let mainBox = new St.BoxLayout({style_class: 'sound-track-box', vertical: true});
- mainBox.add_actor(this._trackInfosTop)
+ mainBox.add_actor(this._trackInfosTop);
mainBox.add_actor(this._trackCover);
mainBox.add_actor(this._trackInfosBottom);

@@ -447,7 +447,6 @@ Player.prototype = {
return this._name.charAt(0).toUpperCase() + this._name.slice(1);
},

-
_setName: function(status) {
this._playerInfo.setText(this._getName() + " - " + _(status));
},
@@ -495,13 +494,6 @@ Player.prototype = {
this._title.setLabel(metadata["xesam:title"].toString());
else
this._title.setLabel(_("Unknown Title"));
- /*if (metadata["mpris:trackid"]) {
- this._trackId = {
- _init: function() {
- DBus.session.proxifyObject(this, this._owner, metadata["mpris:trackid"]);
- }
- }
- }*/

let change = false;
if (metadata["mpris:artUrl"]) {
@@ -704,7 +696,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.menuManager = new PopupMenu.PopupMenuManager(this);
this.menu = new Applet.AppletPopupMenu(this, orientation);
this.menuManager.addMenu(this.menu);
@@ -753,10 +744,6 @@ MyApplet.prototype = {
this._volumeControlShown = false;

this._showFixedElements();
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {
diff --git a/files/usr/share/cinnamon/applets/systray@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/systray@cinnamon.org/applet.js
index bd86120..af27196 100644
--- a/files/usr/share/cinnamon/applets/systray@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/systray@cinnamon.org/applet.js
@@ -117,9 +117,7 @@ MyApplet.prototype = {
this.actor.insert_actor(actor, 0);
}
actor._rolePosition = position;
- },
-
-
+ }
};

function main(metadata, orientation, panel_height) {
diff --git a/files/usr/share/cinnamon/applets/trash@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/trash@cinnamon.org/applet.js
index 92764db..e56c558 100644
--- a/files/usr/share/cinnamon/applets/trash@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/trash@cinnamon.org/applet.js
@@ -16,7 +16,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.set_applet_icon_symbolic_name("user-trash");
this.set_applet_tooltip(_("Trash"));

@@ -29,10 +28,6 @@ MyApplet.prototype = {

this.monitor = this.trash_directory.monitor_directory(0, null, null);
this.monitor.connect('changed', Lang.bind(this, this._onTrashChange));
- }
- catch (e) {
- global.logError(e);
- }
},

_initContextMenu: function () {
diff --git a/files/usr/share/cinnamon/applets/windows-quick-list@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/windows-quick-list@cinnamon.org/applet.js
index f8c343b..07b9607 100644
--- a/files/usr/share/cinnamon/applets/windows-quick-list@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/windows-quick-list@cinnamon.org/applet.js
@@ -18,19 +18,13 @@ MyApplet.prototype = {
_init: function(metadata, orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

-	try {
Gtk.IconTheme.get_default().append_search_path(metadata.path);
this.set_applet_icon_symbolic_name("windows-quick-list");
this.set_applet_tooltip(_("All windows"));

-
this.menu = new Applet.AppletPopupMenu(this, orientation);
this.menuManager = new PopupMenu.PopupMenuManager(this);
this.menuManager.addMenu(this.menu);
-	}
-	catch (e) {
-	global.logError(e);
-	}
},

updateMenu: function() {
diff --git a/files/usr/share/cinnamon/applets/workspace-switcher@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/workspace-switcher@cinnamon.org/applet.js
index c9e3fa7..db5f3e6 100644
--- a/files/usr/share/cinnamon/applets/workspace-switcher@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/workspace-switcher@cinnamon.org/applet.js
@@ -12,7 +12,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.Applet.prototype._init.call(this, orientation, panel_height);

- try {
this.actor.set_style_class_name("workspace-switcher-box");
this.actor.connect('scroll-event', this.hook.bind(this));
this.set_applet_tooltip(_("Switch workspace"));
@@ -22,14 +21,6 @@ MyApplet.prototype = {
global.window_manager.connect('switch-workspace', Lang.bind(this, this._updateButtons));
this.on_panel_edit_mode_changed();
global.settings.connect('changed::panel-edit-mode', Lang.bind(this, this.on_panel_edit_mode_changed));
- }
- catch (e) {
- global.logError(e);
- }
- },
-
- on_applet_clicked: function(event) {
-
},

on_panel_edit_mode_changed: function() {
diff --git a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
index b450876..f385065 100644
--- a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
@@ -8,7 +8,7 @@ const Lang = imports.lang;
const Applet = imports.ui.applet;
const PopupMenu = imports.ui.popupMenu;

-const N_ = function(e) { return e };
+const N_ = function(e) { return e; };

const possibleRotations = [ GnomeDesktop.RRRotation.ROTATION_0,
GnomeDesktop.RRRotation.ROTATION_90,
@@ -25,7 +25,7 @@ let rotations = [ [ GnomeDesktop.RRRotation.ROTATION_0, N_("Normal") ],
const XRandr2Iface = {
name: 'org.gnome.SettingsDaemon.XRANDR_2',
methods: [
-	{ name: 'ApplyConfiguration', inSignature: 'xx', outSignature: '' },
+ { name: 'ApplyConfiguration', inSignature: 'xx', outSignature: '' }
]
};
let XRandr2 = DBus.makeProxyClass(XRandr2Iface);
@@ -40,7 +40,6 @@ MyApplet.prototype = {
_init: function(orientation, panel_height) {
Applet.IconApplet.prototype._init.call(this, orientation, panel_height);

- try {
this.set_applet_icon_symbolic_name("preferences-desktop-display");
this.set_applet_tooltip(_("Display"));

@@ -62,10 +61,6 @@ MyApplet.prototype = {

this._createMenu();
this._screen.connect('changed', Lang.bind(this, this._randrEvent));
- }
- catch (e) {
- global.logError(e);
- }
},

on_applet_clicked: function(event) {