Merge pull request #1335 from FreeRDP/issue1327

Fixes for issue #1327, optional VTE an SSH

Author: giox069

remmina/src/remmina_pref_dialog.c

@@ -38,7 +38,7 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include "config.h"
-#ifdef HAVE_LIBSSH
+#if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE)
 #include <vte/vte.h>
 #endif
 #include "remmina_public.h"
@@ -346,6 +346,20 @@ static void remmina_pref_dialog_init(void)
 	gchar buf[100];
 	GdkRGBA color;
 
+#if !defined (HAVE_LIBSSH) || !defined (HAVE_LIBVTE)
+	GtkWidget *align;
+#endif
+
+#if !defined (HAVE_LIBVTE)
+	align = GTK_WIDGET(GET_OBJECT("alignment_terminal"));
+	gtk_widget_set_sensitive(align, FALSE);
+#endif
+
+#if !defined (HAVE_LIBSSH)
+	align = GTK_WIDGET(GET_OBJECT("alignment_ssh"));
+	gtk_widget_set_sensitive(align, FALSE);
+#endif
+
 	gtk_dialog_set_default_response(GTK_DIALOG(remmina_pref_dialog->dialog), GTK_RESPONSE_CLOSE);
 
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_remember_last_view_mode), remmina_pref.save_view_mode);
@@ -436,6 +450,7 @@ static void remmina_pref_dialog_init(void)
 	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_color14), &color);
 	gdk_rgba_parse(&color, remmina_pref.color15);
 	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_color15), &color);
+#if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE)
 #if !VTE_CHECK_VERSION(0,38,0)
 	/* Disable color scheme buttons if old version of VTE */
 	gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_cursor), FALSE);
@@ -455,6 +470,7 @@ static void remmina_pref_dialog_init(void)
 	gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color13), FALSE);
 	gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color14), FALSE);
 	gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color15), FALSE);
+#endif
 #endif
 
 	g_snprintf(buf, sizeof(buf), "%i", remmina_pref.vte_lines);
@@ -489,6 +505,7 @@ static void remmina_pref_dialog_init(void)
 GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent)
 {
 	TRACE_CALL("remmina_pref_dialog_new");
+
 	remmina_pref_dialog = g_new0(RemminaPrefDialog, 1);
 	remmina_pref_dialog->priv = g_new0(RemminaPrefDialogPriv, 1);
 
@@ -569,8 +586,10 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent)
 	remmina_pref_dialog->colorbutton_color13 = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_color13"));
 	remmina_pref_dialog->colorbutton_color14 = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_color14"));
 	remmina_pref_dialog->colorbutton_color15 = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_color15"));
+#if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE)
 #if VTE_CHECK_VERSION(0,38,0)
 	remmina_pref_dialog->filechooserbutton_terminal_color_scheme = GTK_FILE_CHOOSER(GET_OBJECT("filechooserbutton_terminal_color_scheme"));
+#endif
 #endif
 
 	/* Connect signals */