diff --git a/remmina-plugins/nx/nx_session.c b/remmina-plugins/nx/nx_session.c
index 0b49f45106..d26b5a6d40 100644
--- a/remmina-plugins/nx/nx_session.c
+++ b/remmina-plugins/nx/nx_session.c
@@ -196,7 +196,7 @@ static void remmina_nx_session_set_application_error(RemminaNXSession *nx, const
 {
 	va_list args;
 
-	if (nx->error) g_free (nx->error);
+	if (nx->error) g_free(nx->error);
 	va_start (args, fmt);
 	nx->error = g_strdup_vprintf (fmt, args);
 	va_end (args);
@@ -525,7 +525,7 @@ static void remmina_nx_session_send_command(RemminaNXSession *nx, const gchar *c
 	va_start (args, cmdfmt);
 	cmd = g_strdup_vprintf (cmdfmt, args);
 	channel_write (nx->channel, cmd, strlen (cmd));
-	g_free (cmd);
+	g_free(cmd);
 
 	ssh_set_fd_towrite (nx->session);
 	channel_write (nx->channel, "\n", 1);
@@ -666,7 +666,7 @@ void remmina_nx_session_add_parameter(RemminaNXSession *nx, const gchar *name, c
 
 	va_start (args, valuefmt);
 	value = g_strdup_vprintf (valuefmt, args);
-	g_hash_table_insert (nx->session_parameters, g_strdup (name), value);
+	g_hash_table_insert(nx->session_parameters, g_strdup (name), value);
 }
 
 static gboolean remmina_nx_session_send_session_command(RemminaNXSession *nx, const gchar *cmd_type, gint response)
diff --git a/remmina-plugins/rdp/rdp_plugin.c b/remmina-plugins/rdp/rdp_plugin.c
index c5377c17ff..0e2b6d04ac 100644
--- a/remmina-plugins/rdp/rdp_plugin.c
+++ b/remmina-plugins/rdp/rdp_plugin.c
@@ -675,7 +675,7 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget* gp)
 		rfi->settings->directory = xstrdup(remmina_plugin_service->file_get_string(remminafile, "execpath"));
 	}
 
-	s = g_strdup_printf ("rdp_quality_%i", remmina_plugin_service->file_get_int(remminafile, "quality", DEFAULT_QUALITY_0));
+	s = g_strdup_printf("rdp_quality_%i", remmina_plugin_service->file_get_int(remminafile, "quality", DEFAULT_QUALITY_0));
 	value = remmina_plugin_service->pref_get_value(s);
 	g_free(s);
 
diff --git a/remmina-plugins/telepathy/CMakeLists.txt b/remmina-plugins/telepathy/CMakeLists.txt
index a0492fe131..a42c8f291c 100644
--- a/remmina-plugins/telepathy/CMakeLists.txt
+++ b/remmina-plugins/telepathy/CMakeLists.txt
@@ -26,8 +26,7 @@ set_target_properties(remmina-plugin-telepathy PROPERTIES PREFIX "")
 
 find_required_package(GTK3)
 
-include_directories(${REMMINA_COMMON_INCLUDE_DIRS})
-target_link_libraries(remmina-plugin-telepathy ${REMMINA_COMMON_LIBRARIES})
+include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${TELEPATHY_INCLUDE_DIRS})
+target_link_libraries(remmina-plugin-telepathy ${REMMINA_COMMON_LIBRARIES} ${TELEPATHY_LIBRARIES})
 
 install(TARGETS remmina-plugin-telepathy DESTINATION ${REMMINA_PLUGINDIR})
-
diff --git a/remmina-plugins/telepathy/telepathy_handler.c b/remmina-plugins/telepathy/telepathy_handler.c
index 53f944bbab..c7f90e3326 100644
--- a/remmina-plugins/telepathy/telepathy_handler.c
+++ b/remmina-plugins/telepathy/telepathy_handler.c
@@ -86,9 +86,9 @@ G_DEFINE_TYPE_WITH_CODE (RemminaTpHandler, remmina_tp_handler, G_TYPE_OBJECT,
 				g_object_unref(bus);
 				g_print("tp_dbus_daemon_request_name: %s", error->message);
 				return FALSE;
-			} dbus_g_connection_register_g_object (
+			} dbus_g_connection_register_G_OBJECT(
 					tp_proxy_get_dbus_connection (TP_PROXY (bus)),
-					REMMINA_TP_OBJECT_PATH, G_OBJECT (handler));
+					REMMINA_TP_OBJECT_PATH, G_OBJECT(handler));
 			g_object_unref(bus);
 			g_print("remmina_tp_handler_register: bus_name " REMMINA_TP_BUS_NAME
 					" object_path " REMMINA_TP_OBJECT_PATH "\n");
diff --git a/remmina-plugins/vnc/vnc_plugin.c b/remmina-plugins/vnc/vnc_plugin.c
index 2cdccfd59d..be7202cf3a 100644
--- a/remmina-plugins/vnc/vnc_plugin.c
+++ b/remmina-plugins/vnc/vnc_plugin.c
@@ -839,7 +839,7 @@ remmina_plugin_vnc_rfb_credential (rfbClient *cl, int credentialType)
 	gchar *s1, *s2;
 
 	gp = (RemminaProtocolWidget*) (rfbClientGetClientData (cl, NULL));
-	gpdata = (RemminaPluginVncData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginVncData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 	gpdata->auth_called = TRUE;
 	remminafile = remmina_plugin_service->protocol_plugin_get_file (gp);
 
@@ -861,8 +861,8 @@ remmina_plugin_vnc_rfb_credential (rfbClient *cl, int credentialType)
 		}
 		else
 		{
-			g_free (s1);
-			g_free (s2);
+			g_free(s1);
+			g_free(s2);
 
 			THREADS_ENTER
 			ret = remmina_plugin_service->protocol_plugin_init_authuserpwd (gp, FALSE);
@@ -875,7 +875,7 @@ remmina_plugin_vnc_rfb_credential (rfbClient *cl, int credentialType)
 			}
 			else
 			{
-				g_free (cred);
+				g_free(cred);
 				cred = NULL;
 				gpdata->connected = FALSE;
 			}
@@ -906,7 +906,7 @@ remmina_plugin_vnc_rfb_credential (rfbClient *cl, int credentialType)
 			}
 			else
 			{
-				g_free (cred);
+				g_free(cred);
 				cred = NULL;
 				gpdata->connected = FALSE;
 			}
@@ -914,7 +914,7 @@ remmina_plugin_vnc_rfb_credential (rfbClient *cl, int credentialType)
 		break;
 
 		default:
-		g_free (cred);
+		g_free(cred);
 		cred = NULL;
 		break;
 	}
@@ -990,7 +990,7 @@ static void remmina_plugin_vnc_rfb_output(const char *format, ...)
 	{
 		g_vsnprintf (vnc_error, MAX_ERROR_LENGTH, _(f), args);
 	}
-	g_free (f);
+	g_free(f);
 	va_end(args);
 
 	remmina_plugin_service->log_printf ("[VNC]%s\n", vnc_error);
@@ -1226,7 +1226,7 @@ static gboolean remmina_plugin_vnc_main(RemminaProtocolWidget *gp)
 			remmina_plugin_service->get_server_port (remmina_plugin_service->file_get_string (remminafile, "proxy"), 5900,
 					&s, &cl->serverPort);
 			cl->serverHost = strdup (s);
-			g_free (s);
+			g_free(s);
 #endif
 		}
 
@@ -1605,7 +1605,7 @@ static gboolean remmina_plugin_vnc_open_connection(RemminaProtocolWidget *gp)
 	if (pthread_create (&gpdata->thread, NULL, remmina_plugin_vnc_main_thread, gp))
 	{
 		/* I don't think this will ever happen... */
-		g_print ("Failed to initialize pthread. Falling back to non-thread mode...\n");
+		g_print("Failed to initialize pthread. Falling back to non-thread mode...\n");
 		g_timeout_add (0, (GSourceFunc) remmina_plugin_vnc_main, gp);
 		gpdata->thread = 0;
 	}
diff --git a/remmina/src/remmina_applet_menu.h b/remmina/src/remmina_applet_menu.h
index 9a6c2c0d52..c8a9a649d2 100644
--- a/remmina/src/remmina_applet_menu.h
+++ b/remmina/src/remmina_applet_menu.h
@@ -43,25 +43,25 @@ typedef struct _RemminaAppletMenu
 {
 	GtkMenu menu;
 
-	RemminaAppletMenuPriv *priv;
+	RemminaAppletMenuPriv* priv;
 } RemminaAppletMenu;
 
 typedef struct _RemminaAppletMenuClass
 {
 	GtkMenuClass parent_class;
 
-	void (*launch_item)(RemminaAppletMenu *menu);
-	void (*edit_item)(RemminaAppletMenu *menu);
+	void (*launch_item)(RemminaAppletMenu* menu);
+	void (*edit_item)(RemminaAppletMenu* menu);
 } RemminaAppletMenuClass;
 
 GType remmina_applet_menu_get_type(void)
 G_GNUC_CONST;
 
-void remmina_applet_menu_register_item(RemminaAppletMenu *menu, RemminaAppletMenuItem *menuitem);
-void remmina_applet_menu_add_item(RemminaAppletMenu *menu, RemminaAppletMenuItem *menuitem);
+void remmina_applet_menu_register_item(RemminaAppletMenu* menu, RemminaAppletMenuItem* menuitem);
+void remmina_applet_menu_add_item(RemminaAppletMenu* menu, RemminaAppletMenuItem* menuitem);
 GtkWidget* remmina_applet_menu_new(void);
-void remmina_applet_menu_set_hide_count(RemminaAppletMenu *menu, gboolean hide_count);
-void remmina_applet_menu_populate(RemminaAppletMenu *menu);
+void remmina_applet_menu_set_hide_count(RemminaAppletMenu* menu, gboolean hide_count);
+void remmina_applet_menu_populate(RemminaAppletMenu* menu);
 
 G_END_DECLS
 
diff --git a/remmina/src/remmina_applet_menu_item.c b/remmina/src/remmina_applet_menu_item.c
index cfb5d23ba6..abb9882e15 100644
--- a/remmina/src/remmina_applet_menu_item.c
+++ b/remmina/src/remmina_applet_menu_item.c
@@ -100,10 +100,10 @@ GtkWidget* remmina_applet_menu_item_new(RemminaAppletMenuItemType item_type, ...
 	va_end(ap);
 
 	/* Create the label */
-	widget = gtk_label_new (item->name);
+	widget = gtk_label_new(item->name);
 	gtk_widget_show(widget);
-	gtk_misc_set_alignment(GTK_MISC (widget), 0.0, 0.5);
-	gtk_container_add (GTK_CONTAINER (item), widget);
+	gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
+	gtk_container_add(GTK_CONTAINER(item), widget);
 
 	/* Create the image */
 	if (item_type == REMMINA_APPLET_MENU_ITEM_FILE || item_type == REMMINA_APPLET_MENU_ITEM_DISCOVERED)
diff --git a/remmina/src/remmina_avahi.c b/remmina/src/remmina_avahi.c
index a146d70797..1b31aa10d8 100644
--- a/remmina/src/remmina_avahi.c
+++ b/remmina/src/remmina_avahi.c
@@ -32,135 +32,134 @@
 
 struct _RemminaAvahiPriv
 {
-	AvahiSimplePoll *simple_poll;
-	AvahiClient *client;
-	AvahiServiceBrowser *sb;
+	AvahiSimplePoll* simple_poll;
+	AvahiClient* client;
+	AvahiServiceBrowser* sb;
 	guint iterate_handler;
 	gboolean has_event;
 };
 
 static void
-remmina_avahi_resolve_callback (
-		AvahiServiceResolver *r,
+remmina_avahi_resolve_callback(
+		AvahiServiceResolver* r,
 		AVAHI_GCC_UNUSED AvahiIfIndex interface,
 		AVAHI_GCC_UNUSED AvahiProtocol protocol,
 		AvahiResolverEvent event,
-		const char *name,
-		const char *type,
-		const char *domain,
-		const char *host_name,
-		const AvahiAddress *address,
+		const char* name,
+		const char* type,
+		const char* domain,
+		const char* host_name,
+		const AvahiAddress* address,
 		uint16_t port,
-		AvahiStringList *txt,
+		AvahiStringList* txt,
 		AvahiLookupResultFlags flags,
 		AVAHI_GCC_UNUSED void* userdata)
 {
-	RemminaAvahi *ga = (RemminaAvahi*) userdata;
-	gchar *key, *value;
+	gchar* key;
+	gchar* value;
+	RemminaAvahi* ga = (RemminaAvahi*) userdata;
 
-	assert (r);
+	assert(r);
 
 	ga->priv->has_event = TRUE;
 
 	switch (event)
 	{
 		case AVAHI_RESOLVER_FAILURE:
-		g_print ("(remmina-applet avahi-resolver) Failed to resolve service '%s' of type '%s' in domain '%s': %s\n",
-				name, type, domain, avahi_strerror (avahi_client_errno (avahi_service_resolver_get_client (r))));
-		break;
-
-		case AVAHI_RESOLVER_FOUND:
-		key = g_strdup_printf ("%s,%s,%s", name, type, domain);
-		if (g_hash_table_lookup (ga->discovered_services, key))
-		{
-			g_free (key);
+			g_print("(remmina-applet avahi-resolver) Failed to resolve service '%s' of type '%s' in domain '%s': %s\n",
+					name, type, domain, avahi_strerror(avahi_client_errno(avahi_service_resolver_get_client(r))));
 			break;
-		}
-		value = g_strdup_printf ("[%s]:%i", host_name, port);
-		g_hash_table_insert (ga->discovered_services, key, value);
-		/* key and value will be freed with g_free when the has table is freed */
 
-		g_print ("(remmina-applet avahi-resolver) Added service '%s'\n", value);
+		case AVAHI_RESOLVER_FOUND:
+			key = g_strdup_printf("%s,%s,%s", name, type, domain);
+			if (g_hash_table_lookup(ga->discovered_services, key))
+			{
+				g_free(key);
+				break;
+			}
+			value = g_strdup_printf("[%s]:%i", host_name, port);
+			g_hash_table_insert(ga->discovered_services, key, value);
+			/* key and value will be freed with g_free when the has table is freed */
+
+			g_print("(remmina-applet avahi-resolver) Added service '%s'\n", value);
 
-		break;
+			break;
 	}
 
-	avahi_service_resolver_free (r);
+	avahi_service_resolver_free(r);
 }
 
 static void
-remmina_avahi_browse_callback (
-		AvahiServiceBrowser *b,
+remmina_avahi_browse_callback(
+		AvahiServiceBrowser* b,
 		AvahiIfIndex interface,
 		AvahiProtocol protocol,
 		AvahiBrowserEvent event,
-		const char *name,
-		const char *type,
-		const char *domain,
+		const char* name,
+		const char* type,
+		const char* domain,
 		AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
 		void* userdata)
 {
-	RemminaAvahi *ga = (RemminaAvahi*) userdata;
-	gchar *key;
+	gchar* key;
+	RemminaAvahi* ga = (RemminaAvahi*) userdata;
 
-	assert (b);
+	assert(b);
 
 	ga->priv->has_event = TRUE;
 
 	switch (event)
 	{
 		case AVAHI_BROWSER_FAILURE:
-		g_print ("(remmina-applet avahi-browser) %s\n",
-				avahi_strerror (avahi_client_errno (avahi_service_browser_get_client (b))));
-		return;
+			g_print("(remmina-applet avahi-browser) %s\n",
+					avahi_strerror(avahi_client_errno (avahi_service_browser_get_client (b))));
+			return;
 
 		case AVAHI_BROWSER_NEW:
-		key = g_strdup_printf ("%s,%s,%s", name, type, domain);
-		if (g_hash_table_lookup (ga->discovered_services, key))
-		{
-			g_free (key);
+			key = g_strdup_printf("%s,%s,%s", name, type, domain);
+			if (g_hash_table_lookup(ga->discovered_services, key))
+			{
+				g_free(key);
+				break;
+			}
+			g_free(key);
+
+			g_print("(remmina-applet avahi-browser) Found service '%s' of type '%s' in domain '%s'\n", name, type, domain);
+
+			if (!(avahi_service_resolver_new(ga->priv->client, interface, protocol, name, type, domain,
+									AVAHI_PROTO_UNSPEC, 0, remmina_avahi_resolve_callback, ga)))
+			{
+				g_print("(remmina-applet avahi-browser) Failed to resolve service '%s': %s\n",
+						name, avahi_strerror(avahi_client_errno (ga->priv->client)));
+			}
 			break;
-		}
-		g_free (key);
-
-		g_print ("(remmina-applet avahi-browser) Found service '%s' of type '%s' in domain '%s'\n", name, type, domain);
-
-		if (!(avahi_service_resolver_new (ga->priv->client, interface, protocol, name, type, domain,
-								AVAHI_PROTO_UNSPEC, 0, remmina_avahi_resolve_callback, ga)))
-		{
-			g_print ("(remmina-applet avahi-browser) Failed to resolve service '%s': %s\n",
-					name, avahi_strerror (avahi_client_errno (ga->priv->client)));
-		}
-
-		break;
 
 		case AVAHI_BROWSER_REMOVE:
-		g_print ("(remmina-applet avahi-browser) Removed service '%s' of type '%s' in domain '%s'\n", name, type, domain);
-		key = g_strdup_printf ("%s,%s,%s", name, type, domain);
-		g_hash_table_remove (ga->discovered_services, key);
-		g_free (key);
-		break;
+			g_print("(remmina-applet avahi-browser) Removed service '%s' of type '%s' in domain '%s'\n", name, type, domain);
+			key = g_strdup_printf("%s,%s,%s", name, type, domain);
+			g_hash_table_remove(ga->discovered_services, key);
+			g_free(key);
+			break;
 
 		case AVAHI_BROWSER_ALL_FOR_NOW:
 		case AVAHI_BROWSER_CACHE_EXHAUSTED:
-		break;
+			break;
 	}
 }
 
-static void
-remmina_avahi_client_callback (AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata)
+static void remmina_avahi_client_callback(AvahiClient* c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata)
 {
-	RemminaAvahi *ga = (RemminaAvahi*) userdata;
+	RemminaAvahi* ga = (RemminaAvahi*) userdata;
 
 	ga->priv->has_event = TRUE;
 
 	if (state == AVAHI_CLIENT_FAILURE)
 	{
-		g_print ("(remmina-applet avahi) Server connection failure: %s\n", avahi_strerror (avahi_client_errno (c)));
+		g_print("(remmina-applet avahi) Server connection failure: %s\n", avahi_strerror(avahi_client_errno(c)));
 	}
 }
 
-static gboolean remmina_avahi_iterate(RemminaAvahi *ga)
+static gboolean remmina_avahi_iterate(RemminaAvahi* ga)
 {
 	while (TRUE)
 	{
@@ -174,10 +173,9 @@ static gboolean remmina_avahi_iterate(RemminaAvahi *ga)
 	return TRUE;
 }
 
-RemminaAvahi*
-remmina_avahi_new(void)
+RemminaAvahi* remmina_avahi_new(void)
 {
-	RemminaAvahi *ga;
+	RemminaAvahi* ga;
 
 	ga = g_new(RemminaAvahi, 1);
 	ga->discovered_services = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
@@ -258,7 +256,9 @@ void remmina_avahi_free(RemminaAvahi* ga)
 {
 	if (ga == NULL)
 		return;
+
 	remmina_avahi_stop(ga);
+
 	g_free(ga->priv);
 	g_hash_table_destroy(ga->discovered_services);
 	g_free(ga);
@@ -266,8 +266,7 @@ void remmina_avahi_free(RemminaAvahi* ga)
 
 #else
 
-RemminaAvahi*
-remmina_avahi_new(void)
+RemminaAvahi* remmina_avahi_new(void)
 {
 	return NULL;
 }
diff --git a/remmina/src/remmina_chain_button.c b/remmina/src/remmina_chain_button.c
index 93833d6dde..8e1845f838 100644
--- a/remmina/src/remmina_chain_button.c
+++ b/remmina/src/remmina_chain_button.c
@@ -23,137 +23,145 @@
 
 G_DEFINE_TYPE (RemminaChainButton, remmina_chain_button, GTK_TYPE_TABLE)
 
-static const gchar * line_up_xpm[] = {
-"9 7 3 1",
-" 	c None",
-".	c #A9A5A2",
-"+	c #FFFFFF",
-".....    ",
-"+++++.   ",
-"    +.   ",
-"    +.   ",
-"    +.   ",
-"    +.   ",
-"         "};
-
-static const gchar * line_down_xpm[] = {
-"9 7 3 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #A9A5A2",
-"         ",
-"    .+   ",
-"    .+   ",
-"    .+   ",
-"    .+   ",
-".....+   ",
-"+++++    "};
-
-static const gchar * vchain_xpm[] = {
-"9 24 13 1",
-" 	c None",
-".	c #555753",
-"+	c #8D8D8E",
-"@	c #E8E8E9",
-"#	c #8E8E90",
-"$	c #888A85",
-"%	c #8F8F91",
-"&	c #2E3436",
-"*	c #EEEEEC",
-"=	c #989899",
-"-	c #959597",
-";	c #9D9D9E",
-">	c #B9B9BA",
-"         ",
-"         ",
-"  .....  ",
-" .+@@@#. ",
-" .@...@. ",
-" .@. .@. ",
-" .@. .@. ",
-" .@. .@. ",
-" .@.$.@. ",
-" .%&*$%. ",
-"  .&*$.  ",
-"   &*$   ",
-"   &*$   ",
-"  .&*$.  ",
-" .=&*$-. ",
-" .@.&.@. ",
-" .@. .@. ",
-" .@. .@. ",
-" .@. .@. ",
-" .@...@. ",
-" .;@@@>. ",
-"  .....  ",
-"         ",
-"         "};
-
-static const gchar * vchain_broken_xpm[] = {
-"9 24 13 1",
-" 	c None",
-".	c #555753",
-"+	c #8D8D8E",
-"@	c #E8E8E9",
-"#	c #8E8E90",
-"$	c #888A85",
-"%	c #8F8F91",
-"&	c #2E3436",
-"*	c #EEEEEC",
-"=	c #989899",
-"-	c #959597",
-";	c #9D9D9E",
-">	c #B9B9BA",
-"  .....  ",
-" .+@@@#. ",
-" .@...@. ",
-" .@. .@. ",
-" .@. .@. ",
-" .@. .@. ",
-" .@.$.@. ",
-" .%&*$%. ",
-"  .&*$.  ",
-"   &*$   ",
-"         ",
-"         ",
-"         ",
-"         ",
-"   &*$   ",
-"  .&*$.  ",
-" .=&*$-. ",
-" .@.&.@. ",
-" .@. .@. ",
-" .@. .@. ",
-" .@. .@. ",
-" .@...@. ",
-" .;@@@>. ",
-"  .....  "};
+static const gchar* line_up_xpm[] =
+{
+	"9 7 3 1",
+	" 	c None",
+	".	c #A9A5A2",
+	"+	c #FFFFFF",
+	".....    ",
+	"+++++.   ",
+	"    +.   ",
+	"    +.   ",
+	"    +.   ",
+	"    +.   ",
+	"         "
+};
+
+static const gchar* line_down_xpm[] =
+{
+	"9 7 3 1",
+	" 	c None",
+	".	c #FFFFFF",
+	"+	c #A9A5A2",
+	"         ",
+	"    .+   ",
+	"    .+   ",
+	"    .+   ",
+	"    .+   ",
+	".....+   ",
+	"+++++    "
+};
+
+static const gchar* vchain_xpm[] =
+{
+	"9 24 13 1",
+	" 	c None",
+	".	c #555753",
+	"+	c #8D8D8E",
+	"@	c #E8E8E9",
+	"#	c #8E8E90",
+	"$	c #888A85",
+	"%	c #8F8F91",
+	"&	c #2E3436",
+	"*	c #EEEEEC",
+	"=	c #989899",
+	"-	c #959597",
+	";	c #9D9D9E",
+	">	c #B9B9BA",
+	"         ",
+	"         ",
+	"  .....  ",
+	" .+@@@#. ",
+	" .@...@. ",
+	" .@. .@. ",
+	" .@. .@. ",
+	" .@. .@. ",
+	" .@.$.@. ",
+	" .%&*$%. ",
+	"  .&*$.  ",
+	"   &*$   ",
+	"   &*$   ",
+	"  .&*$.  ",
+	" .=&*$-. ",
+	" .@.&.@. ",
+	" .@. .@. ",
+	" .@. .@. ",
+	" .@. .@. ",
+	" .@...@. ",
+	" .;@@@>. ",
+	"  .....  ",
+	"         ",
+	"         "
+};
+
+static const gchar* vchain_broken_xpm[] =
+{
+	"9 24 13 1",
+	" 	c None",
+	".	c #555753",
+	"+	c #8D8D8E",
+	"@	c #E8E8E9",
+	"#	c #8E8E90",
+	"$	c #888A85",
+	"%	c #8F8F91",
+	"&	c #2E3436",
+	"*	c #EEEEEC",
+	"=	c #989899",
+	"-	c #959597",
+	";	c #9D9D9E",
+	">	c #B9B9BA",
+	"  .....  ",
+	" .+@@@#. ",
+	" .@...@. ",
+	" .@. .@. ",
+	" .@. .@. ",
+	" .@. .@. ",
+	" .@.$.@. ",
+	" .%&*$%. ",
+	"  .&*$.  ",
+	"   &*$   ",
+	"         ",
+	"         ",
+	"         ",
+	"         ",
+	"   &*$   ",
+	"  .&*$.  ",
+	" .=&*$-. ",
+	" .@.&.@. ",
+	" .@. .@. ",
+	" .@. .@. ",
+	" .@. .@. ",
+	" .@...@. ",
+	" .;@@@>. ",
+	"  .....  "
+};
 
 enum
 {
-	CHAIN_TOGGLED_SIGNAL, LAST_SIGNAL
+	CHAIN_TOGGLED_SIGNAL,
+	LAST_SIGNAL
 };
 
-static guint remmina_chain_button_signals[LAST_SIGNAL] =
-{ 0 };
+static guint remmina_chain_button_signals[LAST_SIGNAL] = { 0 };
 
-static void remmina_chain_button_class_init(RemminaChainButtonClass *klass)
+static void remmina_chain_button_class_init(RemminaChainButtonClass* klass)
 {
 	remmina_chain_button_signals[CHAIN_TOGGLED_SIGNAL] = g_signal_new("chain-toggled", G_TYPE_FROM_CLASS(klass),
 			G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET(RemminaChainButtonClass, chain_toggled), NULL,
 			NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 }
 
-static void remmina_chain_button_update_chained(RemminaChainButton *cb)
+static void remmina_chain_button_update_chained(RemminaChainButton* cb)
 {
-	GdkPixbuf *pixbuf;
+	GdkPixbuf* pixbuf;
 
 	pixbuf = gdk_pixbuf_new_from_xpm_data(cb->chained ? vchain_xpm : vchain_broken_xpm);
 	gtk_image_set_from_pixbuf(GTK_IMAGE(cb->chain_image), pixbuf);
 	g_object_unref(pixbuf);
 }
 
-static void remmina_chain_button_on_clicked(GtkWidget *widget, RemminaChainButton *cb)
+static void remmina_chain_button_on_clicked(GtkWidget* widget, RemminaChainButton* cb)
 {
 	cb->chained = !cb->chained;
 	remmina_chain_button_update_chained(cb);
@@ -161,11 +169,11 @@ static void remmina_chain_button_on_clicked(GtkWidget *widget, RemminaChainButto
 	g_signal_emit(G_OBJECT(cb), remmina_chain_button_signals[CHAIN_TOGGLED_SIGNAL], 0);
 }
 
-static void remmina_chain_button_init(RemminaChainButton *cb)
+static void remmina_chain_button_init(RemminaChainButton* cb)
 {
-	GtkWidget *widget;
-	GtkWidget *image;
-	GdkPixbuf *pixbuf;
+	GtkWidget* widget;
+	GtkWidget* image;
+	GdkPixbuf* pixbuf;
 
 	gtk_table_resize(GTK_TABLE(cb), 3, 1);
 
@@ -201,7 +209,7 @@ remmina_chain_button_new(void)
 	return GTK_WIDGET(g_object_new(REMMINA_TYPE_CHAIN_BUTTON, NULL));
 }
 
-void remmina_chain_button_set(RemminaChainButton *cb, gboolean chained)
+void remmina_chain_button_set(RemminaChainButton* cb, gboolean chained)
 {
 	cb->chained = chained;
 	remmina_chain_button_update_chained(cb);
diff --git a/remmina/src/remmina_chain_button.h b/remmina/src/remmina_chain_button.h
index 7714ce0a8a..5193a15145 100644
--- a/remmina/src/remmina_chain_button.h
+++ b/remmina/src/remmina_chain_button.h
@@ -36,21 +36,21 @@ typedef struct _RemminaChainButton
     GtkTable table;
 
     gboolean chained;
-    GtkWidget *chain_image;
+    GtkWidget* chain_image;
 } RemminaChainButton;
 
 typedef struct _RemminaChainButtonClass
 {
     GtkTableClass parent_class;
 
-    void (* chain_toggled) (RemminaChainButton *cb);
+    void (* chain_toggled) (RemminaChainButton* cb);
 } RemminaChainButtonClass;
 
-GType remmina_chain_button_get_type (void) G_GNUC_CONST;
+GType remmina_chain_button_get_type(void) G_GNUC_CONST;
 
-GtkWidget* remmina_chain_button_new (void);
+GtkWidget* remmina_chain_button_new(void);
 
-void remmina_chain_button_set (RemminaChainButton *cb, gboolean chained);
+void remmina_chain_button_set (RemminaChainButton* cb, gboolean chained);
 
 G_END_DECLS
 
diff --git a/remmina/src/remmina_chat_window.c b/remmina/src/remmina_chat_window.c
index 0a40ac6f0d..3dacd6dcd1 100644
--- a/remmina/src/remmina_chat_window.c
+++ b/remmina/src/remmina_chat_window.c
@@ -27,37 +27,37 @@ G_DEFINE_TYPE( RemminaChatWindow, remmina_chat_window, GTK_TYPE_WINDOW)
 
 enum
 {
-	SEND_SIGNAL, LAST_SIGNAL
+	SEND_SIGNAL,
+	LAST_SIGNAL
 };
 
-static guint remmina_chat_window_signals[LAST_SIGNAL] =
-{ 0 };
+static guint remmina_chat_window_signals[LAST_SIGNAL] = { 0 };
 
-static void remmina_chat_window_class_init(RemminaChatWindowClass *klass)
+static void remmina_chat_window_class_init(RemminaChatWindowClass* klass)
 {
 	remmina_chat_window_signals[SEND_SIGNAL] = g_signal_new("send", G_TYPE_FROM_CLASS(klass),
 			G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET(RemminaChatWindowClass, send), NULL, NULL,
 			g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
-static void remmina_chat_window_init(RemminaChatWindow *window)
+static void remmina_chat_window_init(RemminaChatWindow* window)
 {
 	window->history_text = NULL;
 	window->send_text = NULL;
 }
 
-static void remmina_chat_window_clear_send_text(GtkWidget *widget, RemminaChatWindow *window)
+static void remmina_chat_window_clear_send_text(GtkWidget* widget, RemminaChatWindow* window)
 {
-	GtkTextBuffer *buffer;
+	GtkTextBuffer* buffer;
 
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->send_text));
 	gtk_text_buffer_set_text(buffer, "", -1);
 	gtk_widget_grab_focus(window->send_text);
 }
 
-static gboolean remmina_chat_window_scroll_proc(RemminaChatWindow *window)
+static gboolean remmina_chat_window_scroll_proc(RemminaChatWindow* window)
 {
-	GtkTextBuffer *buffer;
+	GtkTextBuffer* buffer;
 	GtkTextIter iter;
 
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->history_text));
@@ -67,12 +67,12 @@ static gboolean remmina_chat_window_scroll_proc(RemminaChatWindow *window)
 	return FALSE;
 }
 
-static void remmina_chat_window_append_text(RemminaChatWindow *window, const gchar *name, const gchar *tagname,
-		const gchar *text)
+static void remmina_chat_window_append_text(RemminaChatWindow* window, const gchar* name, const gchar* tagname,
+		const gchar* text)
 {
-	GtkTextBuffer *buffer;
+	GtkTextBuffer* buffer;
 	GtkTextIter iter;
-	gchar *ptr;
+	gchar* ptr;
 
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->history_text));
 
@@ -110,11 +110,11 @@ static void remmina_chat_window_append_text(RemminaChatWindow *window, const gch
 	g_idle_add((GSourceFunc) remmina_chat_window_scroll_proc, window);
 }
 
-static void remmina_chat_window_send(GtkWidget *widget, RemminaChatWindow *window)
+static void remmina_chat_window_send(GtkWidget* widget, RemminaChatWindow* window)
 {
-	GtkTextBuffer *buffer;
+	GtkTextBuffer* buffer;
 	GtkTextIter start, end;
-	gchar *text;
+	gchar* text;
 
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->send_text));
 	gtk_text_buffer_get_bounds(buffer, &start, &end);
@@ -132,7 +132,7 @@ static void remmina_chat_window_send(GtkWidget *widget, RemminaChatWindow *windo
 	remmina_chat_window_clear_send_text(widget, window);
 }
 
-static gboolean remmina_chat_window_send_text_on_key(GtkWidget *widget, GdkEventKey *event, RemminaChatWindow *window)
+static gboolean remmina_chat_window_send_text_on_key(GtkWidget* widget, GdkEventKey* event, RemminaChatWindow* window)
 {
 	if (event->keyval == GDK_KEY_Return)
 	{
@@ -143,15 +143,15 @@ static gboolean remmina_chat_window_send_text_on_key(GtkWidget *widget, GdkEvent
 }
 
 GtkWidget*
-remmina_chat_window_new(GtkWindow *parent, const gchar *chat_with)
+remmina_chat_window_new(GtkWindow* parent, const gchar* chat_with)
 {
-	RemminaChatWindow *window;
+	RemminaChatWindow* window;
 	gchar buf[100];
-	GtkWidget *table;
-	GtkWidget *scrolledwindow;
-	GtkWidget *widget;
-	GtkWidget *image;
-	GtkTextBuffer *buffer;
+	GtkWidget* table;
+	GtkWidget* scrolledwindow;
+	GtkWidget* widget;
+	GtkWidget* image;
+	GtkTextBuffer* buffer;
 
 	window = REMMINA_CHAT_WINDOW(g_object_new(REMMINA_TYPE_CHAT_WINDOW, NULL));
 
@@ -230,7 +230,7 @@ remmina_chat_window_new(GtkWindow *parent, const gchar *chat_with)
 	return GTK_WIDGET(window);
 }
 
-void remmina_chat_window_receive(RemminaChatWindow *window, const gchar *name, const gchar *text)
+void remmina_chat_window_receive(RemminaChatWindow* window, const gchar* name, const gchar* text)
 {
 	remmina_chat_window_append_text(window, name, "receiver-foreground", text);
 }
diff --git a/remmina/src/remmina_connection_window.c b/remmina/src/remmina_connection_window.c
index 1efa557509..8a05ae5f29 100644
--- a/remmina/src/remmina_connection_window.c
+++ b/remmina/src/remmina_connection_window.c
@@ -39,20 +39,20 @@ G_DEFINE_TYPE( RemminaConnectionWindow, remmina_connection_window, GTK_TYPE_WIND
 #define MOTION_TIME 100
 
 /* One process can only have one option popup at a time */
-static GtkWidget *scale_option_window = NULL;
+static GtkWidget* scale_option_window = NULL;
 
 typedef struct _RemminaConnectionHolder RemminaConnectionHolder;
 
 struct _RemminaConnectionWindowPriv
 {
-	RemminaConnectionHolder *cnnhld;
+	RemminaConnectionHolder* cnnhld;
 
-	GtkWidget *notebook;
+	GtkWidget* notebook;
 
 	guint switch_page_handler;
 
-	GtkWidget *floating_toolbar;
-	GtkWidget *floating_toolbar_label;
+	GtkWidget* floating_toolbar;
+	GtkWidget* floating_toolbar_label;
 	gdouble floating_toolbar_opacity;
 	/* To avoid strange event-loop */
 	guint floating_toolbar_motion_handler;
@@ -60,20 +60,20 @@ struct _RemminaConnectionWindowPriv
 	gboolean floating_toolbar_motion_show;
 	gboolean floating_toolbar_motion_visible;
 
-	GtkWidget *toolbar;
+	GtkWidget* toolbar;
 
 	/* Toolitems that need to be handled */
-	GtkToolItem *toolitem_autofit;
-	GtkToolItem *toolitem_fullscreen;
-	GtkToolItem *toolitem_switch_page;
-	GtkToolItem *toolitem_scale;
-	GtkToolItem *toolitem_grab;
-	GtkToolItem *toolitem_preferences;
-	GtkToolItem *toolitem_tools;
-	GtkWidget *scale_option_button;
-	GtkWidget *fullscreen_option_button;
-
-	GtkWidget *pin_button;
+	GtkToolItem* toolitem_autofit;
+	GtkToolItem* toolitem_fullscreen;
+	GtkToolItem* toolitem_switch_page;
+	GtkToolItem* toolitem_scale;
+	GtkToolItem* toolitem_grab;
+	GtkToolItem* toolitem_preferences;
+	GtkToolItem* toolitem_tools;
+	GtkWidget* scale_option_button;
+	GtkWidget* fullscreen_option_button;
+
+	GtkWidget* pin_button;
 	gboolean pin_down;
 
 	gboolean sticky;
@@ -83,27 +83,27 @@ struct _RemminaConnectionWindowPriv
 
 typedef struct _RemminaConnectionObject
 {
-	RemminaConnectionHolder *cnnhld;
+	RemminaConnectionHolder* cnnhld;
 
-	RemminaFile *remmina_file;
+	RemminaFile* remmina_file;
 
 	/* A dummy window which will be realized as a container during initialize, before reparent to the real window */
-	GtkWidget *window;
+	GtkWidget* window;
 
 	/* Containers for RemminaProtocolWidget: RemminaProtocolWidget->alignment->viewport...->window */
-	GtkWidget *proto;
-	GtkWidget *alignment;
-	GtkWidget *viewport;
+	GtkWidget* proto;
+	GtkWidget* alignment;
+	GtkWidget* viewport;
 
 	/* Scrolled containers */
-	GtkWidget *scrolled_container;
+	GtkWidget* scrolled_container;
 
 	gboolean connected;
 } RemminaConnectionObject;
 
 struct _RemminaConnectionHolder
 {
-	RemminaConnectionWindow *cnnwin;
+	RemminaConnectionWindow* cnnwin;
 	gint fullscreen_view_mode;
 
 	gboolean hostkey_activated;
@@ -112,21 +112,21 @@ struct _RemminaConnectionHolder
 
 #define DECLARE_CNNOBJ \
     if (!cnnhld || !cnnhld->cnnwin || gtk_notebook_get_current_page (GTK_NOTEBOOK (cnnhld->cnnwin->priv->notebook)) < 0) return; \
-    RemminaConnectionObject *cnnobj = (RemminaConnectionObject*) g_object_get_data ( \
-        G_OBJECT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (cnnhld->cnnwin->priv->notebook), \
+    RemminaConnectionObject* cnnobj = (RemminaConnectionObject*) g_object_get_data ( \
+        G_OBJECT(gtk_notebook_get_nth_page (GTK_NOTEBOOK (cnnhld->cnnwin->priv->notebook), \
         gtk_notebook_get_current_page (GTK_NOTEBOOK (cnnhld->cnnwin->priv->notebook)))), "cnnobj");
 
 #define DECLARE_CNNOBJ_WITH_RETURN(r) \
     if (!cnnhld || !cnnhld->cnnwin || gtk_notebook_get_current_page (GTK_NOTEBOOK (cnnhld->cnnwin->priv->notebook)) < 0) return r; \
-    RemminaConnectionObject *cnnobj = (RemminaConnectionObject*) g_object_get_data ( \
-        G_OBJECT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (cnnhld->cnnwin->priv->notebook), \
+    RemminaConnectionObject* cnnobj = (RemminaConnectionObject*) g_object_get_data ( \
+        G_OBJECT(gtk_notebook_get_nth_page (GTK_NOTEBOOK (cnnhld->cnnwin->priv->notebook), \
         gtk_notebook_get_current_page (GTK_NOTEBOOK (cnnhld->cnnwin->priv->notebook)))), "cnnobj");
 
-static void remmina_connection_holder_create_scrolled(RemminaConnectionHolder *cnnhld, RemminaConnectionObject *cnnobj);
-static void remmina_connection_holder_create_fullscreen(RemminaConnectionHolder *cnnhld, RemminaConnectionObject *cnnobj,
+static void remmina_connection_holder_create_scrolled(RemminaConnectionHolder* cnnhld, RemminaConnectionObject* cnnobj);
+static void remmina_connection_holder_create_fullscreen(RemminaConnectionHolder* cnnhld, RemminaConnectionObject* cnnobj,
 		gint view_mode);
 
-static void remmina_connection_window_class_init(RemminaConnectionWindowClass *klass)
+static void remmina_connection_window_class_init(RemminaConnectionWindowClass* klass)
 {
 	gtk_rc_parse_string("style \"remmina-small-button-style\"\n"
 			"{\n"
@@ -138,7 +138,7 @@ static void remmina_connection_window_class_init(RemminaConnectionWindowClass *k
 			"widget \"*.remmina-small-button\" style \"remmina-small-button-style\"");
 }
 
-static void remmina_connection_holder_disconnect(RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_disconnect(RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
 
@@ -147,7 +147,7 @@ static void remmina_connection_holder_disconnect(RemminaConnectionHolder *cnnhld
 	remmina_protocol_widget_close_connection(REMMINA_PROTOCOL_WIDGET(cnnobj->proto));
 }
 
-static void remmina_connection_holder_keyboard_grab(RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_keyboard_grab(RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
 
@@ -161,14 +161,14 @@ static void remmina_connection_holder_keyboard_grab(RemminaConnectionHolder *cnn
 	}
 }
 
-static gboolean remmina_connection_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
+static gboolean remmina_connection_window_delete_event(GtkWidget* widget, GdkEvent* event, gpointer data)
 {
-	RemminaConnectionHolder *cnnhld = (RemminaConnectionHolder*) data;
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	RemminaConnectionObject *cnnobj;
-	GtkNotebook *notebook = GTK_NOTEBOOK(priv->notebook);
-	GtkWidget *dialog;
-	GtkWidget *w;
+	RemminaConnectionHolder* cnnhld = (RemminaConnectionHolder*) data;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	RemminaConnectionObject* cnnobj;
+	GtkNotebook* notebook = GTK_NOTEBOOK(priv->notebook);
+	GtkWidget* dialog;
+	GtkWidget* w;
 	gint i, n;
 
 	n = gtk_notebook_get_n_pages(notebook);
@@ -196,9 +196,9 @@ static gboolean remmina_connection_window_delete_event(GtkWidget *widget, GdkEve
 	return TRUE;
 }
 
-static void remmina_connection_window_destroy(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_window_destroy(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = REMMINA_CONNECTION_WINDOW(widget)->priv;
+	RemminaConnectionWindowPriv* priv = REMMINA_CONNECTION_WINDOW(widget)->priv;
 
 	if (priv->floating_toolbar_motion_handler)
 	{
@@ -218,10 +218,10 @@ static void remmina_connection_window_destroy(GtkWidget *widget, RemminaConnecti
 	g_free(priv);
 }
 
-static void remmina_connection_holder_update_toolbar_opacity(RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_update_toolbar_opacity(RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	priv->floating_toolbar_opacity = (1.0 - TOOLBAR_OPACITY_MIN) / ((gdouble) TOOLBAR_OPACITY_LEVEL)
 			* ((gdouble)(TOOLBAR_OPACITY_LEVEL - remmina_file_get_int(cnnobj->remmina_file, "toolbar_opacity", 0)))
@@ -233,9 +233,9 @@ static void remmina_connection_holder_update_toolbar_opacity(RemminaConnectionHo
 	}
 }
 
-static gboolean remmina_connection_holder_floating_toolbar_motion(RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_holder_floating_toolbar_motion(RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 	GtkRequisition req;
 	gint x, y, t;
 
@@ -281,9 +281,9 @@ static gboolean remmina_connection_holder_floating_toolbar_motion(RemminaConnect
 	return TRUE;
 }
 
-static void remmina_connection_holder_floating_toolbar_update(RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_floating_toolbar_update(RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	if (priv->floating_toolbar_motion_show || priv->floating_toolbar_motion_visible)
 	{
@@ -302,9 +302,9 @@ static void remmina_connection_holder_floating_toolbar_update(RemminaConnectionH
 	}
 }
 
-static void remmina_connection_holder_floating_toolbar_show(RemminaConnectionHolder *cnnhld, gboolean show)
+static void remmina_connection_holder_floating_toolbar_show(RemminaConnectionHolder* cnnhld, gboolean show)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	if (priv->floating_toolbar == NULL)
 		return;
@@ -314,9 +314,9 @@ static void remmina_connection_holder_floating_toolbar_show(RemminaConnectionHol
 	remmina_connection_holder_floating_toolbar_update(cnnhld);
 }
 
-static void remmina_connection_holder_floating_toolbar_visible(RemminaConnectionHolder *cnnhld, gboolean visible)
+static void remmina_connection_holder_floating_toolbar_visible(RemminaConnectionHolder* cnnhld, gboolean visible)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	if (priv->floating_toolbar == NULL)
 		return;
@@ -326,12 +326,12 @@ static void remmina_connection_holder_floating_toolbar_visible(RemminaConnection
 	remmina_connection_holder_floating_toolbar_update(cnnhld);
 }
 
-static void remmina_connection_holder_get_desktop_size(RemminaConnectionHolder* cnnhld, gint *width, gint *height,
+static void remmina_connection_holder_get_desktop_size(RemminaConnectionHolder* cnnhld, gint* width, gint* height,
 		gboolean expand)
 {
 	DECLARE_CNNOBJ
-	RemminaFile *remminafile = cnnobj->remmina_file;
-	RemminaProtocolWidget *gp = REMMINA_PROTOCOL_WIDGET(cnnobj->proto);
+	RemminaFile* remminafile = cnnobj->remmina_file;
+	RemminaProtocolWidget* gp = REMMINA_PROTOCOL_WIDGET(cnnobj->proto);
 	gboolean scale;
 
 	scale = remmina_protocol_widget_get_scale(gp);
@@ -363,7 +363,7 @@ static void remmina_connection_holder_get_desktop_size(RemminaConnectionHolder*
 	}
 }
 
-static void remmina_connection_object_set_scrolled_policy(RemminaConnectionObject *cnnobj, GtkScrolledWindow *scrolled_window)
+static void remmina_connection_object_set_scrolled_policy(RemminaConnectionObject* cnnobj, GtkScrolledWindow* scrolled_window)
 {
 	gboolean expand;
 
@@ -375,7 +375,7 @@ static void remmina_connection_object_set_scrolled_policy(RemminaConnectionObjec
 static gboolean remmina_connection_holder_toolbar_autofit_restore(RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ_WITH_RETURN(FALSE)
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 	gint width, height;
 	GtkAllocation na, ca, ta;
 
@@ -396,7 +396,7 @@ static gboolean remmina_connection_holder_toolbar_autofit_restore(RemminaConnect
 	return FALSE;
 }
 
-static void remmina_connection_holder_toolbar_autofit(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_toolbar_autofit(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
 
@@ -417,10 +417,10 @@ static void remmina_connection_holder_toolbar_autofit(GtkWidget *widget, Remmina
 
 }
 
-static void remmina_connection_object_init_adjustment(RemminaConnectionObject *cnnobj)
+static void remmina_connection_object_init_adjustment(RemminaConnectionObject* cnnobj)
 {
-	GdkScreen *screen;
-	GtkAdjustment *adj;
+	GdkScreen* screen;
+	GtkAdjustment* adj;
 	gint screen_width, screen_height;
 
 	screen = gdk_screen_get_default();
@@ -433,11 +433,11 @@ static void remmina_connection_object_init_adjustment(RemminaConnectionObject *c
 	gtk_adjustment_set_page_size(adj, screen_height);
 }
 
-static void remmina_connection_holder_check_resize(RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_check_resize(RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
 	gboolean scroll_required = FALSE;
-	GdkScreen *screen;
+	GdkScreen* screen;
 	gint screen_width, screen_height;
 	gint server_width, server_height;
 
@@ -502,9 +502,10 @@ static void remmina_connection_holder_check_resize(RemminaConnectionHolder *cnnh
     }
 		}
 
-static void remmina_connection_holder_set_tooltip(GtkWidget *item, const gchar *tip, guint key1, guint key2)
+static void remmina_connection_holder_set_tooltip(GtkWidget* item, const gchar* tip, guint key1, guint key2)
 {
-	gchar *s1, *s2;
+	gchar* s1;
+	gchar* s2;
 
 	if (remmina_pref.hostkey && key1)
 	{
@@ -534,7 +535,7 @@ static void remmina_connection_holder_set_tooltip(GtkWidget *item, const gchar *
 	g_free(s1);
 }
 
-static void remmina_connection_holder_toolbar_fullscreen(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_toolbar_fullscreen(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	if (gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget)))
 	{
@@ -546,7 +547,7 @@ static void remmina_connection_holder_toolbar_fullscreen(GtkWidget *widget, Remm
 	}
 }
 
-static void remmina_connection_holder_viewport_fullscreen_mode(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_viewport_fullscreen_mode(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))
 		return;
@@ -554,7 +555,7 @@ static void remmina_connection_holder_viewport_fullscreen_mode(GtkWidget *widget
 	remmina_connection_holder_create_fullscreen(cnnhld, NULL, cnnhld->fullscreen_view_mode);
 }
 
-static void remmina_connection_holder_scrolled_fullscreen_mode(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_scrolled_fullscreen_mode(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))
 		return;
@@ -562,9 +563,9 @@ static void remmina_connection_holder_scrolled_fullscreen_mode(GtkWidget *widget
 	remmina_connection_holder_create_fullscreen(cnnhld, NULL, cnnhld->fullscreen_view_mode);
 }
 
-static void remmina_connection_holder_fullscreen_option_popdown(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_fullscreen_option_popdown(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	priv->sticky = FALSE;
 
@@ -572,12 +573,12 @@ static void remmina_connection_holder_fullscreen_option_popdown(GtkWidget *widge
 	remmina_connection_holder_floating_toolbar_show(cnnhld, FALSE);
 }
 
-static void remmina_connection_holder_toolbar_fullscreen_option(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_toolbar_fullscreen_option(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-	GSList *group;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	GtkWidget* menu;
+	GtkWidget* menuitem;
+	GSList* group;
 
 	if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
 		return;
@@ -614,8 +615,8 @@ static void remmina_connection_holder_toolbar_fullscreen_option(GtkWidget *widge
 static void remmina_connection_holder_update_alignment(RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
-	RemminaProtocolWidget *gp = REMMINA_PROTOCOL_WIDGET(cnnobj->proto);
-	RemminaFile *remminafile = cnnobj->remmina_file;
+	RemminaProtocolWidget* gp = REMMINA_PROTOCOL_WIDGET(cnnobj->proto);
+	RemminaFile* remminafile = cnnobj->remmina_file;
 	gboolean scale, expand;
 	gint gp_width, gp_height;
 	gint width, height;
@@ -657,18 +658,18 @@ static void remmina_connection_holder_update_alignment(RemminaConnectionHolder*
 			}
 		}
 
-static void remmina_connection_holder_switch_page_activate(GtkMenuItem *menuitem, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_switch_page_activate(GtkMenuItem* menuitem, RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 	gint page_num;
 
 	page_num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), "new-page-num"));
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(priv->notebook), page_num);
 }
 
-static void remmina_connection_holder_toolbar_switch_page_popdown(GtkWidget *widget, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_toolbar_switch_page_popdown(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	priv->sticky = FALSE;
 
@@ -676,14 +677,14 @@ static void remmina_connection_holder_toolbar_switch_page_popdown(GtkWidget *wid
 	remmina_connection_holder_floating_toolbar_show(cnnhld, FALSE);
 }
 
-static void remmina_connection_holder_toolbar_switch_page(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_toolbar_switch_page(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionObject *cnnobj;
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-	GtkWidget *image;
-	GtkWidget *page;
+	RemminaConnectionObject* cnnobj;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	GtkWidget* menu;
+	GtkWidget* menuitem;
+	GtkWidget* image;
+	GtkWidget* page;
 	gint i, n;
 
 	if (!gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget)))
@@ -724,7 +725,7 @@ static void remmina_connection_holder_toolbar_switch_page(GtkWidget *widget, Rem
 	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, remmina_public_popup_position, widget, 0, gtk_get_current_event_time());
 }
 
-static void remmina_connection_holder_toolbar_scaled_mode(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_toolbar_scaled_mode(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
 	gboolean scale;
@@ -744,7 +745,7 @@ static void remmina_connection_holder_toolbar_scaled_mode(GtkWidget *widget, Rem
 	}
 }
 
-static void remmina_connection_holder_scale_option_on_scaled(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_scale_option_on_scaled(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
 
@@ -762,7 +763,7 @@ static void remmina_connection_holder_scale_option_on_scaled(GtkWidget *widget,
 
 static void remmina_connection_holder_scale_option_popdown(RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	priv->sticky = FALSE;
 
@@ -779,12 +780,12 @@ static void remmina_connection_holder_scale_option_popdown(RemminaConnectionHold
 	remmina_connection_holder_floating_toolbar_show(cnnhld, FALSE);
 }
 
-static gboolean remmina_connection_holder_trap_on_button(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean remmina_connection_holder_trap_on_button(GtkWidget* widget, GdkEventButton* event, gpointer data)
 {
 	return TRUE;
 }
 
-static gboolean remmina_connection_holder_scale_option_on_key(GtkWidget *widget, GdkEventKey *event,
+static gboolean remmina_connection_holder_scale_option_on_key(GtkWidget* widget, GdkEventKey* event,
 		RemminaConnectionHolder* cnnhld)
 {
 	switch (event->keyval)
@@ -796,22 +797,22 @@ static gboolean remmina_connection_holder_scale_option_on_key(GtkWidget *widget,
 	return FALSE;
 }
 
-static gboolean remmina_connection_holder_scale_option_on_button(GtkWidget *widget, GdkEventButton *event,
+static gboolean remmina_connection_holder_scale_option_on_button(GtkWidget* widget, GdkEventButton* event,
 		RemminaConnectionHolder* cnnhld)
 {
 	remmina_connection_holder_scale_option_popdown(cnnhld);
 	return TRUE;
 }
 
-static void remmina_connection_holder_toolbar_scale_option(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_toolbar_scale_option(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	RemminaFile *remminafile = cnnobj->remmina_file;
-	GtkWidget *window;
-	GtkWidget *eventbox;
-	GtkWidget *frame;
-	GtkWidget *scaler;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	RemminaFile* remminafile = cnnobj->remmina_file;
+	GtkWidget* window;
+	GtkWidget* eventbox;
+	GtkWidget* frame;
+	GtkWidget* scaler;
 	gint x, y;
 	gboolean pushin;
 
@@ -872,9 +873,9 @@ static void remmina_connection_holder_toolbar_scale_option(GtkWidget *widget, Re
 		}
 }
 
-static void remmina_connection_holder_toolbar_preferences_popdown(GtkWidget *widget, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_toolbar_preferences_popdown(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	priv->sticky = FALSE;
 
@@ -882,9 +883,9 @@ static void remmina_connection_holder_toolbar_preferences_popdown(GtkWidget *wid
 	remmina_connection_holder_floating_toolbar_show(cnnhld, FALSE);
 }
 
-static void remmina_connection_holder_toolbar_tools_popdown(GtkWidget *widget, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_toolbar_tools_popdown(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	priv->sticky = FALSE;
 
@@ -892,10 +893,10 @@ static void remmina_connection_holder_toolbar_tools_popdown(GtkWidget *widget, R
 	remmina_connection_holder_floating_toolbar_show(cnnhld, FALSE);
 }
 
-static void remmina_connection_holder_call_protocol_feature_radio(GtkMenuItem *menuitem, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_call_protocol_feature_radio(GtkMenuItem* menuitem, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
-	RemminaProtocolFeature *feature;
+	RemminaProtocolFeature* feature;
 	gpointer value;
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem)))
@@ -908,10 +909,10 @@ static void remmina_connection_holder_call_protocol_feature_radio(GtkMenuItem *m
 	}
 }
 
-static void remmina_connection_holder_call_protocol_feature_check(GtkMenuItem *menuitem, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_call_protocol_feature_check(GtkMenuItem* menuitem, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
-	RemminaProtocolFeature *feature;
+	RemminaProtocolFeature* feature;
 	gboolean value;
 
 	feature = (RemminaProtocolFeature*) g_object_get_data(G_OBJECT(menuitem), "feature-type");
@@ -920,23 +921,23 @@ static void remmina_connection_holder_call_protocol_feature_check(GtkMenuItem *m
 	remmina_protocol_widget_call_feature_by_ref(REMMINA_PROTOCOL_WIDGET(cnnobj->proto), feature);
 }
 
-static void remmina_connection_holder_call_protocol_feature_activate(GtkMenuItem *menuitem, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_call_protocol_feature_activate(GtkMenuItem* menuitem, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
-	RemminaProtocolFeature *feature;
+	RemminaProtocolFeature* feature;
 
 	feature = (RemminaProtocolFeature*) g_object_get_data(G_OBJECT(menuitem), "feature-type");
 	remmina_protocol_widget_call_feature_by_ref(REMMINA_PROTOCOL_WIDGET(cnnobj->proto), feature);
 }
 
-static void remmina_connection_holder_toolbar_preferences_radio(RemminaConnectionHolder *cnnhld, RemminaFile *remminafile,
-		GtkWidget *menu, const RemminaProtocolFeature *feature, const gchar *domain, gboolean enabled)
+static void remmina_connection_holder_toolbar_preferences_radio(RemminaConnectionHolder* cnnhld, RemminaFile* remminafile,
+		GtkWidget* menu, const RemminaProtocolFeature* feature, const gchar* domain, gboolean enabled)
 {
-	GtkWidget *menuitem;
-	GSList *group;
+	GtkWidget* menuitem;
+	GSList* group;
 	gint i;
-	const gchar **list;
-	const gchar *value;
+	const gchar** list;
+	const gchar* value;
 
 	group = NULL;
 	value = remmina_file_get_string(remminafile, (const gchar*) feature->opt2);
@@ -968,10 +969,10 @@ static void remmina_connection_holder_toolbar_preferences_radio(RemminaConnectio
 	}
 }
 
-static void remmina_connection_holder_toolbar_preferences_check(RemminaConnectionHolder *cnnhld, RemminaFile *remminafile,
-		GtkWidget *menu, const RemminaProtocolFeature *feature, const gchar *domain, gboolean enabled)
+static void remmina_connection_holder_toolbar_preferences_check(RemminaConnectionHolder* cnnhld, RemminaFile* remminafile,
+		GtkWidget* menu, const RemminaProtocolFeature* feature, const gchar* domain, gboolean enabled)
 {
-	GtkWidget *menuitem;
+	GtkWidget* menuitem;
 
 	menuitem = gtk_check_menu_item_new_with_label(g_dgettext(domain, (const gchar*) feature->opt3));
 	gtk_widget_show(menuitem);
@@ -993,15 +994,15 @@ static void remmina_connection_holder_toolbar_preferences_check(RemminaConnectio
 	}
 }
 
-static void remmina_connection_holder_toolbar_preferences(GtkWidget *widget, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_toolbar_preferences(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	const RemminaProtocolFeature *feature;
-	GtkWidget *menu;
-	GtkWidget *menuitem;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	const RemminaProtocolFeature* feature;
+	GtkWidget* menu;
+	GtkWidget* menuitem;
 	gboolean separator;
-	const gchar *domain;
+	const gchar* domain;
 	gboolean enabled;
 
 	if (!gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget)))
@@ -1047,15 +1048,15 @@ static void remmina_connection_holder_toolbar_preferences(GtkWidget *widget, Rem
 	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, remmina_public_popup_position, widget, 0, gtk_get_current_event_time());
 }
 
-static void remmina_connection_holder_toolbar_tools(GtkWidget *widget, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_toolbar_tools(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	const RemminaProtocolFeature *feature;
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-	GtkWidget *image;
-	const gchar *domain;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	const RemminaProtocolFeature* feature;
+	GtkWidget* menu;
+	GtkWidget* menuitem;
+	GtkWidget* image;
+	const gchar* domain;
 	gboolean enabled;
 
 	if (!gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget)))
@@ -1111,18 +1112,18 @@ static void remmina_connection_holder_toolbar_tools(GtkWidget *widget, RemminaCo
 	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, remmina_public_popup_position, widget, 0, gtk_get_current_event_time());
 }
 
-static void remmina_connection_holder_toolbar_minimize(GtkWidget *widget, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_toolbar_minimize(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	remmina_connection_holder_floating_toolbar_show(cnnhld, FALSE);
 	gtk_window_iconify(GTK_WINDOW(cnnhld->cnnwin));
 }
 
-static void remmina_connection_holder_toolbar_disconnect(GtkWidget *widget, RemminaConnectionHolder* cnnhld)
+static void remmina_connection_holder_toolbar_disconnect(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	remmina_connection_holder_disconnect(cnnhld);
 }
 
-static void remmina_connection_holder_toolbar_grab(GtkWidget *widget, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_toolbar_grab(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
 
@@ -1132,13 +1133,13 @@ static void remmina_connection_holder_toolbar_grab(GtkWidget *widget, RemminaCon
 }
 
 static GtkWidget*
-remmina_connection_holder_create_toolbar(RemminaConnectionHolder *cnnhld, gint mode)
+remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint mode)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	GtkWidget *toolbar;
-	GtkToolItem *toolitem;
-	GtkWidget *widget;
-	GtkWidget *arrow;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	GtkWidget* toolbar;
+	GtkToolItem* toolitem;
+	GtkWidget* widget;
+	GtkWidget* arrow;
 
 	toolbar = gtk_toolbar_new();
 	gtk_widget_show(toolbar);
@@ -1286,11 +1287,11 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder *cnnhld, gint m
 	return toolbar;
 }
 
-static void remmina_connection_holder_update_toolbar(RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_update_toolbar(RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	GtkToolItem *toolitem;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	GtkToolItem* toolitem;
 	gboolean bval;
 
 	toolitem = priv->toolitem_autofit;
@@ -1342,9 +1343,9 @@ static void remmina_connection_holder_update_toolbar(RemminaConnectionHolder *cn
 	}
 }
 
-static void remmina_connection_holder_showhide_toolbar(RemminaConnectionHolder *cnnhld, gboolean resize)
+static void remmina_connection_holder_showhide_toolbar(RemminaConnectionHolder* cnnhld, gboolean resize)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 	GtkRequisition req;
 	gint width, height;
 
@@ -1381,17 +1382,17 @@ static void remmina_connection_holder_showhide_toolbar(RemminaConnectionHolder *
 	}
 }
 
-static gboolean remmina_connection_holder_toolbar_enter(GtkWidget *widget, GdkEventCrossing *event,
-		RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_holder_toolbar_enter(GtkWidget* widget, GdkEventCrossing* event,
+		RemminaConnectionHolder* cnnhld)
 {
 	remmina_connection_holder_floating_toolbar_show(cnnhld, TRUE);
 	return TRUE;
 }
 
-static gboolean remmina_connection_holder_toolbar_leave(GtkWidget *widget, GdkEventCrossing *event,
-		RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_holder_toolbar_leave(GtkWidget* widget, GdkEventCrossing* event,
+		RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	if (!priv->sticky && event->mode == GDK_CROSSING_NORMAL)
 	{
@@ -1401,9 +1402,9 @@ static gboolean remmina_connection_holder_toolbar_leave(GtkWidget *widget, GdkEv
 	return FALSE;
 }
 
-static gboolean remmina_connection_window_focus_in(GtkWidget *widget, GdkEventFocus *event, RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_window_focus_in(GtkWidget* widget, GdkEventFocus* event, RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	if (priv->floating_toolbar)
 	{
@@ -1412,10 +1413,10 @@ static gboolean remmina_connection_window_focus_in(GtkWidget *widget, GdkEventFo
 	return FALSE;
 }
 
-static gboolean remmina_connection_window_focus_out(GtkWidget *widget, GdkEventFocus *event, RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_window_focus_out(GtkWidget* widget, GdkEventFocus* event, RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ_WITH_RETURN(FALSE)
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	cnnhld->hostkey_activated = FALSE;
 	if (!priv->sticky && priv->floating_toolbar)
@@ -1431,7 +1432,7 @@ static gboolean remmina_connection_window_focus_out(GtkWidget *widget, GdkEventF
 	return FALSE;
 }
 
-static gboolean remmina_connection_window_on_enter(GtkWidget *widget, GdkEventCrossing *event, RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_window_on_enter(GtkWidget* widget, GdkEventCrossing* event, RemminaConnectionHolder* cnnhld)
 {
 	if (event->detail == GDK_NOTIFY_VIRTUAL || event->detail == GDK_NOTIFY_NONLINEAR
 			|| event->detail == GDK_NOTIFY_NONLINEAR_VIRTUAL)
@@ -1441,7 +1442,7 @@ static gboolean remmina_connection_window_on_enter(GtkWidget *widget, GdkEventCr
 	return FALSE;
 }
 
-static gboolean remmina_connection_window_on_leave(GtkWidget *widget, GdkEventCrossing *event, RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_window_on_leave(GtkWidget* widget, GdkEventCrossing* event, RemminaConnectionHolder* cnnhld)
 {
 	if (event->detail == GDK_NOTIFY_VIRTUAL || event->detail == GDK_NOTIFY_NONLINEAR
 			|| event->detail == GDK_NOTIFY_NONLINEAR_VIRTUAL)
@@ -1451,8 +1452,8 @@ static gboolean remmina_connection_window_on_leave(GtkWidget *widget, GdkEventCr
 	return FALSE;
 }
 
-static gboolean remmina_connection_holder_toolbar_scroll(GtkWidget *widget, GdkEventScroll *event,
-		RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_holder_toolbar_scroll(GtkWidget* widget, GdkEventScroll* event,
+		RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ_WITH_RETURN(FALSE)
 	int opacity;
@@ -1482,17 +1483,17 @@ static gboolean remmina_connection_holder_toolbar_scroll(GtkWidget *widget, GdkE
 	return FALSE;
 }
 
-static void remmina_connection_object_alignment_on_allocate(GtkWidget *widget, GtkAllocation *allocation,
-		RemminaConnectionObject *cnnobj)
+static void remmina_connection_object_alignment_on_allocate(GtkWidget* widget, GtkAllocation* allocation,
+		RemminaConnectionObject* cnnobj)
 {
 	remmina_connection_holder_update_alignment(cnnobj->cnnhld);
 }
 
-static gboolean remmina_connection_window_on_configure(GtkWidget *widget, GdkEventConfigure *event,
-		RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_window_on_configure(GtkWidget* widget, GdkEventConfigure* event,
+		RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ_WITH_RETURN(FALSE)
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 	GtkRequisition req;
 	gint width, height;
 	gint y;
@@ -1531,7 +1532,7 @@ static gboolean remmina_connection_window_on_configure(GtkWidget *widget, GdkEve
 	return FALSE;
 }
 
-static void remmina_connection_holder_update_pin(RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_update_pin(RemminaConnectionHolder* cnnhld)
 {
 	if (cnnhld->cnnwin->priv->pin_down)
 	{
@@ -1545,21 +1546,21 @@ static void remmina_connection_holder_update_pin(RemminaConnectionHolder *cnnhld
 	}
 }
 
-static void remmina_connection_holder_toolbar_pin(GtkWidget *widget, RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_toolbar_pin(GtkWidget* widget, RemminaConnectionHolder* cnnhld)
 {
 	cnnhld->cnnwin->priv->pin_down = !cnnhld->cnnwin->priv->pin_down;
 	remmina_connection_holder_update_pin(cnnhld);
 }
 
-static void remmina_connection_holder_create_floating_toolbar(RemminaConnectionHolder *cnnhld, gint mode)
+static void remmina_connection_holder_create_floating_toolbar(RemminaConnectionHolder* cnnhld, gint mode)
 {
 	DECLARE_CNNOBJ
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *widget;
-	GtkWidget *eventbox;
-	GtkWidget *hbox;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	GtkWidget* window;
+	GtkWidget* vbox;
+	GtkWidget* widget;
+	GtkWidget* eventbox;
+	GtkWidget* hbox;
 
 	/* This has to be a popup window to become visible in fullscreen mode */
 	window = gtk_window_new(GTK_WINDOW_POPUP);
@@ -1617,9 +1618,9 @@ static void remmina_connection_holder_create_floating_toolbar(RemminaConnectionH
 		gtk_widget_show(window);
 }
 
-static void remmina_connection_window_init(RemminaConnectionWindow *cnnwin)
+static void remmina_connection_window_init(RemminaConnectionWindow* cnnwin)
 {
-	RemminaConnectionWindowPriv *priv;
+	RemminaConnectionWindowPriv* priv;
 
 	priv = g_new0(RemminaConnectionWindowPriv, 1);
 	cnnwin->priv = priv;
@@ -1633,9 +1634,9 @@ static void remmina_connection_window_init(RemminaConnectionWindow *cnnwin)
 	remmina_widget_pool_register(GTK_WIDGET(cnnwin));
 }
 
-static gboolean remmina_connection_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data)
+static gboolean remmina_connection_window_state_event(GtkWidget* widget, GdkEventWindowState* event, gpointer user_data)
 {
-	GdkScreen *screen;
+	GdkScreen* screen;
 
 	screen = gdk_screen_get_default();
 	if (remmina_pref.minimize_to_tray && (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED) != 0
@@ -1651,9 +1652,9 @@ static gboolean remmina_connection_window_state_event(GtkWidget *widget, GdkEven
 }
 
 static GtkWidget*
-remmina_connection_window_new_from_holder(RemminaConnectionHolder *cnnhld)
+remmina_connection_window_new_from_holder(RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindow *cnnwin;
+	RemminaConnectionWindow* cnnwin;
 
 	cnnwin = REMMINA_CONNECTION_WINDOW(g_object_new(REMMINA_TYPE_CONNECTION_WINDOW, NULL));
 	cnnwin->priv->cnnhld = cnnhld;
@@ -1676,9 +1677,9 @@ remmina_connection_window_new_from_holder(RemminaConnectionHolder *cnnhld)
 /* This function will be called for the first connection. A tag is set to the window so that
  * other connections can determine if whether a new tab should be append to the same window
  */
-static void remmina_connection_window_update_tag(RemminaConnectionWindow *cnnwin, RemminaConnectionObject *cnnobj)
+static void remmina_connection_window_update_tag(RemminaConnectionWindow* cnnwin, RemminaConnectionObject* cnnobj)
 {
-	gchar *tag;
+	gchar* tag;
 
 	switch (remmina_pref.tab_mode)
 	{
@@ -1695,9 +1696,9 @@ static void remmina_connection_window_update_tag(RemminaConnectionWindow *cnnwin
 	g_object_set_data_full(G_OBJECT(cnnwin), "tag", tag, (GDestroyNotify) g_free);
 }
 
-static void remmina_connection_object_create_scrolled_container(RemminaConnectionObject *cnnobj, gint view_mode)
+static void remmina_connection_object_create_scrolled_container(RemminaConnectionObject* cnnobj, gint view_mode)
 {
-	GtkWidget *container;
+	GtkWidget* container;
 
 	if (view_mode == VIEWPORT_FULLSCREEN_MODE)
 	{
@@ -1717,9 +1718,9 @@ static void remmina_connection_object_create_scrolled_container(RemminaConnectio
 
 static gboolean remmina_connection_holder_grab_focus(gpointer data)
 {
-	RemminaConnectionObject *cnnobj;
-	GtkNotebook *notebook;
-	GtkWidget *child;
+	RemminaConnectionObject* cnnobj;
+	GtkNotebook* notebook;
+	GtkWidget* child;
 
 	if (GTK_IS_WIDGET(data))
 	{
@@ -1734,7 +1735,7 @@ static gboolean remmina_connection_holder_grab_focus(gpointer data)
 	return FALSE;
 }
 
-static void remmina_connection_object_on_close_button_clicked(GtkButton *button, RemminaConnectionObject *cnnobj)
+static void remmina_connection_object_on_close_button_clicked(GtkButton* button, RemminaConnectionObject* cnnobj)
 {
 	if (REMMINA_IS_PROTOCOL_WIDGET(cnnobj->proto))
 	{
@@ -1743,11 +1744,11 @@ static void remmina_connection_object_on_close_button_clicked(GtkButton *button,
 }
 
 static GtkWidget*
-remmina_connection_object_create_tab(RemminaConnectionObject *cnnobj)
+remmina_connection_object_create_tab(RemminaConnectionObject* cnnobj)
 {
-	GtkWidget *hbox;
-	GtkWidget *widget;
-	GtkWidget *button;
+	GtkWidget* hbox;
+	GtkWidget* widget;
+	GtkWidget* button;
 
 	hbox = gtk_hbox_new(FALSE, 4);
 	gtk_widget_show(hbox);
@@ -1778,7 +1779,7 @@ remmina_connection_object_create_tab(RemminaConnectionObject *cnnobj)
 	return hbox;
 }
 
-static gint remmina_connection_object_append_page(RemminaConnectionObject *cnnobj, GtkNotebook *notebook, GtkWidget *tab,
+static gint remmina_connection_object_append_page(RemminaConnectionObject* cnnobj, GtkNotebook* notebook, GtkWidget* tab,
 		gint view_mode)
 {
 	gint i;
@@ -1792,12 +1793,12 @@ static gint remmina_connection_object_append_page(RemminaConnectionObject *cnnob
 	return i;
 }
 
-static void remmina_connection_window_initialize_notebook(GtkNotebook *to, GtkNotebook *from, RemminaConnectionObject *cnnobj,
+static void remmina_connection_window_initialize_notebook(GtkNotebook* to, GtkNotebook* from, RemminaConnectionObject* cnnobj,
 		gint view_mode)
 {
 	gint i, n, c;
-	GtkWidget *tab;
-	GtkWidget *widget;
+	GtkWidget* tab;
+	GtkWidget* widget;
 
 	if (cnnobj)
 	{
@@ -1832,9 +1833,9 @@ static void remmina_connection_window_initialize_notebook(GtkNotebook *to, GtkNo
 	}
 }
 
-static void remmina_connection_holder_update_notebook(RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_update_notebook(RemminaConnectionHolder* cnnhld)
 {
-	GtkNotebook *notebook;
+	GtkNotebook* notebook;
 	gint n;
 
 	if (!cnnhld->cnnwin)
@@ -1858,8 +1859,8 @@ static void remmina_connection_holder_update_notebook(RemminaConnectionHolder *c
 
 static gboolean remmina_connection_holder_on_switch_page_real(gpointer data)
 {
-	RemminaConnectionHolder *cnnhld = (RemminaConnectionHolder*) data;
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionHolder* cnnhld = (RemminaConnectionHolder*) data;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	if (GTK_IS_WIDGET(cnnhld->cnnwin))
 	{
@@ -1874,10 +1875,10 @@ static gboolean remmina_connection_holder_on_switch_page_real(gpointer data)
 	return FALSE;
 }
 
-static void remmina_connection_holder_on_switch_page(GtkNotebook *notebook, GtkWidget *page, guint page_num,
-		RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_on_switch_page(GtkNotebook* notebook, GtkWidget* page, guint page_num,
+		RemminaConnectionHolder* cnnhld)
 {
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
 
 	if (!priv->switch_page_handler)
 	{
@@ -1885,8 +1886,8 @@ static void remmina_connection_holder_on_switch_page(GtkNotebook *notebook, GtkW
 	}
 }
 
-static void remmina_connection_holder_on_page_added(GtkNotebook *notebook, GtkWidget *child, guint page_num,
-		RemminaConnectionHolder *cnnhld)
+static void remmina_connection_holder_on_page_added(GtkNotebook* notebook, GtkWidget* child, guint page_num,
+		RemminaConnectionHolder* cnnhld)
 {
 	if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(cnnhld->cnnwin->priv->notebook)) <= 0)
 	{
@@ -1900,13 +1901,13 @@ static void remmina_connection_holder_on_page_added(GtkNotebook *notebook, GtkWi
 }
 
 GtkNotebook*
-remmina_connection_holder_on_notebook_create_window(GtkNotebook *notebook, GtkWidget *page, gint x, gint y, gpointer data)
+remmina_connection_holder_on_notebook_create_window(GtkNotebook* notebook, GtkWidget* page, gint x, gint y, gpointer data)
 {
-	RemminaConnectionWindow *srccnnwin;
-	RemminaConnectionWindow *dstcnnwin;
-	RemminaConnectionObject *cnnobj;
+	RemminaConnectionWindow* srccnnwin;
+	RemminaConnectionWindow* dstcnnwin;
+	RemminaConnectionObject* cnnobj;
 	gint srcpagenum;
-	GdkWindow *window;
+	GdkWindow* window;
 
 	srccnnwin = REMMINA_CONNECTION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(notebook)));
 	window = gdk_display_get_window_at_pointer(gdk_display_get_default(), &x, &y);
@@ -1937,9 +1938,9 @@ remmina_connection_holder_on_notebook_create_window(GtkNotebook *notebook, GtkWi
 }
 
 static GtkWidget*
-remmina_connection_holder_create_notebook(RemminaConnectionHolder *cnnhld)
+remmina_connection_holder_create_notebook(RemminaConnectionHolder* cnnhld)
 {
-	GtkWidget *notebook;
+	GtkWidget* notebook;
 
 	notebook = gtk_notebook_new();
 	gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), TRUE);
@@ -1956,14 +1957,14 @@ remmina_connection_holder_create_notebook(RemminaConnectionHolder *cnnhld)
 }
 
 /* Create a scrolled window container */
-static void remmina_connection_holder_create_scrolled(RemminaConnectionHolder *cnnhld, RemminaConnectionObject *cnnobj)
+static void remmina_connection_holder_create_scrolled(RemminaConnectionHolder* cnnhld, RemminaConnectionObject* cnnobj)
 {
-	GtkWidget *window;
-	GtkWidget *oldwindow;
-	GtkWidget *vbox;
-	GtkWidget *toolbar;
-	GtkWidget *notebook;
-	gchar *tag;
+	GtkWidget* window;
+	GtkWidget* oldwindow;
+	GtkWidget* vbox;
+	GtkWidget* toolbar;
+	GtkWidget* notebook;
+	gchar* tag;
 
 	oldwindow = GTK_WIDGET(cnnhld->cnnwin);
 	window = remmina_connection_window_new_from_holder(cnnhld);
@@ -2015,14 +2016,14 @@ static void remmina_connection_holder_create_scrolled(RemminaConnectionHolder *c
 	gtk_widget_show(GTK_WIDGET(cnnhld->cnnwin));
 }
 
-static void remmina_connection_holder_create_fullscreen(RemminaConnectionHolder *cnnhld, RemminaConnectionObject *cnnobj,
+static void remmina_connection_holder_create_fullscreen(RemminaConnectionHolder* cnnhld, RemminaConnectionObject* cnnobj,
 		gint view_mode)
 {
-	GtkWidget *window;
-	GtkWidget *oldwindow;
-	GtkWidget *notebook;
+	GtkWidget* window;
+	GtkWidget* oldwindow;
+	GtkWidget* notebook;
 	GdkColor color;
-	gchar *tag;
+	gchar* tag;
 
 	oldwindow = GTK_WIDGET(cnnhld->cnnwin);
 	window = remmina_connection_window_new_from_holder(cnnhld);
@@ -2070,12 +2071,12 @@ static void remmina_connection_holder_create_fullscreen(RemminaConnectionHolder
 	gtk_widget_show(window);
 }
 
-static gboolean remmina_connection_window_hostkey_func(RemminaProtocolWidget *gp, guint keyval, gboolean release,
-		RemminaConnectionHolder *cnnhld)
+static gboolean remmina_connection_window_hostkey_func(RemminaProtocolWidget* gp, guint keyval, gboolean release,
+		RemminaConnectionHolder* cnnhld)
 {
 	DECLARE_CNNOBJ_WITH_RETURN(FALSE);
-	RemminaConnectionWindowPriv *priv = cnnhld->cnnwin->priv;
-	const RemminaProtocolFeature *feature;
+	RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv;
+	const RemminaProtocolFeature* feature;
 	gint i;
 
 	if (release)
@@ -2230,10 +2231,9 @@ static gboolean remmina_connection_window_hostkey_func(RemminaProtocolWidget *gp
 	return TRUE;
 }
 
-static RemminaConnectionWindow*
-remmina_connection_window_find(RemminaFile *remminafile)
+static RemminaConnectionWindow* remmina_connection_window_find(RemminaFile* remminafile)
 {
-	const gchar *tag;
+	const gchar* tag;
 
 	switch (remmina_pref.tab_mode)
 	{
@@ -2253,11 +2253,11 @@ remmina_connection_window_find(RemminaFile *remminafile)
 	return REMMINA_CONNECTION_WINDOW(remmina_widget_pool_find(REMMINA_TYPE_CONNECTION_WINDOW, tag));
 }
 
-static void remmina_connection_object_on_connect(RemminaProtocolWidget *gp, RemminaConnectionObject *cnnobj)
+static void remmina_connection_object_on_connect(RemminaProtocolWidget* gp, RemminaConnectionObject* cnnobj)
 {
-	RemminaConnectionWindow *cnnwin;
-	RemminaConnectionHolder *cnnhld;
-	GtkWidget *tab;
+	RemminaConnectionWindow* cnnwin;
+	RemminaConnectionHolder* cnnhld;
+	GtkWidget* tab;
 	gint i;
 
 	if (!cnnobj->cnnhld)
@@ -2323,10 +2323,10 @@ static void remmina_connection_object_on_connect(RemminaProtocolWidget *gp, Remm
 	}
 }
 
-static void remmina_connection_object_on_disconnect(RemminaProtocolWidget *gp, RemminaConnectionObject *cnnobj)
+static void remmina_connection_object_on_disconnect(RemminaProtocolWidget* gp, RemminaConnectionObject* cnnobj)
 {
-	RemminaConnectionHolder *cnnhld = cnnobj->cnnhld;
-	GtkWidget *dialog;
+	RemminaConnectionHolder* cnnhld = cnnobj->cnnhld;
+	GtkWidget* dialog;
 
 	cnnobj->connected = FALSE;
 	if (scale_option_window)
@@ -2382,7 +2382,7 @@ static void remmina_connection_object_on_disconnect(RemminaProtocolWidget *gp, R
 	g_free(cnnobj);
 }
 
-static void remmina_connection_object_on_desktop_resize(RemminaProtocolWidget *gp, RemminaConnectionObject *cnnobj)
+static void remmina_connection_object_on_desktop_resize(RemminaProtocolWidget* gp, RemminaConnectionObject* cnnobj)
 {
 	if (cnnobj->cnnhld && cnnobj->cnnhld->cnnwin && cnnobj->cnnhld->cnnwin->priv->view_mode != SCROLLED_WINDOW_MODE)
 	{
@@ -2390,15 +2390,15 @@ static void remmina_connection_object_on_desktop_resize(RemminaProtocolWidget *g
 	}
 }
 
-static void remmina_connection_object_on_update_align(RemminaProtocolWidget *gp, RemminaConnectionObject *cnnobj)
+static void remmina_connection_object_on_update_align(RemminaProtocolWidget* gp, RemminaConnectionObject* cnnobj)
 {
 	remmina_connection_holder_update_alignment(cnnobj->cnnhld);
 }
 
-gboolean remmina_connection_window_open_from_filename(const gchar *filename)
+gboolean remmina_connection_window_open_from_filename(const gchar* filename)
 {
-	RemminaFile *remminafile;
-	GtkWidget *dialog;
+	RemminaFile* remminafile;
+	GtkWidget* dialog;
 
 	remminafile = remmina_file_manager_load_file(filename);
 	if (remminafile)
@@ -2417,15 +2417,15 @@ gboolean remmina_connection_window_open_from_filename(const gchar *filename)
 	}
 }
 
-void remmina_connection_window_open_from_file(RemminaFile *remminafile)
+void remmina_connection_window_open_from_file(RemminaFile* remminafile)
 {
 	remmina_connection_window_open_from_file_full(remminafile, NULL, NULL, NULL);
 }
 
 GtkWidget*
-remmina_connection_window_open_from_file_full(RemminaFile *remminafile, GCallback disconnect_cb, gpointer data, guint *handler)
+remmina_connection_window_open_from_file_full(RemminaFile* remminafile, GCallback disconnect_cb, gpointer data, guint* handler)
 {
-	RemminaConnectionObject *cnnobj;
+	RemminaConnectionObject* cnnobj;
 	GdkColor color;
 
 	remmina_file_update_screen_resolution(remminafile);
diff --git a/remmina/src/remmina_connection_window.h b/remmina/src/remmina_connection_window.h
index 9b95198a76..780b27315b 100644
--- a/remmina/src/remmina_connection_window.h
+++ b/remmina/src/remmina_connection_window.h
@@ -38,7 +38,7 @@ typedef struct _RemminaConnectionWindow
 {
 	GtkWindow window;
 
-	RemminaConnectionWindowPriv *priv;
+	RemminaConnectionWindowPriv* priv;
 } RemminaConnectionWindow;
 
 typedef struct _RemminaConnectionWindowClass
@@ -50,11 +50,11 @@ GType remmina_connection_window_get_type(void)
 G_GNUC_CONST;
 
 /* Open a new connection window for a .remmina file */
-gboolean remmina_connection_window_open_from_filename(const gchar *filename);
+gboolean remmina_connection_window_open_from_filename(const gchar* filename);
 /* Open a new connection window for a given RemminaFile struct. The struct will be freed after the call */
-void remmina_connection_window_open_from_file(RemminaFile *remminafile);
-GtkWidget* remmina_connection_window_open_from_file_full(RemminaFile *remminafile, GCallback disconnect_cb, gpointer data,
-		guint *handler);
+void remmina_connection_window_open_from_file(RemminaFile* remminafile);
+GtkWidget* remmina_connection_window_open_from_file_full(RemminaFile* remminafile, GCallback disconnect_cb, gpointer data,
+		guint* handler);
 
 G_END_DECLS
 
diff --git a/remmina/src/remmina_exec.c b/remmina/src/remmina_exec.c
index f4861bd78e..a4712c07ad 100644
--- a/remmina/src/remmina_exec.c
+++ b/remmina/src/remmina_exec.c
@@ -32,11 +32,12 @@
 #include "remmina_plugin_manager.h"
 #include "remmina_exec.h"
 
-void remmina_exec_command(RemminaCommandType command, const gchar *data)
+void remmina_exec_command(RemminaCommandType command, const gchar* data)
 {
-	GtkWidget *widget;
-	gchar *s1, *s2;
-	RemminaEntryPlugin *plugin;
+	gchar* s1;
+	gchar* s2;
+	GtkWidget* widget;
+	RemminaEntryPlugin* plugin;
 
 	switch (command)
 	{
@@ -53,6 +54,7 @@ void remmina_exec_command(RemminaCommandType command, const gchar *data)
 				gtk_widget_show(widget);
 			}
 			break;
+
 		case REMMINA_COMMAND_PREF:
 			widget = remmina_widget_pool_find(REMMINA_TYPE_PREF_DIALOG, NULL);
 			if (widget)
@@ -65,6 +67,7 @@ void remmina_exec_command(RemminaCommandType command, const gchar *data)
 				gtk_widget_show(widget);
 			}
 			break;
+
 		case REMMINA_COMMAND_NEW:
 			s1 = (data ? strchr(data, ',') : NULL);
 			if (s1)
@@ -81,19 +84,23 @@ void remmina_exec_command(RemminaCommandType command, const gchar *data)
 			}
 			gtk_widget_show(widget);
 			break;
+
 		case REMMINA_COMMAND_CONNECT:
 			remmina_connection_window_open_from_filename(data);
 			break;
+
 		case REMMINA_COMMAND_EDIT:
 			widget = remmina_file_editor_new_from_filename(data);
 			if (widget)
 				gtk_widget_show(widget);
 			break;
+
 		case REMMINA_COMMAND_ABOUT:
 			remmina_about_open(NULL);
 			break;
+
 		case REMMINA_COMMAND_PLUGIN:
-			plugin = (RemminaEntryPlugin *) remmina_plugin_manager_get_plugin(REMMINA_PLUGIN_TYPE_ENTRY, data);
+			plugin = (RemminaEntryPlugin*) remmina_plugin_manager_get_plugin(REMMINA_PLUGIN_TYPE_ENTRY, data);
 			if (plugin)
 			{
 				plugin->entry_func();
@@ -107,6 +114,7 @@ void remmina_exec_command(RemminaCommandType command, const gchar *data)
 				remmina_widget_pool_register(widget);
 			}
 			break;
+
 		default:
 			break;
 	}
diff --git a/remmina/src/remmina_exec.h b/remmina/src/remmina_exec.h
index 8233d8f0fc..1811e2d54a 100644
--- a/remmina/src/remmina_exec.h
+++ b/remmina/src/remmina_exec.h
@@ -35,7 +35,7 @@ typedef enum
 	REMMINA_COMMAND_PLUGIN = 7
 } RemminaCommandType;
 
-void remmina_exec_command(RemminaCommandType command, const gchar *data);
+void remmina_exec_command(RemminaCommandType command, const gchar* data);
 
 G_END_DECLS
 
diff --git a/remmina/src/remmina_file_editor.c b/remmina/src/remmina_file_editor.c
index c874b0c778..fc7535ed46 100644
--- a/remmina/src/remmina_file_editor.c
+++ b/remmina/src/remmina_file_editor.c
@@ -40,7 +40,7 @@
 
 G_DEFINE_TYPE( RemminaFileEditor, remmina_file_editor, GTK_TYPE_DIALOG)
 
-static const gchar *charset_list = "ASCII,BIG5,"
+static const gchar* charset_list = "ASCII,BIG5,"
 		"CP437,CP720,CP737,CP775,CP850,CP852,CP855,"
 		"CP857,CP858,CP862,CP866,CP874,CP1125,CP1250,"
 		"CP1251,CP1252,CP1253,CP1254,CP1255,CP1256,"
@@ -52,13 +52,14 @@ static const gchar *charset_list = "ASCII,BIG5,"
 		"ISO-8859-13,ISO-8859-14,ISO-8859-15,ISO-8859-16,"
 		"KOI8-R,SJIS,UTF-8";
 
-static const gchar *server_tips = N_("<tt><big>"
+static const gchar* server_tips = N_("<tt><big>"
 		"Supported formats\n"
 		"* server\n"
 		"* server:port\n"
 		"* [server]:port"
 		"</big></tt>");
-static const gchar *server_tips2 = N_("<tt><big>"
+
+static const gchar* server_tips2 = N_("<tt><big>"
 		"Supported formats\n"
 		"* :port\n"
 		"* server\n"
@@ -68,51 +69,51 @@ static const gchar *server_tips2 = N_("<tt><big>"
 
 struct _RemminaFileEditorPriv
 {
-	RemminaFile *remmina_file;
-	RemminaProtocolPlugin *plugin;
-	const gchar *avahi_service_type;
-
-	GtkWidget *name_entry;
-	GtkWidget *group_combo;
-	GtkWidget *protocol_combo;
-	GtkWidget *save_button;
-
-	GtkWidget *config_box;
-	GtkWidget *config_container;
-
-	GtkWidget *server_combo;
-	GtkWidget *password_entry;
-	GtkWidget *resolution_auto_radio;
-	GtkWidget *resolution_custom_radio;
-	GtkWidget *resolution_custom_combo;
-	GtkWidget *keymap_combo;
-	GtkWidget *scaler_widget;
-
-	GtkWidget *ssh_enabled_check;
-	GtkWidget *ssh_loopback_check;
-	GtkWidget *ssh_server_default_radio;
-	GtkWidget *ssh_server_custom_radio;
-	GtkWidget *ssh_server_entry;
-	GtkWidget *ssh_auth_password_radio;
-	GtkWidget *ssh_auth_publickey_radio;
-	GtkWidget *ssh_auth_auto_publickey_radio;
-	GtkWidget *ssh_username_entry;
-	GtkWidget *ssh_privatekey_chooser;
-	GtkWidget *ssh_charset_combo;
-
-	GHashTable *setting_widgets;
+	RemminaFile* remmina_file;
+	RemminaProtocolPlugin* plugin;
+	const gchar* avahi_service_type;
+
+	GtkWidget* name_entry;
+	GtkWidget* group_combo;
+	GtkWidget* protocol_combo;
+	GtkWidget* save_button;
+
+	GtkWidget* config_box;
+	GtkWidget* config_container;
+
+	GtkWidget* server_combo;
+	GtkWidget* password_entry;
+	GtkWidget* resolution_auto_radio;
+	GtkWidget* resolution_custom_radio;
+	GtkWidget* resolution_custom_combo;
+	GtkWidget* keymap_combo;
+	GtkWidget* scaler_widget;
+
+	GtkWidget* ssh_enabled_check;
+	GtkWidget* ssh_loopback_check;
+	GtkWidget* ssh_server_default_radio;
+	GtkWidget* ssh_server_custom_radio;
+	GtkWidget* ssh_server_entry;
+	GtkWidget* ssh_auth_password_radio;
+	GtkWidget* ssh_auth_publickey_radio;
+	GtkWidget* ssh_auth_auto_publickey_radio;
+	GtkWidget* ssh_username_entry;
+	GtkWidget* ssh_privatekey_chooser;
+	GtkWidget* ssh_charset_combo;
+
+	GHashTable* setting_widgets;
 };
 
-static void remmina_file_editor_class_init(RemminaFileEditorClass *klass)
+static void remmina_file_editor_class_init(RemminaFileEditorClass* klass)
 {
 }
 
 #ifdef HAVE_LIBAVAHI_UI
 static void
-remmina_file_editor_browse_avahi (GtkWidget *button, RemminaFileEditor *gfe)
+remmina_file_editor_browse_avahi (GtkWidget* button, RemminaFileEditor* gfe)
 {
-	GtkWidget *dialog;
-	gchar *host;
+	GtkWidget* dialog;
+	gchar* host;
 
 	dialog = aui_service_dialog_new (_("Choose a Remote Desktop Server"),
 			GTK_WINDOW (gfe),
@@ -126,7 +127,7 @@ remmina_file_editor_browse_avahi (GtkWidget *button, RemminaFileEditor *gfe)
 			gfe->priv->avahi_service_type, NULL);
 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
 	{
-		host = g_strdup_printf ("[%s]:%i",
+		host = g_strdup_printf("[%s]:%i",
 				aui_service_dialog_get_host_name (AUI_SERVICE_DIALOG (dialog)),
 				aui_service_dialog_get_port (AUI_SERVICE_DIALOG (dialog)));
 	}
@@ -138,16 +139,16 @@ remmina_file_editor_browse_avahi (GtkWidget *button, RemminaFileEditor *gfe)
 
 	if (host)
 	{
-		gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (gfe->priv->server_combo))), host);
-		g_free (host);
+		gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child (GTK_BIN (gfe->priv->server_combo))), host);
+		g_free(host);
 	}
 }
 #endif
 
-static void remmina_file_editor_on_realize(GtkWidget *widget, gpointer user_data)
+static void remmina_file_editor_on_realize(GtkWidget* widget, gpointer user_data)
 {
-	RemminaFileEditor *gfe;
-	GtkWidget *defaultwidget;
+	RemminaFileEditor* gfe;
+	GtkWidget* defaultwidget;
 
 	gfe = REMMINA_FILE_EDITOR(widget);
 
@@ -163,19 +164,19 @@ static void remmina_file_editor_on_realize(GtkWidget *widget, gpointer user_data
 	}
 }
 
-static void remmina_file_editor_destroy(GtkWidget *widget, gpointer data)
+static void remmina_file_editor_destroy(GtkWidget* widget, gpointer data)
 {
 	remmina_file_free(REMMINA_FILE_EDITOR(widget)->priv->remmina_file);
 	g_hash_table_destroy(REMMINA_FILE_EDITOR(widget)->priv->setting_widgets);
 	g_free(REMMINA_FILE_EDITOR(widget)->priv);
 }
 
-static void remmina_file_editor_button_on_toggled(GtkToggleButton *togglebutton, GtkWidget *widget)
+static void remmina_file_editor_button_on_toggled(GtkToggleButton* togglebutton, GtkWidget* widget)
 {
 	gtk_widget_set_sensitive(widget, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(togglebutton)));
 }
 
-static void remmina_file_editor_create_notebook_container(RemminaFileEditor *gfe)
+static void remmina_file_editor_create_notebook_container(RemminaFileEditor* gfe)
 {
 	/* Create the notebook */
 	gfe->priv->config_container = gtk_notebook_new();
@@ -185,11 +186,12 @@ static void remmina_file_editor_create_notebook_container(RemminaFileEditor *gfe
 }
 
 static GtkWidget*
-remmina_file_editor_create_notebook_tab(RemminaFileEditor *gfe, const gchar *stock_id, const gchar *label, gint rows, gint cols)
+remmina_file_editor_create_notebook_tab(RemminaFileEditor* gfe, const gchar* stock_id, const gchar* label, gint rows, gint cols)
 {
-	GtkWidget *tablabel, *tabbody;
-	GtkWidget *table;
-	GtkWidget *widget;
+	GtkWidget* tablabel;
+	GtkWidget* tabbody;
+	GtkWidget* table;
+	GtkWidget* widget;
 
 	tablabel = gtk_hbox_new(FALSE, 0);
 	gtk_widget_show(tablabel);
@@ -217,26 +219,25 @@ remmina_file_editor_create_notebook_tab(RemminaFileEditor *gfe, const gchar *sto
 }
 
 #ifdef HAVE_LIBSSH
-static void
-remmina_file_editor_ssh_server_custom_radio_on_toggled (GtkToggleButton *togglebutton, RemminaFileEditor *gfe)
+
+static void remmina_file_editor_ssh_server_custom_radio_on_toggled(GtkToggleButton* togglebutton, RemminaFileEditor* gfe)
 {
-	gtk_widget_set_sensitive (gfe->priv->ssh_server_entry,
-			gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gfe->priv->ssh_enabled_check)) &&
+	gtk_widget_set_sensitive(gfe->priv->ssh_server_entry,
+			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (gfe->priv->ssh_enabled_check)) &&
 			(gfe->priv->ssh_server_custom_radio == NULL ||
-					gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gfe->priv->ssh_server_custom_radio)))
+					gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_server_custom_radio)))
 	);
 }
 
-static void
-remmina_file_editor_ssh_auth_publickey_radio_on_toggled (GtkToggleButton *togglebutton, RemminaFileEditor *gfe)
+static void remmina_file_editor_ssh_auth_publickey_radio_on_toggled(GtkToggleButton* togglebutton, RemminaFileEditor* gfe)
 {
 	gboolean b;
-	gchar *s;
+	gchar* s;
 
 	b = ((!gfe->priv->ssh_enabled_check ||
-					gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gfe->priv->ssh_enabled_check))) &&
-			gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gfe->priv->ssh_auth_publickey_radio)));
-	gtk_widget_set_sensitive (gfe->priv->ssh_privatekey_chooser, b);
+					gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (gfe->priv->ssh_enabled_check))) &&
+			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (gfe->priv->ssh_auth_publickey_radio)));
+	gtk_widget_set_sensitive(gfe->priv->ssh_privatekey_chooser, b);
 
 	if (b && remmina_file_get_string (gfe->priv->remmina_file, "ssh_privatekey"))
 	{
@@ -244,53 +245,54 @@ remmina_file_editor_ssh_auth_publickey_radio_on_toggled (GtkToggleButton *toggle
 		if (s)
 		{
 			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (gfe->priv->ssh_privatekey_chooser), s);
-			g_free (s);
+			g_free(s);
 		}
 	}
 }
 
-static void
-remmina_file_editor_ssh_enabled_check_on_toggled (GtkToggleButton *togglebutton, RemminaFileEditor *gfe)
+static void remmina_file_editor_ssh_enabled_check_on_toggled(GtkToggleButton* togglebutton, RemminaFileEditor* gfe)
 {
 	gboolean enabled = TRUE;
 
 	if (gfe->priv->ssh_enabled_check)
 	{
-		enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gfe->priv->ssh_enabled_check));
-		if (gfe->priv->ssh_loopback_check) gtk_widget_set_sensitive (gfe->priv->ssh_loopback_check, enabled);
-		if (gfe->priv->ssh_server_default_radio) gtk_widget_set_sensitive (gfe->priv->ssh_server_default_radio, enabled);
-		if (gfe->priv->ssh_server_custom_radio) gtk_widget_set_sensitive (gfe->priv->ssh_server_custom_radio, enabled);
-		remmina_file_editor_ssh_server_custom_radio_on_toggled (NULL, gfe);
-		gtk_widget_set_sensitive (gfe->priv->ssh_charset_combo, enabled);
-		gtk_widget_set_sensitive (gfe->priv->ssh_username_entry, enabled);
-		gtk_widget_set_sensitive (gfe->priv->ssh_auth_password_radio, enabled);
-		gtk_widget_set_sensitive (gfe->priv->ssh_auth_publickey_radio, enabled);
-		gtk_widget_set_sensitive (gfe->priv->ssh_auth_auto_publickey_radio, enabled);
+		enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_enabled_check));
+		if (gfe->priv->ssh_loopback_check)
+			gtk_widget_set_sensitive(gfe->priv->ssh_loopback_check, enabled);
+		if (gfe->priv->ssh_server_default_radio)
+			gtk_widget_set_sensitive(gfe->priv->ssh_server_default_radio, enabled);
+		if (gfe->priv->ssh_server_custom_radio)
+			gtk_widget_set_sensitive(gfe->priv->ssh_server_custom_radio, enabled);
+		remmina_file_editor_ssh_server_custom_radio_on_toggled(NULL, gfe);
+		gtk_widget_set_sensitive(gfe->priv->ssh_charset_combo, enabled);
+		gtk_widget_set_sensitive(gfe->priv->ssh_username_entry, enabled);
+		gtk_widget_set_sensitive(gfe->priv->ssh_auth_password_radio, enabled);
+		gtk_widget_set_sensitive(gfe->priv->ssh_auth_publickey_radio, enabled);
+		gtk_widget_set_sensitive(gfe->priv->ssh_auth_auto_publickey_radio, enabled);
 	}
-	remmina_file_editor_ssh_auth_publickey_radio_on_toggled (NULL, gfe);
+	remmina_file_editor_ssh_auth_publickey_radio_on_toggled(NULL, gfe);
 
-	if (enabled && gtk_entry_get_text (GTK_ENTRY (gfe->priv->ssh_username_entry)) [0] == '\0')
+	if (enabled && gtk_entry_get_text(GTK_ENTRY(gfe->priv->ssh_username_entry)) [0] == '\0')
 	{
-		gtk_entry_set_text (GTK_ENTRY (gfe->priv->ssh_username_entry), g_get_user_name ());
+		gtk_entry_set_text(GTK_ENTRY(gfe->priv->ssh_username_entry), g_get_user_name());
 	}
 }
 
-static void
-remmina_file_editor_create_ssh_privatekey (RemminaFileEditor *gfe, GtkWidget *table, gint row, gint column)
+static void remmina_file_editor_create_ssh_privatekey(RemminaFileEditor* gfe, GtkWidget* table, gint row, gint column)
 {
-	RemminaFileEditorPriv *priv = gfe->priv;
-	GtkWidget *widget;
-	GtkWidget *dialog;
-	const gchar *ssh_privatekey;
-	gchar *s;
-
-	widget = gtk_radio_button_new_with_label_from_widget (
-			GTK_RADIO_BUTTON (priv->ssh_auth_password_radio), _("Identity file"));
-	g_signal_connect (G_OBJECT (widget), "toggled",
-			G_CALLBACK (remmina_file_editor_ssh_auth_publickey_radio_on_toggled), gfe);
+	gchar* s;
+	GtkWidget* widget;
+	GtkWidget* dialog;
+	const gchar* ssh_privatekey;
+	RemminaFileEditorPriv* priv = gfe->priv;
+
+	widget = gtk_radio_button_new_with_label_from_widget(
+			GTK_RADIO_BUTTON(priv->ssh_auth_password_radio), _("Identity file"));
+	g_signal_connect(G_OBJECT(widget), "toggled",
+			G_CALLBACK(remmina_file_editor_ssh_auth_publickey_radio_on_toggled), gfe);
 	priv->ssh_auth_publickey_radio = widget;
 	gtk_widget_show(widget);
-	gtk_table_attach (GTK_TABLE (table), widget, column, column + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+	gtk_table_attach(GTK_TABLE(table), widget, column, column + 1, row, row + 1, GTK_FILL, 0, 0, 0);
 
 	dialog = gtk_file_chooser_dialog_new (_("Identity file"), GTK_WINDOW (gfe), GTK_FILE_CHOOSER_ACTION_OPEN,
 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -298,14 +300,14 @@ remmina_file_editor_create_ssh_privatekey (RemminaFileEditor *gfe, GtkWidget *ta
 			NULL);
 
 	widget = gtk_file_chooser_button_new_with_dialog (dialog);
-	s = g_strdup_printf ("%s/.ssh", g_get_home_dir ());
+	s = g_strdup_printf("%s/.ssh", g_get_home_dir ());
 	if (g_file_test (s, G_FILE_TEST_IS_DIR))
 	{
 		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), s);
 	}
-	g_free (s);
+	g_free(s);
 	gtk_widget_show(widget);
-	gtk_table_attach_defaults (GTK_TABLE (table), widget, column + 1, column + 2, row, row + 1);
+	gtk_table_attach_defaults (GTK_TABLE(table), widget, column + 1, column + 2, row, row + 1);
 	priv->ssh_privatekey_chooser = widget;
 
 	ssh_privatekey = remmina_file_get_string (priv->remmina_file, "ssh_privatekey");
@@ -322,13 +324,13 @@ remmina_file_editor_create_ssh_privatekey (RemminaFileEditor *gfe, GtkWidget *ta
 }
 #endif
 
-static void remmina_file_editor_create_server(RemminaFileEditor *gfe, const RemminaProtocolSetting *setting, GtkWidget *table,
+static void remmina_file_editor_create_server(RemminaFileEditor* gfe, const RemminaProtocolSetting* setting, GtkWidget* table,
 		gint row)
 {
-	RemminaProtocolPlugin *plugin = gfe->priv->plugin;
-	GtkWidget *widget;
-	GtkWidget *hbox;
-	gchar *s;
+	RemminaProtocolPlugin* plugin = gfe->priv->plugin;
+	GtkWidget* widget;
+	GtkWidget* hbox;
+	gchar* s;
 
 	widget = gtk_label_new(_("Server"));
 	gtk_widget_show(widget);
@@ -353,14 +355,14 @@ static void remmina_file_editor_create_server(RemminaFileEditor *gfe, const Remm
 		gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
 
 		widget = gtk_button_new_with_label ("...");
-		s = g_strdup_printf (_("Browse the network to find a %s server"), plugin->name);
+		s = g_strdup_printf(_("Browse the network to find a %s server"), plugin->name);
 		gtk_widget_set_tooltip_text (widget, s);
-		g_free (s);
+		g_free(s);
 		gtk_widget_show(widget);
 		gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
-		g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (remmina_file_editor_browse_avahi), gfe);
+		g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(remmina_file_editor_browse_avahi), gfe);
 
-		gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, row, row + 1);
+		gtk_table_attach_defaults (GTK_TABLE(table), hbox, 1, 2, row, row + 1);
 	}
 	else
 #endif
@@ -369,10 +371,10 @@ static void remmina_file_editor_create_server(RemminaFileEditor *gfe, const Remm
 	}
 }
 
-static void remmina_file_editor_create_password(RemminaFileEditor *gfe, GtkWidget *table, gint row)
+static void remmina_file_editor_create_password(RemminaFileEditor* gfe, GtkWidget* table, gint row)
 {
-	GtkWidget *widget;
-	gchar *s;
+	GtkWidget* widget;
+	gchar* s;
 
 	widget = gtk_label_new(_("Password"));
 	gtk_widget_show(widget);
@@ -394,15 +396,15 @@ static void remmina_file_editor_create_password(RemminaFileEditor *gfe, GtkWidge
 	}
 }
 
-static void remmina_file_editor_update_resolution(GtkWidget *widget, RemminaFileEditor *gfe)
+static void remmina_file_editor_update_resolution(GtkWidget* widget, RemminaFileEditor* gfe)
 {
 	remmina_public_load_combo_text_d(gfe->priv->resolution_custom_combo, remmina_pref.resolutions,
 			remmina_file_get_string(gfe->priv->remmina_file, "resolution"), NULL);
 }
 
-static void remmina_file_editor_browse_resolution(GtkWidget *button, RemminaFileEditor *gfe)
+static void remmina_file_editor_browse_resolution(GtkWidget* button, RemminaFileEditor* gfe)
 {
-	GtkWidget *widget;
+	GtkWidget* widget;
 
 	widget = remmina_pref_dialog_new(REMMINA_PREF_RESOLUTIONS_TAB);
 	gtk_widget_show(widget);
@@ -410,12 +412,12 @@ static void remmina_file_editor_browse_resolution(GtkWidget *button, RemminaFile
 	g_signal_connect(G_OBJECT(widget), "destroy", G_CALLBACK(remmina_file_editor_update_resolution), gfe);
 }
 
-static void remmina_file_editor_create_resolution(RemminaFileEditor *gfe, const RemminaProtocolSetting *setting,
-		GtkWidget *table, gint row)
+static void remmina_file_editor_create_resolution(RemminaFileEditor* gfe, const RemminaProtocolSetting* setting,
+		GtkWidget* table, gint row)
 {
-	GtkWidget *widget;
-	GtkWidget *hbox;
-	const gchar *resolution;
+	GtkWidget* widget;
+	GtkWidget* hbox;
+	const gchar* resolution;
 
 	widget = gtk_label_new(_("Resolution"));
 	gtk_widget_show(widget);
@@ -463,10 +465,10 @@ static void remmina_file_editor_create_resolution(RemminaFileEditor *gfe, const
 }
 
 static GtkWidget*
-remmina_file_editor_create_text(RemminaFileEditor *gfe, GtkWidget *table, gint row, gint col, const gchar *label,
-		const gchar *value)
+remmina_file_editor_create_text(RemminaFileEditor* gfe, GtkWidget* table, gint row, gint col, const gchar* label,
+		const gchar* value)
 {
-	GtkWidget *widget;
+	GtkWidget* widget;
 
 	widget = gtk_label_new(label);
 	gtk_widget_show(widget);
@@ -484,10 +486,10 @@ remmina_file_editor_create_text(RemminaFileEditor *gfe, GtkWidget *table, gint r
 }
 
 static GtkWidget*
-remmina_file_editor_create_select(RemminaFileEditor *gfe, GtkWidget *table, gint row, gint col, const gchar *label,
-		const gpointer *list, const gchar *value)
+remmina_file_editor_create_select(RemminaFileEditor* gfe, GtkWidget* table, gint row, gint col, const gchar* label,
+		const gpointer* list, const gchar* value)
 {
-	GtkWidget *widget;
+	GtkWidget* widget;
 
 	widget = gtk_label_new(label);
 	gtk_widget_show(widget);
@@ -502,10 +504,10 @@ remmina_file_editor_create_select(RemminaFileEditor *gfe, GtkWidget *table, gint
 }
 
 static GtkWidget*
-remmina_file_editor_create_combo(RemminaFileEditor *gfe, GtkWidget *table, gint row, gint col, const gchar *label,
-		const gchar *list, const gchar *value)
+remmina_file_editor_create_combo(RemminaFileEditor* gfe, GtkWidget* table, gint row, gint col, const gchar* label,
+		const gchar* list, const gchar* value)
 {
-	GtkWidget *widget;
+	GtkWidget* widget;
 
 	widget = gtk_label_new(label);
 	gtk_widget_show(widget);
@@ -520,10 +522,10 @@ remmina_file_editor_create_combo(RemminaFileEditor *gfe, GtkWidget *table, gint
 }
 
 static GtkWidget*
-remmina_file_editor_create_check(RemminaFileEditor *gfe, GtkWidget *table, gint row, gint col, const gchar *label,
+remmina_file_editor_create_check(RemminaFileEditor* gfe, GtkWidget* table, gint row, gint col, const gchar* label,
 		gboolean value)
 {
-	GtkWidget *widget;
+	GtkWidget* widget;
 
 	widget = gtk_check_button_new_with_label(label);
 	gtk_widget_show(widget);
@@ -541,12 +543,12 @@ remmina_file_editor_create_check(RemminaFileEditor *gfe, GtkWidget *table, gint
 }
 
 static GtkWidget*
-remmina_file_editor_create_chooser(RemminaFileEditor *gfe, GtkWidget *table, gint row, gint col, const gchar *label,
-		const gchar *value, gint type)
+remmina_file_editor_create_chooser(RemminaFileEditor* gfe, GtkWidget* table, gint row, gint col, const gchar* label,
+		const gchar* value, gint type)
 {
-	GtkWidget *check;
-	GtkWidget *widget;
-	GtkWidget *hbox;
+	GtkWidget* check;
+	GtkWidget* widget;
+	GtkWidget* hbox;
 
 	widget = gtk_label_new(label);
 	gtk_widget_show(widget);
@@ -576,14 +578,14 @@ remmina_file_editor_create_chooser(RemminaFileEditor *gfe, GtkWidget *table, gin
 	return widget;
 }
 
-static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidget *table,
-		const RemminaProtocolSetting *settings)
+static void remmina_file_editor_create_settings(RemminaFileEditor* gfe, GtkWidget* table,
+		const RemminaProtocolSetting* settings)
 {
-	RemminaFileEditorPriv *priv = gfe->priv;
-	GtkWidget *hbox = NULL;
-	GtkWidget *widget;
+	RemminaFileEditorPriv* priv = gfe->priv;
+	GtkWidget* hbox = NULL;
+	GtkWidget* widget;
 	gint row = 0;
-	gchar **strarr;
+	gchar** strarr;
 
 	while (settings->type != REMMINA_PROTOCOL_SETTING_TYPE_END)
 	{
@@ -669,7 +671,7 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
 				widget = remmina_file_editor_create_check(gfe, (hbox ? hbox : table), (hbox ? -1 : row), 0,
 				g_dgettext (priv->plugin->domain, settings->label),
 				remmina_file_get_int (priv->remmina_file, (gchar*) settings->name, FALSE));
-				g_hash_table_insert (priv->setting_widgets, (gchar*) settings->name, widget);
+				g_hash_table_insert(priv->setting_widgets, (gchar*) settings->name, widget);
 				break;
 
 				case REMMINA_PROTOCOL_SETTING_TYPE_FILE:
@@ -677,7 +679,7 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
 						g_dgettext (priv->plugin->domain, settings->label),
 						remmina_file_get_string (priv->remmina_file, settings->name),
 						GTK_FILE_CHOOSER_ACTION_OPEN);
-				g_hash_table_insert (priv->setting_widgets, (gchar*) settings->name, widget);
+				g_hash_table_insert(priv->setting_widgets, (gchar*) settings->name, widget);
 				break;
 
 				case REMMINA_PROTOCOL_SETTING_TYPE_FOLDER:
@@ -685,7 +687,7 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
 						g_dgettext (priv->plugin->domain, settings->label),
 						remmina_file_get_string (priv->remmina_file, settings->name),
 						GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-				g_hash_table_insert (priv->setting_widgets, (gchar*) settings->name, widget);
+				g_hash_table_insert(priv->setting_widgets, (gchar*) settings->name, widget);
 				break;
 
 				default:
@@ -704,15 +706,15 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
 	gtk_table_resize(GTK_TABLE(table), row, 2);
 }
 
-static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaProtocolSSHSetting ssh_setting)
+static void remmina_file_editor_create_ssh_tab(RemminaFileEditor* gfe, RemminaProtocolSSHSetting ssh_setting)
 {
 #ifdef HAVE_LIBSSH
-	RemminaFileEditorPriv *priv = gfe->priv;
-	GtkWidget *table;
-	GtkWidget *hbox;
-	GtkWidget *widget;
-	const gchar *cs;
-	gchar *s;
+	RemminaFileEditorPriv* priv = gfe->priv;
+	GtkWidget* table;
+	GtkWidget* hbox;
+	GtkWidget* widget;
+	const gchar* cs;
+	gchar* s;
 	gint row = 0;
 
 	if (ssh_setting == REMMINA_PROTOCOL_SSH_SETTING_NONE) return;
@@ -724,7 +726,7 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 		s = remmina_public_combo_get_active_text (GTK_COMBO_BOX (priv->protocol_combo));
 		table = remmina_file_editor_create_notebook_tab (gfe, GTK_STOCK_DIALOG_AUTHENTICATION,
 				(s ? s : "SSH"), 8, 3);
-		g_free (s);
+		g_free(s);
 	}
 	else
 	{
@@ -733,14 +735,14 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 
 		hbox = gtk_hbox_new (TRUE, 0);
 		gtk_widget_show(hbox);
-		gtk_table_attach_defaults (GTK_TABLE (table), hbox, 0, 3, 0, 1);
+		gtk_table_attach_defaults (GTK_TABLE(table), hbox, 0, 3, 0, 1);
 		row++;
 
 		widget = gtk_check_button_new_with_label (_("Enable SSH tunnel"));
 		gtk_widget_show(widget);
 		gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
-		g_signal_connect (G_OBJECT (widget), "toggled",
-				G_CALLBACK (remmina_file_editor_ssh_enabled_check_on_toggled), gfe);
+		g_signal_connect(G_OBJECT(widget), "toggled",
+				G_CALLBACK(remmina_file_editor_ssh_enabled_check_on_toggled), gfe);
 		priv->ssh_enabled_check = widget;
 
 		widget = gtk_check_button_new_with_label (_("Tunnel via loopback address"));
@@ -750,33 +752,33 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 	}
 
 	/* SSH Server group */
-	remmina_public_create_group (GTK_TABLE (table), _("SSH Server"), row, 3, 3);
+	remmina_public_create_group (GTK_TABLE(table), _("SSH Server"), row, 3, 3);
 	row++;
 
 	switch (ssh_setting)
 	{
 		case REMMINA_PROTOCOL_SSH_SETTING_TUNNEL:
-		s = g_strdup_printf (_("Same server at port %i"), DEFAULT_SSH_PORT);
+		s = g_strdup_printf(_("Same server at port %i"), DEFAULT_SSH_PORT);
 		widget = gtk_radio_button_new_with_label (NULL, s);
-		g_free (s);
+		g_free(s);
 		gtk_widget_show(widget);
-		gtk_table_attach_defaults (GTK_TABLE (table), widget, 1, 3, row, row + 1);
+		gtk_table_attach_defaults (GTK_TABLE(table), widget, 1, 3, row, row + 1);
 		priv->ssh_server_default_radio = widget;
 		row++;
 
 		widget = gtk_radio_button_new_with_label_from_widget (
-				GTK_RADIO_BUTTON (priv->ssh_server_default_radio), _("Custom"));
+				GTK_RADIO_BUTTON(priv->ssh_server_default_radio), _("Custom"));
 		gtk_widget_show(widget);
-		gtk_table_attach (GTK_TABLE (table), widget, 1, 2, row, row + 1, GTK_FILL, 0, 0, 0);
-		g_signal_connect (G_OBJECT (widget), "toggled",
-				G_CALLBACK (remmina_file_editor_ssh_server_custom_radio_on_toggled), gfe);
+		gtk_table_attach (GTK_TABLE(table), widget, 1, 2, row, row + 1, GTK_FILL, 0, 0, 0);
+		g_signal_connect(G_OBJECT(widget), "toggled",
+				G_CALLBACK(remmina_file_editor_ssh_server_custom_radio_on_toggled), gfe);
 		priv->ssh_server_custom_radio = widget;
 
 		widget = gtk_entry_new ();
 		gtk_widget_show(widget);
-		gtk_entry_set_max_length (GTK_ENTRY (widget), 100);
+		gtk_entry_set_max_length (GTK_ENTRY(widget), 100);
 		gtk_widget_set_tooltip_markup (widget, _(server_tips2));
-		gtk_table_attach_defaults (GTK_TABLE (table), widget, 2, 3, row, row + 1);
+		gtk_table_attach_defaults (GTK_TABLE(table), widget, 2, 3, row, row + 1);
 		priv->ssh_server_entry = widget;
 		row++;
 		break;
@@ -801,8 +803,8 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 		priv->server_combo = remmina_file_editor_create_combo (gfe, table, row, 1,
 				_("Server"), s, remmina_file_get_string (priv->remmina_file, "server"));
 		gtk_widget_set_tooltip_markup (priv->server_combo, _(server_tips));
-		gtk_entry_set_activates_default (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->server_combo))), TRUE);
-		g_free (s);
+		gtk_entry_set_activates_default (GTK_ENTRY(gtk_bin_get_child (GTK_BIN (priv->server_combo))), TRUE);
+		g_free(s);
 		row++;
 		break;
 
@@ -819,8 +821,8 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 		widget = remmina_file_editor_create_text (gfe, table, row, 1,
 				_("Startup program"), NULL);
 		cs = remmina_file_get_string (priv->remmina_file, "exec");
-		gtk_entry_set_text (GTK_ENTRY (widget), cs ? cs : "");
-		g_hash_table_insert (priv->setting_widgets, "exec", widget);
+		gtk_entry_set_text(GTK_ENTRY(widget), cs ? cs : "");
+		g_hash_table_insert(priv->setting_widgets, "exec", widget);
 		row++;
 	}
 	else if (ssh_setting == REMMINA_PROTOCOL_SSH_SETTING_SFTP)
@@ -828,13 +830,13 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 		widget = remmina_file_editor_create_text (gfe, table, row, 1,
 				_("Startup path"), NULL);
 		cs = remmina_file_get_string (priv->remmina_file, "execpath");
-		gtk_entry_set_text (GTK_ENTRY (widget), cs ? cs : "");
-		g_hash_table_insert (priv->setting_widgets, "execpath", widget);
+		gtk_entry_set_text(GTK_ENTRY(widget), cs ? cs : "");
+		g_hash_table_insert(priv->setting_widgets, "execpath", widget);
 		row++;
 	}
 
 	/* SSH Authentication frame */
-	remmina_public_create_group (GTK_TABLE (table), _("SSH Authentication"), row, 5, 3);
+	remmina_public_create_group (GTK_TABLE(table), _("SSH Authentication"), row, 5, 3);
 	row++;
 
 	priv->ssh_username_entry = remmina_file_editor_create_text (gfe, table, row, 1,
@@ -843,14 +845,14 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 
 	widget = gtk_radio_button_new_with_label (NULL, _("Password"));
 	gtk_widget_show(widget);
-	gtk_table_attach_defaults (GTK_TABLE (table), widget, 1, 3, row, row + 1);
+	gtk_table_attach_defaults (GTK_TABLE(table), widget, 1, 3, row, row + 1);
 	priv->ssh_auth_password_radio = widget;
 	row++;
 
 	widget = gtk_radio_button_new_with_label_from_widget (
-			GTK_RADIO_BUTTON (priv->ssh_auth_password_radio), _("Public key (automatic)"));
+			GTK_RADIO_BUTTON(priv->ssh_auth_password_radio), _("Public key (automatic)"));
 	gtk_widget_show(widget);
-	gtk_table_attach_defaults (GTK_TABLE (table), widget, 1, 3, row, row + 1);
+	gtk_table_attach_defaults (GTK_TABLE(table), widget, 1, 3, row, row + 1);
 	priv->ssh_auth_auto_publickey_radio = widget;
 	row++;
 
@@ -868,7 +870,7 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cs ?
 						priv->ssh_server_custom_radio : priv->ssh_server_default_radio), TRUE);
-		gtk_entry_set_text (GTK_ENTRY (priv->ssh_server_entry),
+		gtk_entry_set_text(GTK_ENTRY(priv->ssh_server_entry),
 				cs ? cs : "");
 	}
 	else if (ssh_setting == REMMINA_PROTOCOL_SSH_SETTING_REVERSE_TUNNEL)
@@ -877,12 +879,12 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 				remmina_file_get_int (priv->remmina_file, "ssh_enabled", FALSE));
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->ssh_loopback_check),
 				remmina_file_get_int (priv->remmina_file, "ssh_loopback", FALSE));
-		gtk_entry_set_text (GTK_ENTRY (priv->ssh_server_entry),
+		gtk_entry_set_text(GTK_ENTRY(priv->ssh_server_entry),
 				cs ? cs : "");
 	}
 
 	cs = remmina_file_get_string (priv->remmina_file, "ssh_username");
-	gtk_entry_set_text (GTK_ENTRY (priv->ssh_username_entry), cs ? cs : "");
+	gtk_entry_set_text(GTK_ENTRY(priv->ssh_username_entry), cs ? cs : "");
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (
 					remmina_file_get_int (priv->remmina_file, "ssh_auth", 0) == SSH_AUTH_PUBLICKEY ?
 					priv->ssh_auth_publickey_radio :
@@ -894,10 +896,10 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor *gfe, RemminaPr
 #endif
 }
 
-static void remmina_file_editor_create_all_settings(RemminaFileEditor *gfe)
+static void remmina_file_editor_create_all_settings(RemminaFileEditor* gfe)
 {
-	RemminaFileEditorPriv *priv = gfe->priv;
-	GtkWidget *table;
+	RemminaFileEditorPriv* priv = gfe->priv;
+	GtkWidget* table;
 
 	remmina_file_editor_create_notebook_container(gfe);
 
@@ -919,10 +921,10 @@ static void remmina_file_editor_create_all_settings(RemminaFileEditor *gfe)
 	remmina_file_editor_create_ssh_tab(gfe, priv->plugin->ssh_setting);
 }
 
-static void remmina_file_editor_protocol_combo_on_changed(GtkComboBox *combo, RemminaFileEditor *gfe)
+static void remmina_file_editor_protocol_combo_on_changed(GtkComboBox* combo, RemminaFileEditor* gfe)
 {
-	RemminaFileEditorPriv *priv = gfe->priv;
-	gchar *protocol;
+	RemminaFileEditorPriv* priv = gfe->priv;
+	gchar* protocol;
 
 	if (priv->config_container)
 	{
@@ -955,16 +957,16 @@ static void remmina_file_editor_protocol_combo_on_changed(GtkComboBox *combo, Re
 	protocol = remmina_public_combo_get_active_text(combo);
 	if (protocol)
 	{
-		priv->plugin = (RemminaProtocolPlugin *) remmina_plugin_manager_get_plugin(REMMINA_PLUGIN_TYPE_PROTOCOL,
+		priv->plugin = (RemminaProtocolPlugin*) remmina_plugin_manager_get_plugin(REMMINA_PLUGIN_TYPE_PROTOCOL,
 				protocol);
 		g_free(protocol);
 		remmina_file_editor_create_all_settings(gfe);
 	}
 }
 
-static void remmina_file_editor_update_ssh(RemminaFileEditor *gfe)
+static void remmina_file_editor_update_ssh(RemminaFileEditor* gfe)
 {
-	RemminaFileEditorPriv *priv = gfe->priv;
+	RemminaFileEditorPriv* priv = gfe->priv;
 	gboolean ssh_enabled;
 
 	if (priv->ssh_charset_combo)
@@ -1018,9 +1020,9 @@ static void remmina_file_editor_update_ssh(RemminaFileEditor *gfe)
 					gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(priv->ssh_privatekey_chooser)) : NULL));
 }
 
-static void remmina_file_editor_update_settings(RemminaFileEditor *gfe)
+static void remmina_file_editor_update_settings(RemminaFileEditor* gfe)
 {
-	RemminaFileEditorPriv *priv = gfe->priv;
+	RemminaFileEditorPriv* priv = gfe->priv;
 	GHashTableIter iter;
 	gpointer key, value;
 
@@ -1056,9 +1058,9 @@ static void remmina_file_editor_update_settings(RemminaFileEditor *gfe)
 	}
 }
 
-static void remmina_file_editor_update(RemminaFileEditor *gfe)
+static void remmina_file_editor_update(RemminaFileEditor* gfe)
 {
-	RemminaFileEditorPriv *priv = gfe->priv;
+	RemminaFileEditorPriv* priv = gfe->priv;
 
 	remmina_file_set_string(priv->remmina_file, "name", gtk_entry_get_text(GTK_ENTRY(priv->name_entry)));
 
@@ -1102,10 +1104,10 @@ static void remmina_file_editor_update(RemminaFileEditor *gfe)
 	remmina_file_editor_update_settings(gfe);
 }
 
-static void remmina_file_editor_on_default(GtkWidget *button, RemminaFileEditor *gfe)
+static void remmina_file_editor_on_default(GtkWidget* button, RemminaFileEditor* gfe)
 {
-	RemminaFile *gf;
-	GtkWidget *dialog;
+	RemminaFile* gf;
+	GtkWidget* dialog;
 
 	remmina_file_editor_update(gfe);
 
@@ -1127,7 +1129,7 @@ static void remmina_file_editor_on_default(GtkWidget *button, RemminaFileEditor
 	gtk_widget_destroy(dialog);
 }
 
-static void remmina_file_editor_on_save(GtkWidget *button, RemminaFileEditor *gfe)
+static void remmina_file_editor_on_save(GtkWidget* button, RemminaFileEditor* gfe)
 {
 	remmina_file_editor_update(gfe);
 	remmina_file_save_all(gfe->priv->remmina_file);
@@ -1135,9 +1137,9 @@ static void remmina_file_editor_on_save(GtkWidget *button, RemminaFileEditor *gf
 	gtk_widget_destroy(GTK_WIDGET(gfe));
 }
 
-static void remmina_file_editor_on_connect(GtkWidget *button, RemminaFileEditor *gfe)
+static void remmina_file_editor_on_connect(GtkWidget* button, RemminaFileEditor* gfe)
 {
-	RemminaFile *gf;
+	RemminaFile* gf;
 
 	remmina_file_editor_update(gfe);
 	if (remmina_pref.save_when_connect)
@@ -1155,15 +1157,15 @@ static void remmina_file_editor_on_connect(GtkWidget *button, RemminaFileEditor
 	remmina_connection_window_open_from_file(gf);
 }
 
-static void remmina_file_editor_on_cancel(GtkWidget *button, RemminaFileEditor *gfe)
+static void remmina_file_editor_on_cancel(GtkWidget* button, RemminaFileEditor* gfe)
 {
 	gtk_widget_destroy(GTK_WIDGET(gfe));
 }
 
-static void remmina_file_editor_init(RemminaFileEditor *gfe)
+static void remmina_file_editor_init(RemminaFileEditor* gfe)
 {
-	RemminaFileEditorPriv *priv;
-	GtkWidget *widget;
+	RemminaFileEditorPriv* priv;
+	GtkWidget* widget;
 
 	priv = g_new0(RemminaFileEditorPriv, 1);
 	gfe->priv = priv;
@@ -1203,10 +1205,10 @@ static void remmina_file_editor_init(RemminaFileEditor *gfe)
 	remmina_widget_pool_register(GTK_WIDGET(gfe));
 }
 
-static gboolean remmina_file_editor_iterate_protocol(gchar *protocol, RemminaPlugin *plugin, gpointer data)
+static gboolean remmina_file_editor_iterate_protocol(gchar* protocol, RemminaPlugin* plugin, gpointer data)
 {
-	RemminaFileEditor *gfe = REMMINA_FILE_EDITOR(data);
-	GtkListStore *store;
+	RemminaFileEditor* gfe = REMMINA_FILE_EDITOR(data);
+	GtkListStore* store;
 	GtkTreeIter iter;
 	gboolean first;
 
@@ -1216,7 +1218,7 @@ static gboolean remmina_file_editor_iterate_protocol(gchar *protocol, RemminaPlu
 
 	gtk_list_store_append(store, &iter);
 	gtk_list_store_set(store, &iter, 0, protocol, 1, g_dgettext(plugin->domain, plugin->description), 2,
-			((RemminaProtocolPlugin *) plugin)->icon_name, -1);
+			((RemminaProtocolPlugin*) plugin)->icon_name, -1);
 
 	if (first || g_strcmp0(protocol, remmina_file_get_string(gfe->priv->remmina_file, "protocol")) == 0)
 	{
@@ -1226,9 +1228,9 @@ static gboolean remmina_file_editor_iterate_protocol(gchar *protocol, RemminaPlu
 	return FALSE;
 }
 
-static void remmina_file_editor_check_profile(RemminaFileEditor *gfe)
+static void remmina_file_editor_check_profile(RemminaFileEditor* gfe)
 {
-	RemminaFileEditorPriv *priv;
+	RemminaFileEditorPriv* priv;
 
 	priv = gfe->priv;
 	if (remmina_file_get_filename(priv->remmina_file))
@@ -1238,9 +1240,9 @@ static void remmina_file_editor_check_profile(RemminaFileEditor *gfe)
 	}
 }
 
-static void remmina_file_editor_name_on_changed(GtkEditable *editable, RemminaFileEditor *gfe)
+static void remmina_file_editor_name_on_changed(GtkEditable* editable, RemminaFileEditor* gfe)
 {
-	RemminaFileEditorPriv *priv;
+	RemminaFileEditorPriv* priv;
 
 	priv = gfe->priv;
 	if (remmina_file_get_filename(priv->remmina_file) == NULL)
@@ -1250,16 +1252,15 @@ static void remmina_file_editor_name_on_changed(GtkEditable *editable, RemminaFi
 	}
 }
 
-GtkWidget*
-remmina_file_editor_new_from_file(RemminaFile *remminafile)
+GtkWidget* remmina_file_editor_new_from_file(RemminaFile* remminafile)
 {
-	RemminaFileEditor *gfe;
-	RemminaFileEditorPriv *priv;
-	GtkWidget *table;
-	GtkWidget *widget;
-	gchar *groups;
-	gchar *s;
-	const gchar *cs;
+	RemminaFileEditor* gfe;
+	RemminaFileEditorPriv* priv;
+	GtkWidget* table;
+	GtkWidget* widget;
+	gchar* groups;
+	gchar* s;
+	const gchar* cs;
 
 	gfe = REMMINA_FILE_EDITOR(g_object_new(REMMINA_TYPE_FILE_EDITOR, NULL));
 	priv = gfe->priv;
@@ -1348,16 +1349,14 @@ remmina_file_editor_new_from_file(RemminaFile *remminafile)
 	return GTK_WIDGET(gfe);
 }
 
-GtkWidget*
-remmina_file_editor_new(void)
+GtkWidget* remmina_file_editor_new(void)
 {
 	return remmina_file_editor_new_full(NULL, NULL);
 }
 
-GtkWidget*
-remmina_file_editor_new_full(const gchar *server, const gchar *protocol)
+GtkWidget* remmina_file_editor_new_full(const gchar* server, const gchar* protocol)
 {
-	RemminaFile *remminafile;
+	RemminaFile* remminafile;
 
 	remminafile = remmina_file_new();
 	if (server)
@@ -1368,11 +1367,10 @@ remmina_file_editor_new_full(const gchar *server, const gchar *protocol)
 	return remmina_file_editor_new_from_file(remminafile);
 }
 
-GtkWidget*
-remmina_file_editor_new_copy(const gchar *filename)
+GtkWidget* remmina_file_editor_new_copy(const gchar* filename)
 {
-	RemminaFile *remminafile;
-	GtkWidget *dialog;
+	RemminaFile* remminafile;
+	GtkWidget* dialog;
 
 	remminafile = remmina_file_copy(filename);
 	if (remminafile)
@@ -1389,11 +1387,10 @@ remmina_file_editor_new_copy(const gchar *filename)
 	}
 }
 
-GtkWidget*
-remmina_file_editor_new_from_filename(const gchar *filename)
+GtkWidget* remmina_file_editor_new_from_filename(const gchar* filename)
 {
-	RemminaFile *remminafile;
-	GtkWidget *dialog;
+	RemminaFile* remminafile;
+	GtkWidget* dialog;
 
 	remminafile = remmina_file_manager_load_file(filename);
 	if (remminafile)
diff --git a/remmina/src/remmina_file_editor.h b/remmina/src/remmina_file_editor.h
index e6f4b0e23f..b1b0701eeb 100644
--- a/remmina/src/remmina_file_editor.h
+++ b/remmina/src/remmina_file_editor.h
@@ -36,7 +36,7 @@ typedef struct _RemminaFileEditor
 {
 	GtkDialog dialog;
 
-	RemminaFileEditorPriv *priv;
+	RemminaFileEditorPriv* priv;
 } RemminaFileEditor;
 
 typedef struct _RemminaFileEditorClass
@@ -48,13 +48,13 @@ GType remmina_file_editor_get_type(void)
 G_GNUC_CONST;
 
 /* Base constructor */
-GtkWidget* remmina_file_editor_new_from_file(RemminaFile *remminafile);
+GtkWidget* remmina_file_editor_new_from_file(RemminaFile* remminafile);
 /* Create new file */
 GtkWidget* remmina_file_editor_new(void);
-GtkWidget* remmina_file_editor_new_full(const gchar *server, const gchar *protocol);
-GtkWidget* remmina_file_editor_new_copy(const gchar *filename);
+GtkWidget* remmina_file_editor_new_full(const gchar* server, const gchar* protocol);
+GtkWidget* remmina_file_editor_new_copy(const gchar* filename);
 /* Open existing file */
-GtkWidget* remmina_file_editor_new_from_filename(const gchar *filename);
+GtkWidget* remmina_file_editor_new_from_filename(const gchar* filename);
 
 G_END_DECLS
 
diff --git a/remmina/src/remmina_file_manager.c b/remmina/src/remmina_file_manager.c
index fa78c97160..2741962b02 100644
--- a/remmina/src/remmina_file_manager.c
+++ b/remmina/src/remmina_file_manager.c
@@ -37,13 +37,14 @@ gint remmina_file_manager_iterate(GFunc func, gpointer user_data)
 {
 	gchar dirname[MAX_PATH_LEN];
 	gchar filename[MAX_PATH_LEN];
-	GDir *dir;
-	const gchar *name;
-	RemminaFile *remminafile;
+	GDir* dir;
+	const gchar* name;
+	RemminaFile* remminafile;
 	gint n;
 
 	g_snprintf(dirname, MAX_PATH_LEN, "%s/.remmina", g_get_home_dir());
 	dir = g_dir_open(dirname, 0, NULL);
+
 	if (dir == NULL)
 		return 0;
 
@@ -65,17 +66,16 @@ gint remmina_file_manager_iterate(GFunc func, gpointer user_data)
 	return n;
 }
 
-gchar*
-remmina_file_manager_get_groups(void)
+gchar* remmina_file_manager_get_groups(void)
 {
 	gchar dirname[MAX_PATH_LEN];
 	gchar filename[MAX_PATH_LEN];
-	GDir *dir;
-	const gchar *name;
-	RemminaFile *remminafile;
-	RemminaStringArray *array;
-	const gchar *group;
-	gchar *groups;
+	GDir* dir;
+	const gchar* name;
+	RemminaFile* remminafile;
+	RemminaStringArray* array;
+	const gchar* group;
+	gchar* groups;
 
 	array = remmina_string_array_new();
 
@@ -103,32 +103,40 @@ remmina_file_manager_get_groups(void)
 	return groups;
 }
 
-static void remmina_file_manager_add_group(GNode *node, const gchar *group)
+static void remmina_file_manager_add_group(GNode* node, const gchar* group)
 {
-	RemminaGroupData *data;
-	gchar *p1, *p2;
-	GNode *child;
 	gint cmp;
+	gchar* p1;
+	gchar* p2;
+	GNode* child;
 	gboolean found;
+	RemminaGroupData* data;
 
 	if (group == NULL || group[0] == '\0')
 		return;
+
 	p1 = g_strdup(group);
 	p2 = strchr(p1, '/');
+
 	if (p2)
 		*p2++ = '\0';
+
 	found = FALSE;
+
 	for (child = g_node_first_child(node); child; child = g_node_next_sibling(child))
 	{
 		cmp = g_strcmp0(((RemminaGroupData*) child->data)->name, p1);
+
 		if (cmp == 0)
 		{
 			found = TRUE;
 			break;
 		}
+
 		if (cmp > 0)
 			break;
 	}
+
 	if (!found)
 	{
 		data = g_new0(RemminaGroupData, 1);
@@ -151,22 +159,22 @@ static void remmina_file_manager_add_group(GNode *node, const gchar *group)
 		}
 	}
 	remmina_file_manager_add_group(child, p2);
+
 	if (found)
 	{
 		g_free(p1);
 	}
 }
 
-GNode*
-remmina_file_manager_get_group_tree(void)
+GNode* remmina_file_manager_get_group_tree(void)
 {
 	gchar dirname[MAX_PATH_LEN];
 	gchar filename[MAX_PATH_LEN];
-	GDir *dir;
-	const gchar *name;
-	RemminaFile *remminafile;
-	const gchar *group;
-	GNode *root;
+	GDir* dir;
+	const gchar* name;
+	RemminaFile* remminafile;
+	const gchar* group;
+	GNode* root;
 
 	root = g_node_new(NULL);
 
@@ -188,10 +196,10 @@ remmina_file_manager_get_group_tree(void)
 	return root;
 }
 
-void remmina_file_manager_free_group_tree(GNode *node)
+void remmina_file_manager_free_group_tree(GNode* node)
 {
-	RemminaGroupData *data;
-	GNode *child;
+	RemminaGroupData* data;
+	GNode* child;
 
 	if (!node)
 		return;
@@ -210,12 +218,11 @@ void remmina_file_manager_free_group_tree(GNode *node)
 	g_node_unlink(node);
 }
 
-RemminaFile*
-remmina_file_manager_load_file(const gchar *filename)
+RemminaFile* remmina_file_manager_load_file(const gchar* filename)
 {
-	RemminaFile *remminafile = NULL;
-	RemminaFilePlugin *plugin;
-	gchar *p;
+	RemminaFile* remminafile = NULL;
+	RemminaFilePlugin* plugin;
+	gchar* p;
 
 	if ((p = strrchr(filename, '.')) != NULL && g_strcmp0(p + 1, "remmina") == 0)
 	{
diff --git a/remmina/src/remmina_ftp_client.c b/remmina/src/remmina_ftp_client.c
index ddb98dde98..740ca7ca6a 100644
--- a/remmina/src/remmina_ftp_client.c
+++ b/remmina/src/remmina_ftp_client.c
@@ -1079,10 +1079,10 @@ void remmina_ftp_client_add_file(RemminaFTPClient *client, ...)
 			REMMINA_FTP_FILE_COLUMN_NAME, &name,
 			-1);
 
-	ptr = g_strdup_printf ("%i%s", type, name);
+	ptr = g_strdup_printf("%i%s", type, name);
 	gtk_list_store_set (store, &iter, REMMINA_FTP_FILE_COLUMN_NAME_SORT, ptr, -1);
-	g_free (ptr);
-	g_free (name);
+	g_free(ptr);
+	g_free(name);
 }
 
 void remmina_ftp_client_set_dir(RemminaFTPClient *client, const gchar *dir)
diff --git a/remmina/src/remmina_icon.c b/remmina/src/remmina_icon.c
index 02408434ac..aefbd13255 100644
--- a/remmina/src/remmina_icon.c
+++ b/remmina/src/remmina_icon.c
@@ -138,7 +138,7 @@ static void remmina_icon_populate_additional_menu_item(GtkWidget *menu)
 		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
 	}
 	gtk_widget_show(menuitem);
-	g_signal_connect (G_OBJECT (menuitem), "toggled", G_CALLBACK (remmina_icon_enable_avahi), NULL);
+	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(remmina_icon_enable_avahi), NULL);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 #endif
 
diff --git a/remmina/src/remmina_init_dialog.c b/remmina/src/remmina_init_dialog.c
index 90c3cea939..2152710b86 100644
--- a/remmina/src/remmina_init_dialog.c
+++ b/remmina/src/remmina_init_dialog.c
@@ -135,7 +135,7 @@ void remmina_init_dialog_set_status(RemminaInitDialog *dialog, const gchar *stat
 
 	if (status_format)
 	{
-		if (dialog->status) g_free (dialog->status);
+		if (dialog->status) g_free(dialog->status);
 
 		va_start (args, status_format);
 		dialog->status = g_strdup_vprintf (status_format, args);
@@ -157,7 +157,7 @@ void remmina_init_dialog_set_status_temp(RemminaInitDialog *dialog, const gchar
 		va_end (args);
 
 		gtk_label_set_text (GTK_LABEL (dialog->status_label), s);
-		g_free (s);
+		g_free(s);
 	}
 }
 
diff --git a/remmina/src/remmina_plugin_manager.c b/remmina/src/remmina_plugin_manager.c
index 3933b89326..6f17eef5ba 100644
--- a/remmina/src/remmina_plugin_manager.c
+++ b/remmina/src/remmina_plugin_manager.c
@@ -144,7 +144,7 @@ void remmina_plugin_manager_init(void)
 			continue;
 		ptr++;
 		if (g_strcmp0(ptr, G_MODULE_SUFFIX) != 0)
-			continue; fullpath = g_strdup_printf (REMMINA_PLUGINDIR "/%s", name);
+			continue; fullpath = g_strdup_printf(REMMINA_PLUGINDIR "/%s", name);
 		remmina_plugin_manager_load_plugin(fullpath);
 		g_free(fullpath);
 	}
diff --git a/remmina/src/remmina_protocol_widget.c b/remmina/src/remmina_protocol_widget.c
index 912f6bd1b1..202ff2eecf 100644
--- a/remmina/src/remmina_protocol_widget.c
+++ b/remmina/src/remmina_protocol_widget.c
@@ -471,14 +471,14 @@ remmina_protocol_widget_start_direct_tunnel(RemminaProtocolWidget *gp, gint defa
 #ifdef HAVE_LIBSSH
 	if (!remmina_file_get_int (gp->priv->remmina_file, "ssh_enabled", FALSE))
 	{
-		dest = g_strdup_printf ("[%s]:%i", host, port);
-		g_free (host);
+		dest = g_strdup_printf("[%s]:%i", host, port);
+		g_free(host);
 		return dest;
 	}
 
 	if (!remmina_protocol_widget_init_tunnel (gp))
 	{
-		g_free (host);
+		g_free(host);
 		return NULL;
 	}
 
@@ -489,19 +489,19 @@ remmina_protocol_widget_start_direct_tunnel(RemminaProtocolWidget *gp, gint defa
 
 	if (remmina_file_get_int (gp->priv->remmina_file, "ssh_loopback", FALSE))
 	{
-		g_free (host);
+		g_free(host);
 		host = g_strdup ("127.0.0.1");
 	}
 
 	if (!remmina_ssh_tunnel_open (gp->priv->ssh_tunnel, host, port, remmina_pref.sshtunnel_port))
 	{
-		g_free (host);
+		g_free(host);
 		remmina_protocol_widget_set_error (gp, REMMINA_SSH (gp->priv->ssh_tunnel)->error);
 		return NULL;
 	}
 
-	g_free (host);
-	return g_strdup_printf ("127.0.0.1:%i", remmina_pref.sshtunnel_port);
+	g_free(host);
+	return g_strdup_printf("127.0.0.1:%i", remmina_pref.sshtunnel_port);
 
 #else
 
@@ -592,7 +592,7 @@ gboolean remmina_protocol_widget_ssh_exec(RemminaProtocolWidget *gp, gboolean wa
     {
         remmina_ssh_set_error (REMMINA_SSH (tunnel), _("Failed to execute command: %s"));
     }
-    g_free (cmd);
+    g_free(cmd);
     if (wait) channel_close (channel);
     channel_free (channel);
     return ret;
@@ -616,7 +616,7 @@ remmina_protocol_widget_tunnel_init_callback (RemminaSSHTunnel *tunnel, gpointer
 	remmina_public_get_server_port (remmina_file_get_string (gp->priv->remmina_file, "server"), 177, &server, &port);
 	ret = ((RemminaXPortTunnelInitFunc) gp->priv->init_func) (gp,
 			tunnel->remotedisplay, (tunnel->bindlocalhost ? "localhost" : server), port);
-	g_free (server);
+	g_free(server);
 
 	return ret;
 }
@@ -662,7 +662,7 @@ gboolean remmina_protocol_widget_start_xport_tunnel(RemminaProtocolWidget *gp, R
 
 	remmina_public_get_server_port (remmina_file_get_string (gp->priv->remmina_file, "server"), 0, &server, NULL);
 	bindlocalhost = (g_strcmp0(REMMINA_SSH (gp->priv->ssh_tunnel)->server, server) == 0);
-	g_free (server);
+	g_free(server);
 
 	if (!remmina_ssh_tunnel_xport (gp->priv->ssh_tunnel, bindlocalhost))
 	{
@@ -681,8 +681,8 @@ gboolean remmina_protocol_widget_start_xport_tunnel(RemminaProtocolWidget *gp, R
 void remmina_protocol_widget_set_display(RemminaProtocolWidget *gp, gint display)
 {
 #ifdef HAVE_LIBSSH
-	if (gp->priv->ssh_tunnel->localdisplay) g_free (gp->priv->ssh_tunnel->localdisplay);
-	gp->priv->ssh_tunnel->localdisplay = g_strdup_printf ("unix:%i", display);
+	if (gp->priv->ssh_tunnel->localdisplay) g_free(gp->priv->ssh_tunnel->localdisplay);
+	gp->priv->ssh_tunnel->localdisplay = g_strdup_printf("unix:%i", display);
 #endif
 }
 
@@ -747,7 +747,7 @@ void remmina_protocol_widget_set_error(RemminaProtocolWidget *gp, const gchar *f
 {
 	va_list args;
 
-	if (gp->priv->error_message) g_free (gp->priv->error_message);
+	if (gp->priv->error_message) g_free(gp->priv->error_message);
 
 	va_start (args, fmt);
 	gp->priv->error_message = g_strdup_vprintf (fmt, args);
diff --git a/remmina/src/remmina_sftp_client.c b/remmina/src/remmina_sftp_client.c
index e2f290aeb8..87b0e5dfa5 100644
--- a/remmina/src/remmina_sftp_client.c
+++ b/remmina/src/remmina_sftp_client.c
@@ -83,7 +83,7 @@ remmina_sftp_client_thread_set_error (RemminaSFTPClient *client, RemminaFTPTask
 	va_list args;
 
 	task->status = REMMINA_FTP_TASK_STATUS_ERROR;
-	g_free (task->tooltip);
+	g_free(task->tooltip);
 	if (error_format)
 	{
 		va_start (args, error_format);
@@ -102,7 +102,7 @@ static void
 remmina_sftp_client_thread_set_finish (RemminaSFTPClient *client, RemminaFTPTask *task)
 {
 	task->status = REMMINA_FTP_TASK_STATUS_FINISH;
-	g_free (task->tooltip);
+	g_free(task->tooltip);
 	task->tooltip = NULL;
 
 	remmina_sftp_client_thread_update_task (client, task);
@@ -197,7 +197,7 @@ remmina_sftp_client_thread_download_file (RemminaSFTPClient *client, RemminaSFTP
 
 	tmp = remmina_ssh_unconvert (REMMINA_SSH (sftp), remote_path);
 	remote_file = sftp_open (sftp->sftp_sess, tmp, O_RDONLY, 0);
-	g_free (tmp);
+	g_free(tmp);
 
 	if (!remote_file)
 	{
@@ -267,17 +267,17 @@ remmina_sftp_client_thread_recursive_dir (RemminaSFTPClient *client, RemminaSFTP
 	}
 	tmp = remmina_ssh_unconvert (REMMINA_SSH (sftp), dir_path);
 	sftpdir = sftp_opendir (sftp->sftp_sess, tmp);
-	g_free (tmp);
+	g_free(tmp);
 
 	if (!sftpdir)
 	{
 		remmina_sftp_client_thread_set_error (client, task, _("Error opening directory %s. %s"),
 				dir_path, ssh_get_error (REMMINA_SSH (client->sftp)->session));
-		g_free (dir_path);
+		g_free(dir_path);
 		return FALSE;
 	}
 
-	g_free (dir_path);
+	g_free(dir_path);
 
 	while ((sftpattr = sftp_readdir (sftp->sftp_sess, sftpdir)))
 	{
@@ -290,7 +290,7 @@ remmina_sftp_client_thread_recursive_dir (RemminaSFTPClient *client, RemminaSFTP
 			if (subdir_path)
 			{
 				file_path = remmina_public_combine_path (subdir_path, tmp);
-				g_free (tmp);
+				g_free(tmp);
 			}
 			else
 			{
@@ -300,7 +300,7 @@ remmina_sftp_client_thread_recursive_dir (RemminaSFTPClient *client, RemminaSFTP
 			if (type == REMMINA_FTP_FILE_TYPE_DIR)
 			{
 				ret = remmina_sftp_client_thread_recursive_dir (client, sftp, task, rootdir_path, file_path, array);
-				g_free (file_path);
+				g_free(file_path);
 				if (!ret)
 				{
 					sftp_attributes_free (sftpattr);
@@ -344,7 +344,7 @@ remmina_sftp_client_thread_recursive_localdir (RemminaSFTPClient *client, Remmin
 	dir = g_dir_open (path, 0, NULL);
 	if (dir == NULL)
 	{
-		g_free (path);
+		g_free(path);
 		return FALSE;
 	}
 	while ((name = g_dir_read_name (dir)) != NULL)
@@ -358,7 +358,7 @@ remmina_sftp_client_thread_recursive_localdir (RemminaSFTPClient *client, Remmin
 		abspath = g_build_filename (path, name, NULL);
 		if (g_stat (abspath, &st) < 0)
 		{
-			g_free (abspath);
+			g_free(abspath);
 			continue;
 		}
 		relpath = g_build_filename (subdir_path ? subdir_path : "", name, NULL);
@@ -372,9 +372,9 @@ remmina_sftp_client_thread_recursive_localdir (RemminaSFTPClient *client, Remmin
 		{
 			task->size += (gfloat) st.st_size;
 		}
-		g_free (abspath);
+		g_free(abspath);
 	}
-	g_free (path);
+	g_free(path);
 	g_dir_close (dir);
 	return ret;
 }
@@ -416,7 +416,7 @@ remmina_sftp_client_thread_upload_file (RemminaSFTPClient *client, RemminaSFTP *
 
 	tmp = remmina_ssh_unconvert (REMMINA_SSH (sftp), remote_path);
 	remote_file = sftp_open (sftp->sftp_sess, tmp, O_WRONLY | O_CREAT, 0644);
-	g_free (tmp);
+	g_free(tmp);
 
 	if (!remote_file)
 	{
@@ -445,7 +445,7 @@ remmina_sftp_client_thread_upload_file (RemminaSFTPClient *client, RemminaSFTP *
 			sftp_close (remote_file);
 			tmp = remmina_ssh_unconvert (REMMINA_SSH (sftp), remote_path);
 			remote_file = sftp_open (sftp->sftp_sess, tmp, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-			g_free (tmp);
+			g_free(tmp);
 			if (!remote_file)
 			{
 				remmina_sftp_client_thread_set_error (client, task, _("Error creating file %s on server. %s"),
@@ -573,8 +573,8 @@ remmina_sftp_client_thread_main (gpointer data)
 						local_file = remmina_public_combine_path (local, (gchar*) g_ptr_array_index (array, i));
 						ret = remmina_sftp_client_thread_download_file (client, sftp, task,
 								remote_file, local_file, &size);
-						g_free (remote_file);
-						g_free (local_file);
+						g_free(remote_file);
+						g_free(local_file);
 						if (!ret) break;
 					}
 				}
@@ -625,8 +625,8 @@ remmina_sftp_client_thread_main (gpointer data)
 							ret = remmina_sftp_client_thread_upload_file (client, sftp, task,
 									remote_file, local_file, &size);
 						}
-						g_free (remote_file);
-						g_free (local_file);
+						g_free(remote_file);
+						g_free(local_file);
 						if (!ret) break;
 					}
 				}
@@ -645,19 +645,19 @@ remmina_sftp_client_thread_main (gpointer data)
 				if (g_strcmp0(tmp, task->remotedir) == 0)
 				{
 					refresh = TRUE;
-					g_free (refreshdir);
+					g_free(refreshdir);
 					refreshdir = tmp;
 				}
 				else
 				{
-					g_free (tmp);
+					g_free(tmp);
 				}
 			}
 			break;
 		}
 
-		g_free (remote);
-		g_free (local);
+		g_free(remote);
+		g_free(local);
 
 		remmina_ftp_task_free (task);
 		client->taskid = 0;
@@ -679,9 +679,9 @@ remmina_sftp_client_thread_main (gpointer data)
 		{
 			IDLE_ADD ((GSourceFunc) remmina_sftp_client_refresh, client);
 		}
-		g_free (tmp);
+		g_free(tmp);
 	}
-	g_free (refreshdir);
+	g_free(refreshdir);
 	client->thread = 0;
 
 	return NULL;
@@ -772,18 +772,18 @@ remmina_sftp_client_on_opendir (RemminaSFTPClient *client, gchar *dir, gpointer
 		if (tmp)
 		{
 			newdir = remmina_public_combine_path (tmp, dir);
-			g_free (tmp);
+			g_free(tmp);
 		}
 		else
 		{
-			newdir = g_strdup_printf ("./%s", dir);
+			newdir = g_strdup_printf("./%s", dir);
 		}
 	}
 
 	tmp = remmina_ssh_unconvert (REMMINA_SSH (client->sftp), newdir);
 	newdir_conv = sftp_canonicalize_path (client->sftp->sftp_sess, tmp);
-	g_free (tmp);
-	g_free (newdir);
+	g_free(tmp);
+	g_free(newdir);
 	newdir = remmina_ssh_convert (REMMINA_SSH (client->sftp), newdir_conv);
 	if (!newdir)
 	{
@@ -792,16 +792,16 @@ remmina_sftp_client_on_opendir (RemminaSFTPClient *client, gchar *dir, gpointer
 				_("Failed to open directory %s. %s"), dir,
 				ssh_get_error (REMMINA_SSH (client->sftp)->session));
 		gtk_widget_show(dialog);
-		g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL);
-		g_free (newdir_conv);
+		g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), NULL);
+		g_free(newdir_conv);
 		return;
 	}
 
 	sftpdir = remmina_sftp_client_sftp_session_opendir (client, newdir_conv);
-	g_free (newdir_conv);
+	g_free(newdir_conv);
 	if (!sftpdir)
 	{
-		g_free (newdir);
+		g_free(newdir);
 		return;
 	}
 
@@ -823,14 +823,14 @@ remmina_sftp_client_on_opendir (RemminaSFTPClient *client, gchar *dir, gpointer
 					REMMINA_FTP_FILE_COLUMN_GROUP, sftpattr->group,
 					REMMINA_FTP_FILE_COLUMN_PERMISSION, sftpattr->permissions,
 					-1);
-			g_free (tmp);
+			g_free(tmp);
 		}
 		sftp_attributes_free (sftpattr);
 	}
 	remmina_sftp_client_sftp_session_closedir (client, sftpdir);
 
 	remmina_ftp_client_set_dir (REMMINA_FTP_CLIENT (client), newdir);
-	g_free (newdir);
+	g_free(newdir);
 }
 
 static void
@@ -884,7 +884,7 @@ remmina_sftp_client_on_deletefile (RemminaSFTPClient *client, gint type, gchar *
 		ret = sftp_unlink (client->sftp->sftp_sess, tmp);
 		break;
 	}
-	g_free (tmp);
+	g_free(tmp);
 
 	if (ret != 0)
 	{
@@ -908,16 +908,16 @@ remmina_sftp_client_init (RemminaSFTPClient *client)
 	client->thread_abort = FALSE;
 
 	/* Setup the internal signals */
-	g_signal_connect (G_OBJECT (client), "destroy",
-			G_CALLBACK (remmina_sftp_client_destroy), NULL);
-	g_signal_connect (G_OBJECT (client), "open-dir",
-			G_CALLBACK (remmina_sftp_client_on_opendir), NULL);
-	g_signal_connect (G_OBJECT (client), "new-task",
-			G_CALLBACK (remmina_sftp_client_on_newtask), NULL);
-	g_signal_connect (G_OBJECT (client), "cancel-task",
-			G_CALLBACK (remmina_sftp_client_on_canceltask), NULL);
-	g_signal_connect (G_OBJECT (client), "delete-file",
-			G_CALLBACK (remmina_sftp_client_on_deletefile), NULL);
+	g_signal_connect(G_OBJECT(client), "destroy",
+			G_CALLBACK(remmina_sftp_client_destroy), NULL);
+	g_signal_connect(G_OBJECT(client), "open-dir",
+			G_CALLBACK(remmina_sftp_client_on_opendir), NULL);
+	g_signal_connect(G_OBJECT(client), "new-task",
+			G_CALLBACK(remmina_sftp_client_on_newtask), NULL);
+	g_signal_connect(G_OBJECT(client), "cancel-task",
+			G_CALLBACK(remmina_sftp_client_on_canceltask), NULL);
+	g_signal_connect(G_OBJECT(client), "delete-file",
+			G_CALLBACK(remmina_sftp_client_on_deletefile), NULL);
 }
 
 static gboolean
@@ -968,12 +968,12 @@ remmina_sftp_client_confirm_resume (RemminaSFTPClient *client, const gchar *path
 	gtk_widget_show(vbox);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 4);
 
-	widget = gtk_label_new (_("The following file already exists in the target folder:"));
+	widget = gtk_label_new(_("The following file already exists in the target folder:"));
 	gtk_widget_show(widget);
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 4);
 
-	widget = gtk_label_new (filename);
+	widget = gtk_label_new(filename);
 	gtk_widget_show(widget);
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 4);
diff --git a/remmina/src/remmina_sftp_plugin.c b/remmina/src/remmina_sftp_plugin.c
index eaf6c21904..546c13c6e2 100644
--- a/remmina/src/remmina_sftp_plugin.c
+++ b/remmina/src/remmina_sftp_plugin.c
@@ -57,9 +57,9 @@ remmina_plugin_sftp_main_thread (gpointer data)
 	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL);
 	CANCEL_ASYNC
 
-	gpdata = (RemminaPluginSftpData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSftpData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 
-	ssh = g_object_get_data (G_OBJECT (gp), "user-data");
+	ssh = g_object_get_data (G_OBJECT(gp), "user-data");
 	if (ssh)
 	{
 		/* Create SFTP connection based on existing SSH session */
@@ -144,21 +144,21 @@ remmina_plugin_sftp_init (RemminaProtocolWidget *gp)
 	RemminaFile *remminafile;
 
 	gpdata = g_new0 (RemminaPluginSftpData, 1);
-	g_object_set_data_full (G_OBJECT (gp), "plugin-data", gpdata, g_free);
+	g_object_set_data_full (G_OBJECT(gp), "plugin-data", gpdata, g_free);
 
 	remminafile = remmina_plugin_service->protocol_plugin_get_file (gp);
 
 	gpdata->client = remmina_sftp_client_new ();
 	gtk_widget_show(gpdata->client);
-	gtk_container_add (GTK_CONTAINER (gp), gpdata->client);
+	gtk_container_add(GTK_CONTAINER (gp), gpdata->client);
 
 	remmina_ftp_client_set_show_hidden (REMMINA_FTP_CLIENT (gpdata->client),
 			remmina_plugin_service->file_get_int (remminafile, "showhidden", FALSE));
 
 	remmina_plugin_service->protocol_plugin_register_hostkey (gp, gpdata->client);
 
-	g_signal_connect (G_OBJECT (gpdata->client),
-			"realize", G_CALLBACK (remmina_plugin_sftp_client_on_realize), gp);
+	g_signal_connect(G_OBJECT(gpdata->client),
+			"realize", G_CALLBACK(remmina_plugin_sftp_client_on_realize), gp);
 }
 
 static gboolean
@@ -166,7 +166,7 @@ remmina_plugin_sftp_open_connection (RemminaProtocolWidget *gp)
 {
 	RemminaPluginSftpData *gpdata;
 
-	gpdata = (RemminaPluginSftpData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSftpData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 
 	remmina_plugin_service->protocol_plugin_set_expand (gp, TRUE);
 	remmina_plugin_service->protocol_plugin_set_width (gp, 640);
@@ -192,7 +192,7 @@ remmina_plugin_sftp_close_connection (RemminaProtocolWidget *gp)
 	RemminaPluginSftpData *gpdata;
 	RemminaFile *remminafile;
 
-	gpdata = (RemminaPluginSftpData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSftpData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 	remminafile = remmina_plugin_service->protocol_plugin_get_file (gp);
 	if (gpdata->thread)
 	{
@@ -217,7 +217,7 @@ remmina_plugin_sftp_call_feature (RemminaProtocolWidget *gp, const RemminaProtoc
 	RemminaPluginSftpData *gpdata;
 	RemminaFile *remminafile;
 
-	gpdata = (RemminaPluginSftpData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSftpData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 	remminafile = remmina_plugin_service->protocol_plugin_get_file (gp);
 	switch (feature->id)
 	{
diff --git a/remmina/src/remmina_ssh.c b/remmina/src/remmina_ssh.c
index 78910c8ec1..8ee9674fea 100644
--- a/remmina/src/remmina_ssh.c
+++ b/remmina/src/remmina_ssh.c
@@ -76,7 +76,7 @@ remmina_ssh_identity_path (const gchar *id)
 {
 	if (id == NULL) return NULL;
 	if (id[0] == '/') return g_strdup (id);
-	return g_strdup_printf ("%s/%s", g_get_home_dir (), id);
+	return g_strdup_printf("%s/%s", g_get_home_dir (), id);
 }
 
 gchar*
@@ -92,7 +92,7 @@ remmina_ssh_find_identity (void)
 		{
 			return path;
 		}
-		g_free (path);
+		g_free(path);
 	}
 	return NULL;
 }
@@ -103,7 +103,7 @@ remmina_ssh_set_error (RemminaSSH *ssh, const gchar *fmt)
 	const gchar *err;
 
 	err = ssh_get_error (ssh->session);
-	ssh->error = g_strdup_printf (fmt, err);
+	ssh->error = g_strdup_printf(fmt, err);
 }
 
 void
@@ -165,7 +165,7 @@ remmina_ssh_auth_pubkey (RemminaSSH *ssh)
 
 	if (ssh->pubkeyfile == NULL || ssh->privkeyfile == NULL)
 	{
-		ssh->error = g_strdup_printf (_("SSH public key authentication failed: %s"),
+		ssh->error = g_strdup_printf(_("SSH public key authentication failed: %s"),
 				_("SSH Key file not yet set."));
 		return 0;
 	}
@@ -181,7 +181,7 @@ remmina_ssh_auth_pubkey (RemminaSSH *ssh)
 			(ssh->password ? ssh->password : ""));
 	if (privkey == NULL)
 	{
-		string_free (pubkey);
+		string_free(pubkey);
 		if (ssh->password == NULL || ssh->password[0] == '\0') return -1;
 
 		remmina_ssh_set_error (ssh, _("SSH public key authentication failed: %s"));
@@ -189,7 +189,7 @@ remmina_ssh_auth_pubkey (RemminaSSH *ssh)
 	}
 
 	ret = ssh_userauth_pubkey (ssh->session, NULL, pubkey, privkey);
-	string_free (pubkey);
+	string_free(pubkey);
 	privatekey_free (privkey);
 
 	if (ret != SSH_AUTH_SUCCESS)
@@ -231,7 +231,7 @@ remmina_ssh_auth (RemminaSSH *ssh, const gchar *password)
 
 	if (password)
 	{
-		g_free (ssh->password);
+		g_free(ssh->password);
 		ssh->password = g_strdup (password);
 	}
 
@@ -351,7 +351,7 @@ remmina_ssh_auth_gui (RemminaSSH *ssh, RemminaInitDialog *dialog, gboolean threa
 }
 
 void
-remmina_ssh_log_callback (ssh_session session, int priority, const char *message, void *userdata)
+remmina_ssh_loG_CALLBACK(ssh_session session, int priority, const char *message, void *userdata)
 {
 	remmina_log_printf ("[SSH] %s\n", message);
 }
@@ -417,7 +417,7 @@ remmina_ssh_init_from_file (RemminaSSH *ssh, RemminaFile *remminafile)
 		remmina_public_get_server_port (ssh_server, 22, &ssh->server, &ssh->port);
 		if (ssh->server[0] == '\0')
 		{
-			g_free (ssh->server);
+			g_free(ssh->server);
 			remmina_public_get_server_port (server, 0, &ssh->server, NULL);
 		}
 	}
@@ -442,8 +442,8 @@ remmina_ssh_init_from_file (RemminaSSH *ssh, RemminaFile *remminafile)
 	if (s)
 	{
 		ssh->privkeyfile = remmina_ssh_identity_path (s);
-		ssh->pubkeyfile = g_strdup_printf ("%s.pub", ssh->privkeyfile);
-		g_free (s);
+		ssh->pubkeyfile = g_strdup_printf("%s.pub", ssh->privkeyfile);
+		g_free(s);
 	}
 	else
 	{
@@ -508,16 +508,16 @@ remmina_ssh_free (RemminaSSH *ssh)
 		ssh_free (ssh->session);
 		ssh->session = NULL;
 	}
-	g_free (ssh->callback);
-	g_free (ssh->server);
-	g_free (ssh->user);
-	g_free (ssh->password);
-	g_free (ssh->pubkeyfile);
-	g_free (ssh->privkeyfile);
-	g_free (ssh->charset);
-	g_free (ssh->error);
+	g_free(ssh->callback);
+	g_free(ssh->server);
+	g_free(ssh->user);
+	g_free(ssh->password);
+	g_free(ssh->pubkeyfile);
+	g_free(ssh->privkeyfile);
+	g_free(ssh->charset);
+	g_free(ssh->error);
 	pthread_mutex_destroy (&ssh->ssh_mutex);
-	g_free (ssh);
+	g_free(ssh);
 }
 
 /*************************** SSH Tunnel *********************************/
@@ -545,8 +545,8 @@ remmina_ssh_tunnel_buffer_free (RemminaSSHTunnelBuffer *buffer)
 {
 	if (buffer)
 	{
-		g_free (buffer->data);
-		g_free (buffer);
+		g_free(buffer->data);
+		g_free(buffer);
 	}
 }
 
@@ -597,11 +597,11 @@ remmina_ssh_tunnel_close_all_channels (RemminaSSHTunnel *tunnel)
 		channel_free (tunnel->channels[i]);
 	}
 
-	g_free (tunnel->channels);
+	g_free(tunnel->channels);
 	tunnel->channels = NULL;
-	g_free (tunnel->sockets);
+	g_free(tunnel->sockets);
 	tunnel->sockets = NULL;
-	g_free (tunnel->socketbuffers);
+	g_free(tunnel->socketbuffers);
 	tunnel->socketbuffers = NULL;
 
 	tunnel->num_channels = 0;
@@ -724,7 +724,7 @@ remmina_ssh_tunnel_main_thread_proc (gpointer data)
 		if (!remmina_public_get_xauth_cookie (tunnel->localdisplay, &ptr))
 		{
 			remmina_ssh_set_application_error (REMMINA_SSH (tunnel), "%s", ptr);
-			g_free (ptr);
+			g_free(ptr);
 			tunnel->thread = 0;
 			return NULL;
 		}
@@ -732,17 +732,17 @@ remmina_ssh_tunnel_main_thread_proc (gpointer data)
 				channel_request_x11 (tunnel->x11_channel, TRUE, NULL, ptr,
 						gdk_screen_get_number (gdk_screen_get_default ())))
 		{
-			g_free (ptr);
+			g_free(ptr);
 			remmina_ssh_set_error (REMMINA_SSH (tunnel), "Failed to open channel : %s");
 			tunnel->thread = 0;
 			return NULL;
 		}
-		g_free (ptr);
+		g_free(ptr);
 		if (channel_request_exec (tunnel->x11_channel, tunnel->dest))
 		{
-			ptr = g_strdup_printf (_("Failed to execute %s on SSH server : %%s"), tunnel->dest);
+			ptr = g_strdup_printf(_("Failed to execute %s on SSH server : %%s"), tunnel->dest);
 			remmina_ssh_set_error (REMMINA_SSH (tunnel), ptr);
-			g_free (ptr);
+			g_free(ptr);
 			tunnel->thread = 0;
 			return NULL;
 		}
@@ -1208,10 +1208,10 @@ remmina_ssh_tunnel_free (RemminaSSHTunnel* tunnel)
 	}
 	remmina_ssh_tunnel_close_all_channels (tunnel);
 
-	g_free (tunnel->buffer);
-	g_free (tunnel->channels_out);
-	g_free (tunnel->dest);
-	g_free (tunnel->localdisplay);
+	g_free(tunnel->buffer);
+	g_free(tunnel->channels_out);
+	g_free(tunnel->dest);
+	g_free(tunnel->localdisplay);
 
 	remmina_ssh_free (REMMINA_SSH (tunnel));
 }
@@ -1420,7 +1420,7 @@ remmina_ssh_shell_thread (gpointer data)
 	channel_free (channel);
 	UNLOCK_SSH (shell)
 
-	g_free (buf);
+	g_free(buf);
 	shell->thread = 0;
 
 	if (shell->exit_callback) shell->exit_callback (shell->user_data);
@@ -1484,7 +1484,7 @@ remmina_ssh_shell_free (RemminaSSHShell *shell)
 	close (shell->master);
 	if (shell->exec)
 	{
-		g_free (shell->exec);
+		g_free(shell->exec);
 		shell->exec = NULL;
 	}
 	/* It's not necessary to close shell->slave since the other end (vte) will close it */;
diff --git a/remmina/src/remmina_ssh_plugin.c b/remmina/src/remmina_ssh_plugin.c
index 9f8c1fa2d4..231b6caa11 100644
--- a/remmina/src/remmina_ssh_plugin.c
+++ b/remmina/src/remmina_ssh_plugin.c
@@ -60,9 +60,9 @@ remmina_plugin_ssh_main_thread (gpointer data)
 	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL);
 	CANCEL_ASYNC
 
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 
-	ssh = g_object_get_data (G_OBJECT (gp), "user-data");
+	ssh = g_object_get_data (G_OBJECT(gp), "user-data");
 	if (ssh)
 	{
 		/* Create SSH Shell connection based on existing SSH session */
@@ -138,7 +138,7 @@ remmina_plugin_ssh_on_focus_in (GtkWidget *widget, GdkEventFocus *event, Remmina
 {
 	RemminaPluginSshData *gpdata;
 
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 	gtk_widget_grab_focus (gpdata->vte);
 	return TRUE;
 }
@@ -151,7 +151,7 @@ remmina_plugin_ssh_on_size_allocate (GtkWidget *widget, GtkAllocation *alloc, Re
 
 	if (!gtk_widget_get_mapped (widget)) return FALSE;
 
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 
 	cols = vte_terminal_get_column_count (VTE_TERMINAL (widget));
 	rows = vte_terminal_get_row_count (VTE_TERMINAL (widget));
@@ -166,7 +166,7 @@ remmina_plugin_ssh_set_vte_pref (RemminaProtocolWidget *gp)
 {
 	RemminaPluginSshData *gpdata;
 
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 	if (remmina_pref.vte_font && remmina_pref.vte_font[0])
 	{
 		vte_terminal_set_font_from_string (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_font);
@@ -187,12 +187,12 @@ remmina_plugin_ssh_init (RemminaProtocolWidget *gp)
 	GtkWidget *vte;
 
 	gpdata = g_new0 (RemminaPluginSshData, 1);
-	g_object_set_data_full (G_OBJECT (gp), "plugin-data", gpdata, g_free);
+	g_object_set_data_full (G_OBJECT(gp), "plugin-data", gpdata, g_free);
 
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show(hbox);
-	gtk_container_add (GTK_CONTAINER (gp), hbox);
-	g_signal_connect (G_OBJECT (hbox), "focus-in-event", G_CALLBACK (remmina_plugin_ssh_on_focus_in), gp);
+	gtk_container_add(GTK_CONTAINER (gp), hbox);
+	g_signal_connect(G_OBJECT(hbox), "focus-in-event", G_CALLBACK(remmina_plugin_ssh_on_focus_in), gp);
 
 	vte = vte_terminal_new ();
 	gtk_widget_show(vte);
@@ -201,7 +201,7 @@ remmina_plugin_ssh_init (RemminaProtocolWidget *gp)
 	gtk_box_pack_start (GTK_BOX (hbox), vte, TRUE, TRUE, 0);
 	gpdata->vte = vte;
 	remmina_plugin_ssh_set_vte_pref (gp);
-	g_signal_connect (G_OBJECT (vte), "size-allocate", G_CALLBACK (remmina_plugin_ssh_on_size_allocate), gp);
+	g_signal_connect(G_OBJECT(vte), "size-allocate", G_CALLBACK(remmina_plugin_ssh_on_size_allocate), gp);
 
 	remmina_plugin_service->protocol_plugin_register_hostkey (gp, vte);
 
@@ -215,7 +215,7 @@ remmina_plugin_ssh_open_connection (RemminaProtocolWidget *gp)
 {
 	RemminaPluginSshData *gpdata;
 
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 
 	remmina_plugin_service->protocol_plugin_set_expand (gp, TRUE);
 	remmina_plugin_service->protocol_plugin_set_width (gp, 640);
@@ -240,7 +240,7 @@ remmina_plugin_ssh_close_connection (RemminaProtocolWidget *gp)
 {
 	RemminaPluginSshData *gpdata;
 
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 	if (gpdata->thread)
 	{
 		pthread_cancel (gpdata->thread);
@@ -267,7 +267,7 @@ remmina_plugin_ssh_call_feature (RemminaProtocolWidget *gp, const RemminaProtoco
 {
 	RemminaPluginSshData *gpdata;
 
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
+	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
 	switch (feature->id)
 	{
 		case REMMINA_PROTOCOL_FEATURE_TOOL_SSH: