Commit dd61e54c authored by Guido Gunther's avatar Guido Gunther

Merge branch 'fixes' into 'master'

One wrong asserting and a loggng statement cleanups

See merge request Librem5/phosh!98
parents 462f1e83 1cc25861
Pipeline #513 passed with stages
in 17 minutes and 51 seconds
......@@ -71,7 +71,7 @@ static void layer_surface_closed (void *data,
PhoshLayerSurface *self = data;
PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
g_return_if_fail (priv->layer_surface != surface);
g_return_if_fail (priv->layer_surface == surface);
zwlr_layer_surface_v1_destroy(priv->layer_surface);
priv->layer_surface = NULL;
gtk_widget_destroy (GTK_WIDGET (self));
......
......@@ -47,7 +47,7 @@ phosh_monitor_manager_handle_get_resources (
GVariantBuilder crtc_builder, output_builder, mode_builder;
g_return_val_if_fail (self->monitors->len, FALSE);
g_debug ("DBus %s\n", __func__);
g_debug ("DBus %s", __func__);
g_variant_builder_init (&crtc_builder, G_VARIANT_TYPE ("a(uxiiiiiuaua{sv})"));
g_variant_builder_init (&output_builder, G_VARIANT_TYPE ("a(uxiausauaua{sv})"));
......@@ -281,7 +281,7 @@ phosh_monitor_manager_handle_set_crtc_gamma (
struct gamma_control *gamma_control;
struct wl_array wl_red, wl_green, wl_blue;
g_debug ("DBus call %s for crtc %d, serial %d\n", __func__, crtc_id, serial);
g_debug ("DBus call %s for crtc %d, serial %d", __func__, crtc_id, serial);
if (serial != self->serial) {
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
G_DBUS_ERROR_ACCESS_DENIED,
......@@ -374,7 +374,7 @@ phosh_monitor_manager_handle_get_current_state (
PhoshMonitorManager *self = PHOSH_MONITOR_MANAGER (skeleton);
GVariantBuilder monitors_builder, logical_monitors_builder, properties_builder;
g_debug ("DBus call %s\n", __func__);
g_debug ("DBus call %s", __func__);
g_variant_builder_init (&monitors_builder,
G_VARIANT_TYPE (MONITORS_FORMAT));
g_variant_builder_init (&logical_monitors_builder,
......
......@@ -155,7 +155,7 @@ phosh_wayland_constructed (GObject *object)
priv->input_inhibit_manager, priv->xdg_wm_base);
}
if (!priv->phosh_private) {
g_info ("Could not find phosh private interface, disabling some features\n");
g_info ("Could not find phosh private interface, disabling some features");
}
}
......
......@@ -78,7 +78,7 @@ icon_to_pixbuf (PhoshWWanInfo *self,
&error);
if (pixbuf == NULL) {
g_warning ("Could not load icon pixbuf: %s\n", error->message);
g_warning ("Could not load icon pixbuf: %s", error->message);
g_clear_error (&error);
}
return pixbuf;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment