Merge branch 'gobject-tutorial-no-priv-2-60' into 'glib-2-62'

docs: Remove priv pointers from the tutorial example

See merge request GNOME/glib!1021
This commit is contained in:
Philip Withnall 2019-09-20 10:17:23 +00:00
commit 58f12912a9

View File

@ -485,14 +485,14 @@ viewer_file_set_property (GObject *object,
switch (property_id) switch (property_id)
{ {
case PROP_FILENAME: case PROP_FILENAME:
g_free (self->priv->filename); g_free (self->filename);
self->priv->filename = g_value_dup_string (value); self->filename = g_value_dup_string (value);
g_print ("filename: %s\n", self->priv->filename); g_print ("filename: %s\n", self->filename);
break; break;
case PROP_ZOOM_LEVEL: case PROP_ZOOM_LEVEL:
self->priv->zoom_level = g_value_get_uint (value); self->zoom_level = g_value_get_uint (value);
g_print ("zoom level: %u\n", self->priv->zoom_level); g_print ("zoom level: %u\n", self->zoom_level);
break; break;
default: default:
@ -513,11 +513,11 @@ viewer_file_get_property (GObject *object,
switch (property_id) switch (property_id)
{ {
case PROP_FILENAME: case PROP_FILENAME:
g_value_set_string (value, self->priv->filename); g_value_set_string (value, self->filename);
break; break;
case PROP_ZOOM_LEVEL: case PROP_ZOOM_LEVEL:
g_value_set_uint (value, self->priv->zoom_level); g_value_set_uint (value, self->zoom_level);
break; break;
default: default: