From 5760acfbc093600de3c2c91f2f07b3e041f580e0 Mon Sep 17 00:00:00 2001
From: "Daniel M. Weeks" <dan@danweeks.net>
Date: Wed, 25 Jan 2012 13:34:36 -0500
Subject: [PATCH 1/3] cmake: Use correct VTE library version

---
 cmake/FindVTE.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/FindVTE.cmake b/cmake/FindVTE.cmake
index d19d8adc81..eecb6c4854 100644
--- a/cmake/FindVTE.cmake
+++ b/cmake/FindVTE.cmake
@@ -23,7 +23,7 @@ find_path(VTE_INCLUDE_DIR NAMES vte/vte.h
 	HINTS ${PC_VTE_INCLUDEDIR} ${PC_VTE_INCLUDE_DIRS}
 	PATH_SUFFIXES vte-2.90)
 
-find_library(VTE_LIBRARY NAMES vte)
+find_library(VTE_LIBRARY NAMES vte2_90)
 
 include(FindPackageHandleStandardArgs)
 

From 5dcb141506e7f38065936866249bee8e1b2540ad Mon Sep 17 00:00:00 2001
From: "Daniel M. Weeks" <dan@danweeks.net>
Date: Wed, 25 Jan 2012 13:36:22 -0500
Subject: [PATCH 2/3] remmina: fix ssh naming convention

---
 remmina/src/remmina_sftp_client.c | 8 ++++----
 remmina/src/remmina_ssh.c         | 8 ++++----
 remmina/src/remmina_ssh.h         | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/remmina/src/remmina_sftp_client.c b/remmina/src/remmina_sftp_client.c
index a2ae6014e3..592eb7092f 100644
--- a/remmina/src/remmina_sftp_client.c
+++ b/remmina/src/remmina_sftp_client.c
@@ -30,10 +30,10 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#include "remminapublic.h"
-#include "remminapref.h"
-#include "remminassh.h"
-#include "remminasftpclient.h"
+#include "remmina_public.h"
+#include "remmina_pref.h"
+#include "remmina_ssh.h"
+#include "remmina_sftp_client.h"
 
 G_DEFINE_TYPE (RemminaSFTPClient, remmina_sftp_client, REMMINA_TYPE_FTP_CLIENT)
 
diff --git a/remmina/src/remmina_ssh.c b/remmina/src/remmina_ssh.c
index 8ee9674fea..d762a0793e 100644
--- a/remmina/src/remmina_ssh.c
+++ b/remmina/src/remmina_ssh.c
@@ -54,9 +54,9 @@
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
-#include "remminapublic.h"
-#include "remminalog.h"
-#include "remminassh.h"
+#include "remmina_public.h"
+#include "remmina_log.h"
+#include "remmina_ssh.h"
 
 /*************************** SSH Base *********************************/
 
@@ -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);
 }
diff --git a/remmina/src/remmina_ssh.h b/remmina/src/remmina_ssh.h
index eff4a49f35..81e64c1ca0 100644
--- a/remmina/src/remmina_ssh.h
+++ b/remmina/src/remmina_ssh.h
@@ -29,8 +29,8 @@
 #include <libssh/callbacks.h>
 #include <libssh/sftp.h>
 #include <pthread.h>
-#include "remminafile.h"
-#include "remminainitdialog.h"
+#include "remmina_file.h"
+#include "remmina_init_dialog.h"
 
 G_BEGIN_DECLS
 

From 9fdc2a03dac034c4dc5425694c4d01e8622da3f2 Mon Sep 17 00:00:00 2001
From: "Daniel M. Weeks" <dan@danweeks.net>
Date: Wed, 25 Jan 2012 13:37:01 -0500
Subject: [PATCH 3/3] cmake: re-enable libssh

---
 remmina/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/remmina/CMakeLists.txt b/remmina/CMakeLists.txt
index 6e2640fbbc..26790cf567 100644
--- a/remmina/CMakeLists.txt
+++ b/remmina/CMakeLists.txt
@@ -93,12 +93,12 @@ add_executable(remmina ${REMMINA_SRCS})
 include_directories(${GTK3_INCLUDE_DIRS})
 target_link_libraries(remmina ${GTK3_LIBRARIES})
 
-#find_suggested_package(LIBSSH)
-#if(LIBSSH_FOUND)
-#	add_definitions(-DHAVE_LIBSSH)
-#	include_directories(${LIBSSH_INCLUDE_DIRS})
-#	target_link_libraries(remmina ${LIBSSH_LIBRARIES})
-#endif()
+find_suggested_package(LIBSSH)
+if(LIBSSH_FOUND)
+	add_definitions(-DHAVE_LIBSSH)
+	include_directories(${LIBSSH_INCLUDE_DIRS})
+	target_link_libraries(remmina ${LIBSSH_LIBRARIES})
+endif()
 
 if(GCRYPT_FOUND)
 	include_directories(${GCRYPT_INCLUDE_DIRS})