From 8be361b6ce8f0f8053e1609decbdbdc164ec8448 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Sat, 5 Sep 2020 02:06:34 +0200 Subject: [PATCH] project: Switch to libhandy-1 This commit updates the dependencies for libhandy to the tagged 1.0 release and changes the code to accomodate the changes from libhandy-0 to libhandy-1. Notable changes: edit-dialog: HdyDialog has been dropped in [1] alarm-row: action child type in HdyActionRow has been removed. [1] https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/434 Upstream-Status: Backport Signed-off-by: Alexander Kanavin --- build-aux/flatpak/org.gnome.Calendar.json | 4 ++-- meson.build | 2 +- src/gui/gcal-alarm-row.c | 2 +- src/gui/gcal-alarm-row.ui | 2 +- src/gui/gcal-application.c | 4 ++++ src/gui/gcal-edit-dialog.c | 4 ++-- src/gui/gcal-edit-dialog.h | 3 +-- src/gui/gcal-edit-dialog.ui | 20 ++++++++++---------- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/build-aux/flatpak/org.gnome.Calendar.json b/build-aux/flatpak/org.gnome.Calendar.json index 18893ad6..0772ca8d 100644 --- a/build-aux/flatpak/org.gnome.Calendar.json +++ b/build-aux/flatpak/org.gnome.Calendar.json @@ -174,8 +174,8 @@ "sources" : [ { "type" : "git", - "url" : "https://source.puri.sm/Librem5/libhandy.git", - "branch" : "libhandy-0-0" + "url" : "https://gitlab.gnome.org/GNOME/libhandy.git", + "tag" : "1.0.0" } ] }, diff --git a/meson.build b/meson.build index 2a546252..b81b95c9 100644 --- a/meson.build +++ b/meson.build @@ -165,7 +165,7 @@ libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.17.1') libecal_dep = dependency('libecal-2.0', version: '>= 3.33.2') libsoup_dep = dependency('libsoup-2.4') libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.33.1') -libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.9') +libhandy_dep = dependency('libhandy-1', version: '>= 1.0.0') glib_dep = dependency('glib-2.0', version: '>= 2.58.0') gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.20') gio_dep = dependency('gio-2.0', version: '>= 2.58.0') diff --git a/src/gui/gcal-alarm-row.c b/src/gui/gcal-alarm-row.c index 1f95426c..1ada82f4 100644 --- a/src/gui/gcal-alarm-row.c +++ b/src/gui/gcal-alarm-row.c @@ -214,7 +214,7 @@ setup_alarm (GcalAlarmRow *self) duration = e_cal_component_alarm_trigger_get_duration (trigger); formatted_duration = format_alarm_duration (duration); - hdy_action_row_set_title (HDY_ACTION_ROW (self), formatted_duration); + hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (self), formatted_duration); action = e_cal_component_alarm_get_action (self->alarm); gtk_toggle_button_set_active (self->volume_button, action == E_CAL_COMPONENT_ALARM_AUDIO); diff --git a/src/gui/gcal-alarm-row.ui b/src/gui/gcal-alarm-row.ui index 7d416c4c..bca8af50 100644 --- a/src/gui/gcal-alarm-row.ui +++ b/src/gui/gcal-alarm-row.ui @@ -3,7 +3,7 @@