External/libmks
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libmks.git synced 2024-12-22 13:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bilelmoussaoui/cleanup-2' into 'main'

Browse Source 
Various cleanups

See merge request GNOME/libmks!29
This commit is contained in:
Christian Hergert 2023-08-11 03:22:46 +00:00
commit f9d91ddb60
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mks-paintable.c
View File

@ -725,7 +725,7 @@ _mks_paintable_new (GCancellable *cancellable,
/* Create a socketpair() to use for D-Bus P2P protocol. We will be receiving /* Create a socketpair() to use for D-Bus P2P protocol. We will be receiving
* DMA-BUF FDs over this. * DMA-BUF FDs over this.
*/ */
if (!create_socketpair (&us, &them, error)) if (!mks_socketpair_create (&us, &them, error))
return NULL; return NULL;
/* Create socket for our side of the socket pair */ /* Create socket for our side of the socket pair */

2
lib/mks-session.h
View File

@ -61,6 +61,4 @@ const char *mks_session_get_uuid (MksSession *se
MKS_AVAILABLE_IN_ALL MKS_AVAILABLE_IN_ALL
MksScreen *mks_session_ref_screen (MksSession *self); MksScreen *mks_session_ref_screen (MksSession *self);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MksSpeaker, g_object_unref)
G_END_DECLS G_END_DECLS

2
lib/mks-speaker.h
View File

@ -43,4 +43,6 @@ MKS_AVAILABLE_IN_ALL
void mks_speaker_set_muted (MksSpeaker *self, void mks_speaker_set_muted (MksSpeaker *self,
gboolean muted); gboolean muted);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MksSpeaker, g_object_unref)
G_END_DECLS G_END_DECLS

1
lib/mks-types.h
View File

@ -35,7 +35,6 @@ typedef struct _MksMouse MksMouse;
typedef struct _MksScreen MksScreen; typedef struct _MksScreen MksScreen;
typedef struct _MksSession MksSession; typedef struct _MksSession MksSession;
typedef struct _MksScreenAttributes MksScreenAttributes; typedef struct _MksScreenAttributes MksScreenAttributes;
typedef struct _MksSpeaker MksSpeaker;
typedef struct _MksTouchable MksTouchable; typedef struct _MksTouchable MksTouchable;
G_END_DECLS G_END_DECLS

2
lib/mks-util-private.h
View File

@ -44,7 +44,7 @@ G_BEGIN_DECLS
#endif #endif
gboolean create_socketpair (int *us, gboolean mks_socketpair_create (int *us,
int *them, int *them,
GError **error); GError **error);
gboolean mks_scroll_event_is_inverted (GdkEvent *event); gboolean mks_scroll_event_is_inverted (GdkEvent *event);

8
lib/mks-util.c
View File

@ -92,9 +92,9 @@ mks_scroll_event_is_inverted (GdkEvent *event)
} }
gboolean gboolean
create_socketpair (int *us, mks_socketpair_create (int *us,
int *them, int *them,
GError **error) GError **error)
{ {
int fds[2]; int fds[2];
int rv; int rv;
@ -165,7 +165,7 @@ mks_socketpair_connection_new (GDBusConnectionFlags flags,
g_task_set_source_tag (task, mks_socketpair_connection_new); g_task_set_source_tag (task, mks_socketpair_connection_new);
g_task_set_task_data (task, GINT_TO_POINTER (-1), NULL); g_task_set_task_data (task, GINT_TO_POINTER (-1), NULL);
if (!create_socketpair (&us, &them, &error) || if (!mks_socketpair_create (&us, &them, &error) ||
!(socket = g_socket_new_from_fd (us, &error))) !(socket = g_socket_new_from_fd (us, &error)))
{ {
g_task_return_error (task, g_steal_pointer (&error)); g_task_return_error (task, g_steal_pointer (&error));