From e9f18c6d8da01e0af2a2b4836d78210e9de7c511 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 20 Feb 2013 13:12:42 -0500 Subject: [PATCH] modalDialog: drop global.get_current_time() arguments to close Modal dialogs take an optional timestamp in their close method. If the timestamp is not passed in, then global.get_current_time() is used. Some callers of the close method pass in global.get_current_time() unnecessarly (since it's the default). This commit drops the argument for those cases. https://bugzilla.gnome.org/show_bug.cgi?id=694296 --- js/ui/endSessionDialog.js | 4 ++-- js/ui/extensionDownloader.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js index 11dbc9d56..7d46144ee 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js @@ -395,7 +395,7 @@ const EndSessionDialog = new Lang.Class({ cancel: function() { this._stopTimer(); this._dbusImpl.emit_signal('Canceled', null); - this.close(global.get_current_time()); + this.close(); }, _confirm: function(signal) { @@ -454,7 +454,7 @@ const EndSessionDialog = new Lang.Class({ let item = new ListItem(app, reason); item.connect('activate', Lang.bind(this, function() { - this.close(global.get_current_time()); + this.close(); })); this._applicationList.add(item.actor, { x_fill: true }); this._stopTimer(); diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js index 7f9a8718b..23bdddc10 100644 --- a/js/ui/extensionDownloader.js +++ b/js/ui/extensionDownloader.js @@ -215,7 +215,7 @@ const InstallExtensionDialog = new Lang.Class({ }, _onCancelButtonPressed: function(button, event) { - this.close(global.get_current_time()); + this.close(); this._invocation.return_value(GLib.Variant.new('(s)', ['cancelled'])); }, @@ -257,7 +257,7 @@ const InstallExtensionDialog = new Lang.Class({ gotExtensionZipFile(session, message, uuid, dir, callback, errback); })); - this.close(global.get_current_time()); + this.close(); } });