Merge pull request #8 from doctaweeks/master

GTK2/3 issue + re-enable ssh
FreeRDP · Jan 25, 2012 · e25b1cb · e25b1cb
2 parents 0ba54cb + 8a9fa64
commit e25b1cb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git 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)
 

diff --git 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})

diff --git 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
@@ -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
@@ -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