diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2024-11-13 13:36:16 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2024-11-13 13:36:16 +0100 |
commit | 34852b296a372a81d0b97ab4c12f32be6d294cd3 (patch) | |
tree | 4f751a1551d21c24e7fe66d2a7ddf4444d10a569 /src/dialogs | |
parent | 80aa3fe15f6346102c29b9c4236fe1e89c283d3b (diff) | |
parent | 4098950bba8e6d8609395eb9b223c276cb5954b6 (diff) |
Merge branch 'release/debian/0.32.10-1'HEADdebian/0.32.10-1master
Diffstat (limited to 'src/dialogs')
-rw-r--r-- | src/dialogs/AdjustDateTimeDialog.vala | 2 | ||||
-rw-r--r-- | src/dialogs/ProgressDialog.vala | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/dialogs/AdjustDateTimeDialog.vala b/src/dialogs/AdjustDateTimeDialog.vala index f475773..2b6ae45 100644 --- a/src/dialogs/AdjustDateTimeDialog.vala +++ b/src/dialogs/AdjustDateTimeDialog.vala @@ -231,7 +231,7 @@ public class AdjustDateTimeDialog : Gtk.Dialog { uint year, month, day; calendar.get_date(out year, out month, out day); - return new DateTime.local((int)year, (int)month + 1, (int)day, hour, (int)minute.get_value(), (int)second.get_value()); + return new DateTime(Application.timezone, (int)year, (int)month + 1, (int)day, hour, (int)minute.get_value(), (int)second.get_value()); } public bool execute(out TimeSpan time_shift, out bool keep_relativity, diff --git a/src/dialogs/ProgressDialog.vala b/src/dialogs/ProgressDialog.vala index 9368764..9d28551 100644 --- a/src/dialogs/ProgressDialog.vala +++ b/src/dialogs/ProgressDialog.vala @@ -37,6 +37,8 @@ public class ProgressDialog : Gtk.Window { cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL); cancel_button.clicked.connect(on_cancel); delete_event.connect(on_window_closed); + } else { + delete_event.connect(hide_on_delete); } Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8); |