diff options
| -rw-r--r-- | libindicator/indicator-image-helper.c | 4 | ||||
| -rw-r--r-- | libindicator/indicator-service-manager.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 5d2ff76..6ad2a44 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -74,9 +74,7 @@ refresh_image (GtkImage * image) if (pixbuf == NULL) { g_warning("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); - if (error != NULL) { - g_error_free(error); - } + g_clear_error (&error); gtk_image_clear(image); return; } diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c index f58c148..33b0557 100644 --- a/libindicator/indicator-service-manager.c +++ b/libindicator/indicator-service-manager.c @@ -536,8 +536,8 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n { IndicatorServiceManagerPrivate * priv = INDICATOR_SERVICE_MANAGER_GET_PRIVATE(user_data); - const gchar * new_name = NULL; - const gchar * prev_name = NULL; + gchar * new_name = NULL; + gchar * prev_name = NULL; g_variant_get(parameters, "(&s&s&s)", NULL, &prev_name, &new_name); if (new_name == NULL || new_name[0] == 0) { @@ -571,6 +571,9 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n } } + g_free (new_name); + g_free (prev_name); + return; } |