Fix some mistakes.

* remove useless g_obect_{set,get}_property call.
* free GError on error.
This commit is contained in:
Daiki Ueno
2012-03-16 17:43:24 +09:00
parent a6fe5bd859
commit f442733b33
19 changed files with 286 additions and 182 deletions

View File

@ -101,27 +101,27 @@ eek_xkl_layout_set_property (GObject *object,
{
EekXklLayout *layout = EEK_XKL_LAYOUT(object);
switch (prop_id)
{
case PROP_MODEL:
eek_xkl_layout_set_model (EEK_XKL_LAYOUT(object),
g_value_get_string (value));
break;
case PROP_LAYOUTS:
eek_xkl_layout_set_layouts (EEK_XKL_LAYOUT(object),
g_value_get_boxed (value));
break;
case PROP_VARIANTS:
eek_xkl_layout_set_variants (EEK_XKL_LAYOUT(object),
g_value_get_boxed (value));
break;
case PROP_OPTIONS:
eek_xkl_layout_set_options (EEK_XKL_LAYOUT(object),
g_value_get_boxed (value));
break;
default:
break;
}
switch (prop_id) {
case PROP_MODEL:
eek_xkl_layout_set_model (EEK_XKL_LAYOUT(object),
g_value_get_string (value));
break;
case PROP_LAYOUTS:
eek_xkl_layout_set_layouts (EEK_XKL_LAYOUT(object),
g_value_get_boxed (value));
break;
case PROP_VARIANTS:
eek_xkl_layout_set_variants (EEK_XKL_LAYOUT(object),
g_value_get_boxed (value));
break;
case PROP_OPTIONS:
eek_xkl_layout_set_options (EEK_XKL_LAYOUT(object),
g_value_get_boxed (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
@ -132,31 +132,27 @@ eek_xkl_layout_get_property (GObject *object,
{
EekXklLayout *layout = EEK_XKL_LAYOUT(object);
switch (prop_id)
{
case PROP_MODEL:
g_value_set_string
(value,
eek_xkl_layout_get_model (EEK_XKL_LAYOUT(object)));
break;
case PROP_LAYOUTS:
g_value_set_boxed
(value,
eek_xkl_layout_get_layouts (EEK_XKL_LAYOUT(object)));
break;
case PROP_VARIANTS:
g_value_set_boxed
(value,
eek_xkl_layout_get_variants (EEK_XKL_LAYOUT(object)));
break;
case PROP_OPTIONS:
g_value_set_boxed
(value,
eek_xkl_layout_get_options (EEK_XKL_LAYOUT(object)));
break;
default:
break;
}
switch (prop_id) {
case PROP_MODEL:
g_value_set_string (value,
eek_xkl_layout_get_model (EEK_XKL_LAYOUT(object)));
break;
case PROP_LAYOUTS:
g_value_set_boxed (value,
eek_xkl_layout_get_layouts (EEK_XKL_LAYOUT(object)));
break;
case PROP_VARIANTS:
g_value_set_boxed (value,
eek_xkl_layout_get_variants (EEK_XKL_LAYOUT(object)));
break;
case PROP_OPTIONS:
g_value_set_boxed (value,
eek_xkl_layout_get_options (EEK_XKL_LAYOUT(object)));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void