mirror of
https://gitlab.gnome.org/GNOME/libmks.git
synced 2024-12-22 13:45:21 +00:00
Merge branch 'bilelmoussaoui/cleanup-2' into 'main'
Various cleanups See merge request GNOME/libmks!29
This commit is contained in:
commit
f9d91ddb60
@ -725,7 +725,7 @@ _mks_paintable_new (GCancellable *cancellable,
|
||||
/* Create a socketpair() to use for D-Bus P2P protocol. We will be receiving
|
||||
* DMA-BUF FDs over this.
|
||||
*/
|
||||
if (!create_socketpair (&us, &them, error))
|
||||
if (!mks_socketpair_create (&us, &them, error))
|
||||
return NULL;
|
||||
|
||||
/* Create socket for our side of the socket pair */
|
||||
|
@ -61,6 +61,4 @@ const char *mks_session_get_uuid (MksSession *se
|
||||
MKS_AVAILABLE_IN_ALL
|
||||
MksScreen *mks_session_ref_screen (MksSession *self);
|
||||
|
||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MksSpeaker, g_object_unref)
|
||||
|
||||
G_END_DECLS
|
||||
|
@ -43,4 +43,6 @@ MKS_AVAILABLE_IN_ALL
|
||||
void mks_speaker_set_muted (MksSpeaker *self,
|
||||
gboolean muted);
|
||||
|
||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MksSpeaker, g_object_unref)
|
||||
|
||||
G_END_DECLS
|
||||
|
@ -35,7 +35,6 @@ typedef struct _MksMouse MksMouse;
|
||||
typedef struct _MksScreen MksScreen;
|
||||
typedef struct _MksSession MksSession;
|
||||
typedef struct _MksScreenAttributes MksScreenAttributes;
|
||||
typedef struct _MksSpeaker MksSpeaker;
|
||||
typedef struct _MksTouchable MksTouchable;
|
||||
|
||||
G_END_DECLS
|
||||
|
@ -44,7 +44,7 @@ G_BEGIN_DECLS
|
||||
#endif
|
||||
|
||||
|
||||
gboolean create_socketpair (int *us,
|
||||
gboolean mks_socketpair_create (int *us,
|
||||
int *them,
|
||||
GError **error);
|
||||
gboolean mks_scroll_event_is_inverted (GdkEvent *event);
|
||||
|
@ -92,7 +92,7 @@ mks_scroll_event_is_inverted (GdkEvent *event)
|
||||
}
|
||||
|
||||
gboolean
|
||||
create_socketpair (int *us,
|
||||
mks_socketpair_create (int *us,
|
||||
int *them,
|
||||
GError **error)
|
||||
{
|
||||
@ -165,7 +165,7 @@ mks_socketpair_connection_new (GDBusConnectionFlags flags,
|
||||
g_task_set_source_tag (task, mks_socketpair_connection_new);
|
||||
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)))
|
||||
{
|
||||
g_task_return_error (task, g_steal_pointer (&error));
|
||||
|
Loading…
Reference in New Issue
Block a user