diff options
| author | Milan Crha <mcrha@redhat.com> | 2020-01-23 11:08:11 +0100 |
|---|---|---|
| committer | Corentin Noël <corentin.noel@collabora.com> | 2020-01-23 11:21:19 +0100 |
| commit | 144b57bfddf4606999d2ef57772023b323441866 (patch) | |
| tree | 636b032eeed7a88613b8cea17e13dc7c0010c456 | |
| parent | 0824ddfbf1159690dffe8514d0182fcab952da0e (diff) | |
| download | libical-git-mcrha/glib-deprecation.tar.gz | |
libical-glib: Replace usage of deprecated G_TYPE_INSTANCE_GET_PRIVATE()mcrha/glib-deprecation
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/libical-glib/i-cal-object.c.in | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ec16ba5b..b16cc719 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -370,7 +370,7 @@ if(ICAL_GLIB_VAPI) endif() endif() -set(MIN_GLIB "2.32") +set(MIN_GLIB "2.38") set(MIN_LIBXML "2.7.3") option(ICAL_GLIB "Build libical-glib interface. Requires glib ${MIN_GLIB} and libxml ${MIN_LIBXML} development packages or higher." True) add_feature_info( diff --git a/src/libical-glib/i-cal-object.c.in b/src/libical-glib/i-cal-object.c.in index 1f593a94..cd37c969 100644 --- a/src/libical-glib/i-cal-object.c.in +++ b/src/libical-glib/i-cal-object.c.in @@ -114,7 +114,7 @@ struct _ICalObjectPrivate GSList *dependers; /* referenced GObject-s */ }; -G_DEFINE_ABSTRACT_TYPE(ICalObject, i_cal_object, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(ICalObject, i_cal_object, G_TYPE_OBJECT) enum { @@ -213,8 +213,6 @@ static void i_cal_object_class_init(ICalObjectClass * class) { GObjectClass *object_class; - g_type_class_add_private(class, sizeof(ICalObjectPrivate)); - object_class = G_OBJECT_CLASS(class); object_class->set_property = i_cal_object_set_property; object_class->get_property = i_cal_object_get_property; @@ -289,7 +287,7 @@ static void i_cal_object_class_init(ICalObjectClass * class) static void i_cal_object_init(ICalObject *iobject) { - iobject->priv = G_TYPE_INSTANCE_GET_PRIVATE(iobject, I_CAL_TYPE_OBJECT, ICalObjectPrivate); + iobject->priv = i_cal_object_get_instance_private(iobject); g_mutex_init(&iobject->priv->props_lock); } |