summaryrefslogtreecommitdiff
path: root/src/dialogs
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2024-11-11 12:28:09 +0100
committerJörg Frings-Fürst <debian@jff.email>2024-11-11 12:28:09 +0100
commitcb001bb8056869f98e9a62248bdd509a69d08faf (patch)
treeec5e83ac39e4e5cec0ab9494da2d0edaafe72d89 /src/dialogs
parent1bbf886bafc680c56ddd5e27ddd803b4e03685df (diff)
parent5b7b3b1dfd5ce7c275881098310667b09562ad27 (diff)
Update upstream source from tag 'upstream/0.32.10'
Update to upstream version '0.32.10' with Debian dir 4a4ccaeec66d543745486a1cf408bbaa58c6e02f
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/AdjustDateTimeDialog.vala2
-rw-r--r--src/dialogs/ProgressDialog.vala2
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);