From c5923fc3cc4434f6da092e42e99013269abe85ba Mon Sep 17 00:00:00 2001 From: Antenore Gatta Date: Sun, 3 Nov 2019 15:37:36 +0100 Subject: Code cleaning --- nx_plugin.h | 31 +++++++++++++++---------------- nx_session.h | 11 ++++------- nx_session_manager.h | 1 - 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/nx_plugin.h b/nx_plugin.h index 1122a78..a55849b 100644 --- a/nx_plugin.h +++ b/nx_plugin.h @@ -36,7 +36,7 @@ #pragma once -#define GET_PLUGIN_DATA(gp) (RemminaPluginNxData*)g_object_get_data(G_OBJECT(gp), "plugin-data"); +#define GET_PLUGIN_DATA(gp) (RemminaPluginNxData *)g_object_get_data(G_OBJECT(gp), "plugin-data"); G_BEGIN_DECLS @@ -51,31 +51,30 @@ typedef enum { } RemminaNXEventType; typedef struct _RemminaPluginNxData { - GtkWidget *socket; - gint socket_id; + GtkWidget * socket; + gint socket_id; - pthread_t thread; + pthread_t thread; - RemminaNXSession *nx; + RemminaNXSession * nx; - Display *display; - Window window_id; + Display * display; + Window window_id; int (*orig_handler)(Display *, XErrorEvent *); /* Session Manager data */ - gboolean manager_started; - GtkWidget *manager_dialog; - gboolean manager_selected; + gboolean manager_started; + GtkWidget * manager_dialog; + gboolean manager_selected; /* Communication between the NX thread and the session manager */ - gint event_pipe[2]; - guint session_manager_start_handler; - gboolean attach_session; - GtkTreeIter iter; - gint default_response; + gint event_pipe[2]; + guint session_manager_start_handler; + gboolean attach_session; + GtkTreeIter iter; + gint default_response; } RemminaPluginNxData; extern RemminaPluginService *remmina_plugin_nx_service; G_END_DECLS - diff --git a/nx_session.h b/nx_session.h index d97efae..a59efc5 100644 --- a/nx_session.h +++ b/nx_session.h @@ -51,13 +51,13 @@ typedef struct _RemminaNXSession RemminaNXSession; typedef gboolean (*RemminaNXPassphraseCallback)(gchar **passphrase, gpointer userdata); typedef void (*RemminaNXLogCallback)(const gchar *fmt, ...); -RemminaNXSession* remmina_nx_session_new(void); +RemminaNXSession *remmina_nx_session_new(void); void remmina_nx_session_free(RemminaNXSession *nx); gboolean remmina_nx_session_has_error(RemminaNXSession *nx); -const gchar* remmina_nx_session_get_error(RemminaNXSession *nx); +const gchar *remmina_nx_session_get_error(RemminaNXSession *nx); void remmina_nx_session_clear_error(RemminaNXSession *nx); @@ -67,8 +67,7 @@ void remmina_nx_session_set_localport(RemminaNXSession *nx, gint localport); void remmina_nx_session_set_log_callback(RemminaNXSession *nx, RemminaNXLogCallback log_callback); -gboolean remmina_nx_session_open(RemminaNXSession *nx, const gchar *server, guint port, const gchar *private_key_file, - RemminaNXPassphraseCallback passphrase_func, gpointer userdata); +gboolean remmina_nx_session_open(RemminaNXSession *nx, const gchar *server, guint port, const gchar *private_key_file, RemminaNXPassphraseCallback passphrase_func, gpointer userdata); gboolean remmina_nx_session_login(RemminaNXSession *nx, const gchar *username, const gchar *password); @@ -82,7 +81,7 @@ gboolean remmina_nx_session_iter_first(RemminaNXSession *nx, GtkTreeIter *iter); gboolean remmina_nx_session_iter_next(RemminaNXSession *nx, GtkTreeIter *iter); -gchar* remmina_nx_session_iter_get(RemminaNXSession *nx, GtkTreeIter *iter, gint column); +gchar *remmina_nx_session_iter_get(RemminaNXSession *nx, GtkTreeIter *iter, gint column); void remmina_nx_session_iter_set(RemminaNXSession *nx, GtkTreeIter *iter, gint column, const gchar *data); @@ -103,5 +102,3 @@ gboolean remmina_nx_session_invoke_proxy(RemminaNXSession *nx, gint display, GCh void remmina_nx_session_bye(RemminaNXSession *nx); G_END_DECLS - - diff --git a/nx_session_manager.h b/nx_session_manager.h index add497f..4a51c3b 100644 --- a/nx_session_manager.h +++ b/nx_session_manager.h @@ -40,4 +40,3 @@ G_BEGIN_DECLS void remmina_nx_session_manager_start(RemminaProtocolWidget *gp); G_END_DECLS - -- cgit v1.2.3