Skip to content

Commit d9088e7

Browse files
authored
Merge branch 'main' into danirabbit/gtk4
2 parents 67bc34a + 9730d02 commit d9088e7

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/Application.vala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class BluetoothApp : Gtk.Application {
5757
bt_sender = new SenderDialog (this);
5858
bt_sender.add_files (files, device);
5959
bt_senders.append (bt_sender);
60-
bt_sender.show_all ();
60+
bt_sender.present ();
6161
bt_sender.destroy.connect (() => {
6262
bt_senders.foreach ((sender) => {
6363
if (sender.device == bt_sender.device) {
@@ -199,12 +199,12 @@ public class BluetoothApp : Gtk.Application {
199199
private void dialog_active (string session_path) {
200200
bt_receivers.foreach ((receiver) => {
201201
if (receiver.transfer.session == session_path) {
202-
receiver.show_all ();
202+
receiver.present ();
203203
}
204204
});
205205
bt_senders.foreach ((sender) => {
206206
if (sender.transfer.session == session_path) {
207-
sender.show_all ();
207+
sender.present ();
208208
}
209209
});
210210
}

src/Dialog/ReceiverDialog.vala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public class ReceiverDialog : Granite.Dialog {
102102
message_grid.attach (rate_label, 1, 3);
103103
message_grid.attach (progressbar, 1, 4);
104104
message_grid.attach (progress_label, 1, 5);
105+
message_grid.show_all ();
105106

106107
get_content_area ().append (message_grid);
107108

src/Dialog/ScanDialog.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public class ScanDialog : Granite.Dialog {
110110
add_device (device);
111111
}
112112
manager.start_discovery.begin (() => {
113-
show_all ();
113+
present ();
114114
});
115115
}
116116

src/Dialog/SenderDialog.vala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public class SenderDialog : Granite.Dialog {
107107
message_grid.attach (rate_label, 1, 3);
108108
message_grid.attach (progressbar, 1, 4);
109109
message_grid.attach (progress_label, 1, 5);
110+
message_grid.show_all ();
110111

111112
get_content_area ().append (message_grid);
112113

@@ -269,7 +270,8 @@ public class SenderDialog : Granite.Dialog {
269270

270271
bt_retry.destroy ();
271272
});
272-
bt_retry.show_all ();
273+
bt_retry.present ();
274+
273275
progress_label.label = e.message.split ("org.bluez.obex.Error.Failed:")[1];
274276
GLib.warning (e.message);
275277
}
@@ -335,7 +337,8 @@ public class SenderDialog : Granite.Dialog {
335337

336338
bt_retry.destroy ();
337339
});
338-
bt_retry.show_all ();
340+
bt_retry.present ();
341+
339342
progressbar.fraction = 0.0;
340343
remove_session.begin ();
341344
break;

0 commit comments

Comments
 (0)