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

server-context-service: swap signal arguments

Browse Source 
This makes sure 'self' comes first. While at that fix the
function signatures and use ServerContextService directly
and add type checks so it's easy to notice when we messed up.
This commit is contained in:
Guido Günther
2020-09-11 20:12:02 +02:00
parent 1e6bcef055
commit 8bdfb69dc1
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/server-context-service.c
View File

@ -53,9 +53,9 @@ struct _ServerContextService {
G_DEFINE_TYPE(ServerContextService, server_context_service, G_TYPE_OBJECT); G_DEFINE_TYPE(ServerContextService, server_context_service, G_TYPE_OBJECT);
static void static void
on_destroy (GtkWidget *widget, gpointer user_data) on_destroy (ServerContextService *self, GtkWidget *widget)
{ {
ServerContextService *self = user_data; g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
g_assert (widget == GTK_WIDGET(self->window)); g_assert (widget == GTK_WIDGET(self->window));
@ -66,18 +66,19 @@ on_destroy (GtkWidget *widget, gpointer user_data)
} }
static void static void
on_notify_map (GObject *object, on_notify_map (ServerContextService *self, GtkWidget *widget)
ServerContextService *self)
{ {
(void)object; g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
g_object_set (self, "visible", TRUE, NULL); g_object_set (self, "visible", TRUE, NULL);
} }
static void static void
on_notify_unmap (GObject *object, on_notify_unmap (ServerContextService *self, GtkWidget *widget)
ServerContextService *self)
{ {
g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
g_object_set (self, "visible", FALSE, NULL); g_object_set (self, "visible", FALSE, NULL);
} }
@ -94,10 +95,14 @@ calculate_height(int32_t width)
} }
static void static void
on_surface_configure(PhoshLayerSurface *surface, ServerContextService *self) on_surface_configure(ServerContextService *self, PhoshLayerSurface *surface)
{ {
gint width; gint width;
gint height; gint height;
g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
g_return_if_fail (PHOSH_IS_LAYER_SURFACE (surface));
g_object_get(G_OBJECT(surface), g_object_get(G_OBJECT(surface),
"configured-width", &width, "configured-width", &width,
"configured-height", &height, "configured-height", &height,
@ -151,10 +156,10 @@ make_window (ServerContextService *self)
); );
g_object_connect (self->window, g_object_connect (self->window,
"signal::destroy", G_CALLBACK(on_destroy), self, "swapped-signal::destroy", G_CALLBACK(on_destroy), self,
"signal::map", G_CALLBACK(on_notify_map), self, "swapped-signal::map", G_CALLBACK(on_notify_map), self,
"signal::unmap", G_CALLBACK(on_notify_unmap), self, "swapped-signal::unmap", G_CALLBACK(on_notify_unmap), self,
"signal::configured", G_CALLBACK(on_surface_configure), self, "swapped-signal::configured", G_CALLBACK(on_surface_configure), self,
NULL); NULL);
// The properties below are just to make hacking easier. // The properties below are just to make hacking easier.