diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c index f808997f..01143690 100644 --- a/eek/eek-gtk-keyboard.c +++ b/eek/eek-gtk-keyboard.c @@ -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; } } diff --git a/eek/eek-gtk-renderer.c b/eek/eek-gtk-renderer.c index 86b9c9bc..a25d1f83 100644 --- a/eek/eek-gtk-renderer.c +++ b/eek/eek-gtk-renderer.c @@ -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); diff --git a/eek/eek-key.c b/eek/eek-key.c index 0cd40b9d..bf8f6567 100644 --- a/eek/eek-key.c +++ b/eek/eek-key.c @@ -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; } } diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c index 138dd736..23f732b6 100644 --- a/eek/eek-keyboard.c +++ b/eek/eek-keyboard.c @@ -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; } } diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c index af1c8da9..533f1264 100644 --- a/eek/eek-renderer.c +++ b/eek/eek-renderer.c @@ -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; } } diff --git a/eek/eek-section.c b/eek/eek-section.c index 465abe22..0fee791b 100644 --- a/eek/eek-section.c +++ b/eek/eek-section.c @@ -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; } } diff --git a/eek/eek-symbol.c b/eek/eek-symbol.c index 47ce1160..22dfb56d 100644 --- a/eek/eek-symbol.c +++ b/eek/eek-symbol.c @@ -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; } } diff --git a/eek/eek-text.c b/eek/eek-text.c index 9ccea4ad..ad11265c 100644 --- a/eek/eek-text.c +++ b/eek/eek-text.c @@ -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; } } diff --git a/eek/eek-xkb-layout.c b/eek/eek-xkb-layout.c index fa2fff4d..db764329 100644 --- a/eek/eek-xkb-layout.c +++ b/eek/eek-xkb-layout.c @@ -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; } } diff --git a/eek/eek-xkl-layout.c b/eek/eek-xkl-layout.c index 57725e9a..e498b0b2 100644 --- a/eek/eek-xkl-layout.c +++ b/eek/eek-xkl-layout.c @@ -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 diff --git a/eek/eek-xml-layout.c b/eek/eek-xml-layout.c index 580e0794..c8f696b3 100644 --- a/eek/eek-xml-layout.c +++ b/eek/eek-xml-layout.c @@ -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; } } diff --git a/eekboard/eekboard-client.c b/eekboard/eekboard-client.c index ad723082..75c72425 100644 --- a/eekboard/eekboard-client.c +++ b/eekboard/eekboard-client.c @@ -180,6 +180,9 @@ eekboard_client_new (GDBusConnection *connection, return client; } + + g_warning ("can't create client: %s", error->message); + g_error_free (error); return NULL; } @@ -227,8 +230,11 @@ eekboard_client_create_context (EekboardClient *client, -1, cancellable, &error); - if (!variant) + if (!variant) { + g_warning ("failed to call CreateContext: %s", error->message); + g_error_free (error); return NULL; + } g_variant_get (variant, "(&s)", &object_path); connection = g_dbus_proxy_get_connection (G_DBUS_PROXY(client)); @@ -260,6 +266,10 @@ eekboard_async_ready_callback (GObject *source_object, &error); if (result) g_variant_unref (result); + else { + g_warning ("error in D-Bus proxy call: %s", error->message); + g_error_free (error); + } } /** diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c index f833b670..66282228 100644 --- a/eekboard/eekboard-context-service.c +++ b/eekboard/eekboard-context-service.c @@ -195,8 +195,12 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self, error = NULL; input = g_file_read (file, NULL, &error); g_object_unref (file); - if (input == NULL) + if (input == NULL) { + g_warning ("can't read keyboard file %s: %s", + keyboard_type, error->message); + g_error_free (error); return NULL; + } layout = eek_xml_layout_new (G_INPUT_STREAM(input)); } keyboard = eek_keyboard_new (layout, CSW, CSH); @@ -249,9 +253,7 @@ eekboard_context_service_set_property (GObject *object, priv->fullscreen = g_value_get_boolean (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; } } @@ -285,9 +287,7 @@ eekboard_context_service_get_property (GObject *object, g_value_set_boolean (value, priv->fullscreen); 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; } } @@ -351,6 +351,12 @@ eekboard_context_service_constructed (GObject *object) context, NULL, &error); + + if (priv->registration_id == 0) { + g_warning ("failed to register context object: %s", + error->message); + g_error_free (error); + } } } @@ -501,7 +507,11 @@ eekboard_context_service_init (EekboardContextService *context) error = NULL; priv->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, &error); - g_assert (priv->introspection_data != NULL); + if (priv->introspection_data == NULL) { + g_warning ("failed to parse D-Bus XML: %s", error->message); + g_error_free (error); + g_assert_not_reached (); + } priv->keyboard_hash = g_hash_table_new_full (g_direct_hash, @@ -535,14 +545,21 @@ emit_visibility_changed_signal (EekboardContextService *context, if (priv->connection && priv->enabled) { GError *error = NULL; - g_dbus_connection_emit_signal (priv->connection, - NULL, - priv->object_path, - EEKBOARD_CONTEXT_SERVICE_INTERFACE, - "VisibilityChanged", - g_variant_new ("(b)", visible), - &error); - g_assert_no_error (error); + gboolean retval; + + retval = g_dbus_connection_emit_signal (priv->connection, + NULL, + priv->object_path, + EEKBOARD_CONTEXT_SERVICE_INTERFACE, + "VisibilityChanged", + g_variant_new ("(b)", visible), + &error); + if (!retval) { + g_warning ("failed to emit VisibilityChanged signal: %s", + error->message); + g_error_free (error); + g_assert_not_reached (); + } } } @@ -554,14 +571,21 @@ emit_group_changed_signal (EekboardContextService *context, if (priv->connection && priv->enabled) { GError *error = NULL; - g_dbus_connection_emit_signal (priv->connection, - NULL, - priv->object_path, - EEKBOARD_CONTEXT_SERVICE_INTERFACE, - "GroupChanged", - g_variant_new ("(i)", group), - &error); - g_assert_no_error (error); + gboolean retval; + + retval = g_dbus_connection_emit_signal (priv->connection, + NULL, + priv->object_path, + EEKBOARD_CONTEXT_SERVICE_INTERFACE, + "GroupChanged", + g_variant_new ("(i)", group), + &error); + if (!retval) { + g_warning ("failed to emit GroupChanged signal: %s", + error->message); + g_error_free (error); + g_assert_not_reached (); + } } } @@ -577,22 +601,28 @@ emit_key_activated_dbus_signal (EekboardContextService *context, guint modifiers = eek_keyboard_get_modifiers (priv->keyboard); GVariant *variant; GError *error; + gboolean retval; variant = eek_serializable_serialize (EEK_SERIALIZABLE(symbol)); error = NULL; - g_dbus_connection_emit_signal (priv->connection, - NULL, - priv->object_path, - EEKBOARD_CONTEXT_SERVICE_INTERFACE, - "KeyActivated", - g_variant_new ("(svu)", - keyname, - variant, - modifiers), - &error); + retval = g_dbus_connection_emit_signal (priv->connection, + NULL, + priv->object_path, + EEKBOARD_CONTEXT_SERVICE_INTERFACE, + "KeyActivated", + g_variant_new ("(svu)", + keyname, + variant, + modifiers), + &error); g_variant_unref (variant); - g_assert_no_error (error); + if (!retval) { + g_warning ("failed to emit KeyActivated signal: %s", + error->message); + g_error_free (error); + g_assert_not_reached (); + } } } @@ -919,17 +949,24 @@ eekboard_context_service_enable (EekboardContextService *context) g_return_if_fail (priv->connection); if (!priv->enabled) { + gboolean retval; + priv->enabled = TRUE; error = NULL; - g_dbus_connection_emit_signal (priv->connection, - NULL, - priv->object_path, - EEKBOARD_CONTEXT_SERVICE_INTERFACE, - "Enabled", - NULL, - &error); - g_assert_no_error (error); + retval = g_dbus_connection_emit_signal (priv->connection, + NULL, + priv->object_path, + EEKBOARD_CONTEXT_SERVICE_INTERFACE, + "Enabled", + NULL, + &error); + if (!retval) { + g_warning ("failed to emit Enabled signal: %s", + error->message); + g_error_free (error); + g_assert_not_reached (); + } g_signal_emit_by_name (context, "enabled", NULL); } } @@ -951,17 +988,24 @@ eekboard_context_service_disable (EekboardContextService *context) g_return_if_fail (priv->connection); if (priv->enabled) { + gboolean retval; + priv->enabled = FALSE; error = NULL; - g_dbus_connection_emit_signal (priv->connection, - NULL, - priv->object_path, - EEKBOARD_CONTEXT_SERVICE_INTERFACE, - "Disabled", - NULL, - &error); - g_assert_no_error (error); + retval = g_dbus_connection_emit_signal (priv->connection, + NULL, + priv->object_path, + EEKBOARD_CONTEXT_SERVICE_INTERFACE, + "Disabled", + NULL, + &error); + if (!retval) { + g_warning ("failed to emit Disabled signal: %s", + error->message); + g_error_free (error); + g_assert_not_reached (); + } g_signal_emit_by_name (context, "disabled", NULL); } } diff --git a/eekboard/eekboard-context.c b/eekboard/eekboard-context.c index 32f8e7f0..f696f287 100644 --- a/eekboard/eekboard-context.c +++ b/eekboard/eekboard-context.c @@ -350,6 +350,10 @@ eekboard_context_new (GDBusConnection *connection, return context; } + + g_warning ("can't create context client: %s", error->message); + g_error_free (error); + return NULL; } @@ -366,6 +370,10 @@ context_async_ready_callback (GObject *source_object, &error); if (result) g_variant_unref (result); + else { + g_warning ("error in D-Bus proxy call: %s", error->message); + g_error_free (error); + } } /** @@ -403,6 +411,10 @@ eekboard_context_add_keyboard (EekboardContext *context, return keyboard_id; } + + g_warning ("error in AddKeyboard call: %s", error->message); + g_error_free (error); + return 0; } diff --git a/eekboard/eekboard-service.c b/eekboard/eekboard-service.c index b89f25ab..8bbd2ac9 100644 --- a/eekboard/eekboard-service.c +++ b/eekboard/eekboard-service.c @@ -117,9 +117,7 @@ eekboard_service_set_property (GObject *object, priv->connection = g_object_ref (connection); 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; } } @@ -141,9 +139,7 @@ eekboard_service_get_property (GObject *object, g_value_set_object (value, priv->connection); 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; } } @@ -210,6 +206,12 @@ eekboard_service_constructed (GObject *object) object, NULL, &error); + + if (priv->registration_id == 0) { + g_warning ("failed to register context object: %s", + error->message); + g_error_free (error); + } } } @@ -287,7 +289,11 @@ eekboard_service_init (EekboardService *service) error = NULL; priv->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, &error); - g_assert (priv->introspection_data != NULL); + if (priv->introspection_data == NULL) { + g_warning ("failed to parse D-Bus XML: %s", error->message); + g_error_free (error); + g_assert_not_reached (); + } priv->context_hash = g_hash_table_new_full (g_str_hash, diff --git a/src/client-main.c b/src/client-main.c index 094d267d..7f972fd1 100644 --- a/src/client-main.c +++ b/src/client-main.c @@ -168,6 +168,7 @@ main (int argc, char **argv) if (connection == NULL) { g_printerr ("Can't connect to the system bus: %s\n", error->message); + g_error_free (error); exit (1); } break; @@ -177,6 +178,7 @@ main (int argc, char **argv) if (connection == NULL) { g_printerr ("Can't connect to the session bus: %s\n", error->message); + g_error_free (error); exit (1); } break; @@ -191,6 +193,7 @@ main (int argc, char **argv) g_printerr ("Can't connect to the bus at %s: %s\n", opt_address, error->message); + g_error_free (error); exit (1); } break; diff --git a/src/client.c b/src/client.c index 863ba5a9..8cba3a21 100644 --- a/src/client.c +++ b/src/client.c @@ -381,8 +381,12 @@ client_enable_atspi_focus (Client *client) client, NULL, "object:state-changed:focused", - &error)) + &error)) { + g_warning ("can't register object:state-changed:focused handler: %s", + error->message); + g_error_free (error); return FALSE; + } error = NULL; if (!atspi_event_listener_register_from_callback @@ -390,8 +394,12 @@ client_enable_atspi_focus (Client *client) client, NULL, "focus:", - &error)) + &error)) { + g_warning ("can't register focus: handler: %s", + error->message); + g_error_free (error); return FALSE; + } client->follows_focus = TRUE; return TRUE; @@ -405,18 +413,26 @@ client_disable_atspi_focus (Client *client) client->follows_focus = FALSE; error = NULL; - atspi_event_listener_deregister_from_callback + if (!atspi_event_listener_deregister_from_callback ((AtspiEventListenerCB)focus_listener_cb, client, "object:state-changed:focused", - &error); + &error)) { + g_warning ("can't deregister object:state-changed:focused handler: %s", + error->message); + g_error_free (error); + } error = NULL; - atspi_event_listener_deregister_from_callback + if (!atspi_event_listener_deregister_from_callback ((AtspiEventListenerCB)focus_listener_cb, client, "focus:", - &error); + &error)) { + g_warning ("can't deregister focus: handler: %s", + error->message); + g_error_free (error); + } } gboolean @@ -436,8 +452,12 @@ client_enable_atspi_keystroke (Client *client) 0, ATSPI_KEY_PRESSED, ATSPI_KEYLISTENER_NOSYNC, - &error)) + &error)) { + g_warning ("can't register keystroke listener for key press: %s", + error->message); + g_error_free (error); return FALSE; + } error = NULL; if (!atspi_register_keystroke_listener @@ -446,8 +466,12 @@ client_enable_atspi_keystroke (Client *client) 0, ATSPI_KEY_RELEASED, ATSPI_KEYLISTENER_NOSYNC, - &error)) + &error)) { + g_warning ("can't register keystroke listener for key release: %s", + error->message); + g_error_free (error); return FALSE; + } return TRUE; } @@ -458,18 +482,27 @@ client_disable_atspi_keystroke (Client *client) GError *error; error = NULL; - atspi_deregister_keystroke_listener (client->keystroke_listener, - NULL, - 0, - ATSPI_KEY_PRESSED, - &error); + if (!atspi_deregister_keystroke_listener + (client->keystroke_listener, + NULL, + 0, + ATSPI_KEY_PRESSED, + &error)) { + g_warning ("can't deregister keystroke listener for key press: %s", + error->message); + g_error_free (error); + } error = NULL; - atspi_deregister_keystroke_listener (client->keystroke_listener, - NULL, - 0, - ATSPI_KEY_RELEASED, - &error); + if (!atspi_deregister_keystroke_listener (client->keystroke_listener, + NULL, + 0, + ATSPI_KEY_RELEASED, + &error)) { + g_warning ("can't deregister keystroke listener for key release: %s", + error->message); + g_error_free (error); + } g_object_unref (client->keystroke_listener); client->keystroke_listener = NULL; @@ -488,8 +521,12 @@ focus_listener_cb (const AtspiEvent *event, error = NULL; role = atspi_accessible_get_role (accessible, &error); - if (error) + if (role == NULL) { + g_warning ("can't get accessible role: %s", + error->message); + g_error_free (error); return; + } if (atspi_state_set_contains (state_set, ATSPI_STATE_EDITABLE) || role == ATSPI_ROLE_TERMINAL) { @@ -560,11 +597,15 @@ add_match_rule (GDBusConnection *connection, "AddMatch"); g_dbus_message_set_body (message, g_variant_new ("(s)", match_rule)); error = NULL; - g_dbus_connection_send_message (connection, - message, - G_DBUS_SEND_MESSAGE_FLAGS_NONE, - NULL, - &error); + if (!g_dbus_connection_send_message (connection, + message, + G_DBUS_SEND_MESSAGE_FLAGS_NONE, + NULL, + &error)) { + g_warning ("can't register match rule %s: %s", + match_rule, error->message); + g_error_free (error); + } g_object_unref (message); } diff --git a/src/preferences-dialog.c b/src/preferences-dialog.c index 583a44cd..8733b2a6 100644 --- a/src/preferences-dialog.c +++ b/src/preferences-dialog.c @@ -107,7 +107,10 @@ preferences_dialog_new (void) gtk_builder_set_translation_domain (builder, "eekboard"); ui_path = g_strdup_printf ("%s/%s", PKGDATADIR, "preferences-dialog.ui"); error = NULL; - gtk_builder_add_from_file (builder, ui_path, &error); + if (gtk_builder_add_from_file (builder, ui_path, &error) == 0) { + g_warning ("can't load %s: %s", error->message); + g_error_free (error); + } g_free (ui_path); object = diff --git a/src/server-main.c b/src/server-main.c index 37796bea..e5e63683 100644 --- a/src/server-main.c +++ b/src/server-main.c @@ -107,6 +107,7 @@ main (int argc, char **argv) connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); if (connection == NULL) { g_printerr ("Can't connect to the bus: %s\n", error->message); + g_error_free (error); exit (1); } break; @@ -121,6 +122,7 @@ main (int argc, char **argv) g_printerr ("Can't connect to the bus at %s: %s\n", opt_address, error->message); + g_error_free (error); exit (1); } break;