diff options
| author | Michael Biebl <biebl@debian.org> | 2011-10-28 23:04:21 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-10-28 23:04:21 +0200 |
| commit | bc5840a47a748ffc2b6e7ec24c3dc5ba79664ca8 (patch) | |
| tree | bace204fa423c7489da190c08c2e86242c6b4588 /libnm-util/nm-setting-serial.c | |
| parent | 0ed641587611afffa0b2cd38d5c70bdb480fa241 (diff) | |
| parent | 485d149fe80915d94ed49ea6c2c0552cf7a3e79a (diff) | |
Merge commit 'upstream/0.9.1.95'
Diffstat (limited to 'libnm-util/nm-setting-serial.c')
| -rw-r--r-- | libnm-util/nm-setting-serial.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c index 7ed15e9e..24e6253e 100644 --- a/libnm-util/nm-setting-serial.c +++ b/libnm-util/nm-setting-serial.c @@ -26,6 +26,7 @@ #include <string.h> #include "nm-setting-serial.h" +#include "nm-glib-compat.h" /** * SECTION:nm-setting-serial @@ -214,7 +215,7 @@ set_property (GObject *object, guint prop_id, priv->bits = g_value_get_uint (value); break; case PROP_PARITY: - priv->parity = g_value_get_char (value); + priv->parity = g_value_get_schar (value); break; case PROP_STOPBITS: priv->stopbits = g_value_get_uint (value); @@ -242,7 +243,7 @@ get_property (GObject *object, guint prop_id, g_value_set_uint (value, nm_setting_serial_get_bits (setting)); break; case PROP_PARITY: - g_value_set_char (value, nm_setting_serial_get_parity (setting)); + g_value_set_schar (value, nm_setting_serial_get_parity (setting)); break; case PROP_STOPBITS: g_value_set_uint (value, nm_setting_serial_get_stopbits (setting)); |