Skip to content

Commit 7efb8a0

Browse files
committed
mounts/autorun/endSession: Convert to PopupDialog.
These previously allowed full interaction as Gtk dialogs, while remaining 'above' other windows, so are obvious candidates for this.
1 parent 81eba1c commit 7efb8a0

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

js/ui/autorunManager.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const { Clutter, Gio, GObject, Pango, St } = imports.gi;
55

66
const CheckBox = imports.ui.checkBox;
77
const Dialog = imports.ui.dialog;
8-
const ModalDialog = imports.ui.modalDialog;
8+
const PopupDialog = imports.ui.popupDialog;
99

1010
const hotplugSnifferIface =
1111
' \
@@ -295,7 +295,7 @@ var AutorunDispatcher = class {
295295
};
296296

297297
var AutorunDialog = GObject.registerClass(
298-
class AutorunDialog extends ModalDialog.ModalDialog {
298+
class AutorunDialog extends PopupDialog.PopupDialog {
299299
_init(mount, apps, contentType) {
300300
super._init({ styleClass: 'autorun-dialog' });
301301

js/ui/cinnamonMountOperation.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const CheckBox = imports.ui.checkBox;
77
const Dialog = imports.ui.dialog;
88
const Main = imports.ui.main;
99
const MessageTray = imports.ui.messageTray;
10-
const ModalDialog = imports.ui.modalDialog;
10+
const PopupDialog = imports.ui.popupDialog;
1111
const Params = imports.misc.params;
1212
const CinnamonEntry = imports.ui.cinnamonEntry;
1313

@@ -262,7 +262,7 @@ var CinnamonUnmountNotifier = class extends MessageTray.Source {
262262

263263
var CinnamonMountQuestionDialog = GObject.registerClass({
264264
Signals: { 'response': { param_types: [GObject.TYPE_INT] } },
265-
}, class CinnamonMountQuestionDialog extends ModalDialog.ModalDialog {
265+
}, class CinnamonMountQuestionDialog extends PopupDialog.PopupDialog {
266266
_init() {
267267
super._init({ styleClass: 'mount-question-dialog' });
268268

@@ -301,7 +301,7 @@ var CinnamonMountPasswordDialog = GObject.registerClass({
301301
],
302302
},
303303
},
304-
}, class CinnamonMountPasswordDialog extends ModalDialog.ModalDialog {
304+
}, class CinnamonMountPasswordDialog extends PopupDialog.PopupDialog {
305305
_init(message, flags) {
306306
let strings = message.split('\n');
307307
let title = strings.shift() || null;
@@ -509,7 +509,7 @@ var CinnamonMountPasswordDialog = GObject.registerClass({
509509

510510
var CinnamonProcessesDialog = GObject.registerClass({
511511
Signals: { 'response': { param_types: [GObject.TYPE_INT] } },
512-
}, class CinnamonProcessesDialog extends ModalDialog.ModalDialog {
512+
}, class CinnamonProcessesDialog extends PopupDialog.PopupDialog {
513513
_init() {
514514
super._init({ styleClass: 'processes-dialog' });
515515

js/ui/endSessionDialog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const GObject = imports.gi.GObject;
77
const St = imports.gi.St;
88

99
const Dialog = imports.ui.dialog;
10-
const ModalDialog = imports.ui.modalDialog;
10+
const PopupDialog = imports.ui.popupDialog;
1111

1212
const SessionDialogInterface =
1313
"<node> \
@@ -50,7 +50,7 @@ const ResponseCode = {
5050
}
5151

5252
var EndSessionDialog = GObject.registerClass(
53-
class EndSessionDialog extends ModalDialog.ModalDialog {
53+
class EndSessionDialog extends PopupDialog.PopupDialog {
5454
_init(mode) {
5555
super._init({
5656
styleClass: 'end-session-dialog',

0 commit comments

Comments
 (0)