s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some mistakes.

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

4
eek/eek-gtk-keyboard.c
View File

@ -338,9 +338,7 @@ eek_gtk_keyboard_set_property (GObject *object,
eek_gtk_keyboard_set_keyboard (EEK_GTK_KEYBOARD(object), keyboard);
break;
default:
g_object_set_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

7
eek/eek-gtk-renderer.c
View File

@ -66,8 +66,13 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
size,
0,
&error);
if (pixbuf == NULL)
if (pixbuf == NULL) {
g_warning ("can't get icon pixbuf for %s: %s",
icon_name,
error->message);
g_error_free (error);
return NULL;
}
surface = pixbuf_to_cairo_surface (pixbuf);
g_object_unref (pixbuf);

8
eek/eek-key.c
View File

@ -254,9 +254,7 @@ eek_key_set_property (GObject *object,
eek_key_set_oref (EEK_KEY(object), g_value_get_uint (value));
break;
default:
g_object_set_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -290,9 +288,7 @@ eek_key_get_property (GObject *object,
g_value_set_uint (value, eek_key_get_oref (EEK_KEY(object)));
break;
default:
g_object_get_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

8
eek/eek-keyboard.c
View File

@ -187,9 +187,7 @@ eek_keyboard_set_property (GObject *object,
g_value_get_enum (value));
break;
default:
g_object_set_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -211,9 +209,7 @@ eek_keyboard_get_property (GObject *object,
eek_keyboard_get_modifier_behavior (EEK_KEYBOARD(object)));
break;
default:
g_object_get_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

8
eek/eek-renderer.c
View File

@ -733,9 +733,7 @@ eek_renderer_set_property (GObject *object,
g_object_ref (priv->pcontext);
break;
default:
g_object_set_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -753,9 +751,7 @@ eek_renderer_get_property (GObject *object,
g_value_set_object (value, priv->keyboard);
break;
default:
g_object_get_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

8
eek/eek-section.c
View File

@ -303,9 +303,7 @@ eek_section_set_property (GObject *object,
g_value_get_int (value));
break;
default:
g_object_set_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -321,9 +319,7 @@ eek_section_get_property (GObject *object,
g_value_set_int (value, eek_section_get_angle (EEK_SECTION(object)));
break;
default:
g_object_get_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

8
eek/eek-symbol.c
View File

@ -122,9 +122,7 @@ eek_symbol_set_property (GObject *object,
g_value_get_string (value));
break;
default:
g_object_set_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -154,9 +152,7 @@ eek_symbol_get_property (GObject *object,
eek_symbol_get_icon_name (EEK_SYMBOL(object)));
break;
default:
g_object_get_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

8
eek/eek-text.c
View File

@ -100,9 +100,7 @@ eek_text_set_property (GObject *object,
priv->text = g_strdup (g_value_get_string (value));
break;
default:
g_object_set_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -119,9 +117,7 @@ eek_text_get_property (GObject *object,
g_value_set_string (value, priv->text);
break;
default:
g_object_get_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

2
eek/eek-xkb-layout.c
View File

@ -386,6 +386,7 @@ eek_xkb_layout_set_property (GObject *object,
eek_xkb_layout_set_symbols (EEK_XKB_LAYOUT(object), name);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -416,6 +417,7 @@ eek_xkb_layout_get_property (GObject *object,
g_value_set_string (value, name);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

88
eek/eek-xkl-layout.c
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

30
eek/eek-xml-layout.c
View File

@ -552,20 +552,30 @@ eek_xml_layout_real_create_keyboard (EekLayout *self,
nread = g_input_stream_read (G_INPUT_STREAM(priv->source),
buffer, sizeof buffer, NULL,
&error);
if (nread < 0) {
g_warning ("error reading XML layout: %s",
error->message);
g_clear_error (&error);
}
if (nread <= 0)
break;
error = NULL;
if (!g_markup_parse_context_parse (pcontext, buffer, nread, &error))
if (!g_markup_parse_context_parse (pcontext, buffer, nread,
&error)) {
g_warning ("can't parse XML layout: %s", error->message);
g_clear_error (&error);
break;
}
}
if (error)
g_warning ("%s", error->message);
error = NULL;
g_markup_parse_context_end_parse (pcontext, &error);
if (error)
g_warning ("%s", error->message);
if (!g_markup_parse_context_end_parse (pcontext, &error)) {
g_warning ("can't finish parsing XML layout: %s",
error->message);
g_error_free (error);
}
g_markup_parse_context_free (pcontext);
@ -630,9 +640,7 @@ eek_xml_layout_set_property (GObject *object,
g_value_get_object (value));
break;
default:
g_object_set_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -649,9 +657,7 @@ eek_xml_layout_get_property (GObject *object,
eek_xml_layout_get_source (EEK_XML_LAYOUT(object)));
break;
default:
g_object_get_property (object,
g_param_spec_get_name (pspec),
value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}