Merge pull request #734 from FreeRDP/survey

Added user survey, community links and fixed all deprecations warnings

.gitignore

@@ -1,53 +1,52 @@
 *.a
-*.o
-*.lo
+*.glade#
+*.gmo
 *.la
-*.so
+*.lo
 *.mo
-*.gmo
+*.o
+*.pc
+*.so
 *.swp
 *.tar.gz
+*/po/Makefile.in.in
+*/po/POTFILES
+*/po/stamp-it
 *~
-*.pc
-*.glade#
+.cproject
 .deps
+.intltool-merge-cache
 .libs
-autom4te.cache
+.project
+.settings
+CMakeFiles
+CMakeCache.txt
 Makefile
 Makefile.in
-aclocal.m4
 _configs.sed
+aclocal.m4
+autom4te.cache
+build
+cmake_install.cmake
+cmake_uninstall.cmake
+config.guess
 config.h
 config.log
 config.status
-config.guess
 config.sub
 configure
 depcomp
 install-sh
+install_manifest.txt
 libtool
-.intltool-merge-cache
+ltmain.sh
 missing
+rfbint.h
 stamp-h1
-ltmain.sh
-*/po/Makefile.in.in
-*/po/POTFILES
-*/po/stamp-it
+tags
 
-.project
-.cproject
-.settings
-
-CMakeFiles
-CMakeCache.txt
-cmake_install.cmake
-install_manifest.txt
-cmake_uninstall.cmake
-
-remmina/remmina
-
-rfbint.h
-remmina/src/remmina
-remmina/desktop/remmina.desktop
 remmina-plugins/libvncserver/rfb/rfbconfig.h
 remmina-plugins/telepathy/org.freedesktop.Telepathy.Client.Remmina.service
+remmina/desktop/remmina.desktop
+remmina/remmina
+remmina/src/remmina

CMakeLists.txt

@@ -102,11 +102,19 @@ set(REMMINA_VERSION_REVISION "0")
 set(REMMINA_VERSION_SUFFIX "rcgit.8")
 set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}-${REMMINA_VERSION_SUFFIX}")
 
+include(GetGitRevisionDescription)
+git_get_exact_tag(GIT_REVISION --tags --always)
+if (${GIT_REVISION} STREQUAL "n/a")
+  git_rev_parse(GIT_REVISION --short)
+endif()
+message(STATUS "Git Revision ${GIT_REVISION}")
+
 set(REMMINA_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}")
 set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_FULL_DATADIR}/locale")
 set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/remmina/plugins")
 set(REMMINA_UIDIR "${CMAKE_INSTALL_FULL_DATADIR}/remmina/ui")
 
+
 # Uninstall support
 configure_file(
 	"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
@@ -120,6 +128,9 @@ find_required_package(PTHREAD)
 find_suggested_package(GCRYPT)
 find_suggested_package(AVAHI)
 
+# Survey URI
+set(REMMINA_SURVEY_URI "http://www.remmina.org/survey/survey.tpl")
+
 if(WITH_TRACE_CALLS)
 	message(STATUS "Enabling trace calls.")
 	add_definitions(-DWITH_TRACE_CALLS)

cmake/GetGitRevisionDescription.cmake

@@ -0,0 +1,135 @@
+# - Returns a version string from Git
+#
+# These functions force a re-configure on each git commit so that you can
+# trust the values of the variables in your build system.
+#
+#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
+#
+# Returns the refspec and sha hash of the current head revision
+#
+#  git_describe(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe on the source tree, and adjusting
+# the output so that it tests false if an error occurs.
+#
+#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe --exact-match on the source tree,
+# and adjusting the output so that it tests false if there was no exact
+# matching tag.
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <[email protected]> <[email protected]>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__get_git_revision_description)
+	return()
+endif()
+set(__get_git_revision_description YES)
+
+# We must run the following at "include" time, not at function call time,
+# to find the path to this module rather than the path to a calling list file
+get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+function(get_git_head_revision _refspecvar _hashvar)
+
+	set(GIT_PARENT_DIR "${CMAKE_SOURCE_DIR}")
+	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
+		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
+		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
+		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
+			# We have reached the root directory, we are not in git
+			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+			return()
+		endif()
+		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+	endwhile()
+	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+	if(NOT EXISTS "${GIT_DATA}")
+		file(MAKE_DIRECTORY "${GIT_DATA}")
+	endif()
+
+	if(NOT EXISTS "${GIT_DIR}/HEAD")
+		return()
+	endif()
+	set(HEAD_FILE "${GIT_DATA}/HEAD")
+	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
+
+	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+		"${GIT_DATA}/grabRef.cmake"
+		@ONLY)
+	include("${GIT_DATA}/grabRef.cmake")
+
+	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
+	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
+endfunction()
+
+function(git_rev_parse _var)
+	if(NOT GIT_FOUND)
+		find_package(Git QUIET)
+	endif()
+	if(NOT GIT_FOUND)
+		set(${_var} "n/a" PARENT_SCOPE)
+		return()
+	endif()
+	get_git_head_revision(refspec hash)
+	if(NOT hash)
+		set(${_var} "n/a" PARENT_SCOPE)
+		return()
+	endif()
+
+	execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse ${ARGN} ${hash}
+		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+		RESULT_VARIABLE res
+		OUTPUT_VARIABLE out
+		ERROR_QUIET
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	if(NOT res EQUAL 0)
+		set(out "n/a")
+	endif()
+
+	set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
+
+
+function(git_describe _var)
+	if(NOT GIT_FOUND)
+		find_package(Git QUIET)
+	endif()
+	if(NOT GIT_FOUND)
+		set(${_var} "n/a" PARENT_SCOPE)
+		return()
+	endif()
+	get_git_head_revision(refspec hash)
+	if(NOT hash)
+		set(${_var} "n/a" PARENT_SCOPE)
+		return()
+	endif()
+
+	execute_process(COMMAND "${GIT_EXECUTABLE}" describe ${hash} ${ARGN}
+		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+		RESULT_VARIABLE res
+		OUTPUT_VARIABLE out
+		ERROR_QUIET
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	if(NOT res EQUAL 0)
+		set(out "n/a")
+	endif()
+
+	set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
+
+function(git_get_exact_tag _var)
+	git_describe(out --exact-match ${ARGN})
+	set(${_var} "${out}" PARENT_SCOPE)
+endfunction()

cmake/GetGitRevisionDescription.cmake.in

@@ -0,0 +1,38 @@
+# 
+# Internal file for GetGitRevisionDescription.cmake
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <[email protected]> <[email protected]>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+set(HEAD_HASH)
+
+file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
+
+string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
+if(HEAD_CONTENTS MATCHES "ref")
+	# named branch
+	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+	elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
+		configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+		set(HEAD_HASH "${HEAD_REF}")
+	endif()
+else()
+	# detached HEAD
+	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+endif()
+
+if(NOT HEAD_HASH)
+	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+	string(STRIP "${HEAD_HASH}" HEAD_HASH)
+endif()

config.h.in

@@ -16,11 +16,15 @@
 
 #define remmina			"remmina"
 #define VERSION			"${REMMINA_VERSION}"
+#define GIT_REVISION		"${GIT_REVISION}"
+
 #define GETTEXT_PACKAGE		remmina
 
 #define REMMINA_DATADIR		"${REMMINA_DATADIR}"
 #define REMMINA_LOCALEDIR	"${REMMINA_LOCALEDIR}"
 #define REMMINA_PLUGINDIR	"${REMMINA_PLUGINDIR}"
 #define REMMINA_UIDIR		"${REMMINA_UIDIR}"
 
+#define REMMINA_SURVEY_URI	"${REMMINA_SURVEY_URI}"
+
 #endif

remmina-plugins/nx/nx_session.c

@@ -281,17 +281,23 @@ static gboolean remmina_nx_session_get_response(RemminaNXSession *nx)
 	if (is_stderr > 1)
 		return FALSE;
 
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 	buffer = buffer_new();
 	len = channel_read_buffer(nx->channel, buffer, len, is_stderr);
+	G_GNUC_END_IGNORE_DEPRECATIONS
 	if (len <= 0) {
 		remmina_nx_session_set_application_error(nx, "Channel closed.");
 		return FALSE;
 	}
 	if (len > 0) {
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		g_string_append_len(nx->response, (const gchar*) buffer_get(buffer), len);
+		G_GNUC_END_IGNORE_DEPRECATIONS
 	}
 
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 	buffer_free(buffer);
+	G_GNUC_END_IGNORE_DEPRECATIONS
 	return TRUE;
 }
 
@@ -826,7 +832,9 @@ static gpointer remmina_nx_session_tunnel_main_thread(gpointer data)
 			else if (len > 0) {
 				for (ptr = buffer, lenw = 0; len > 0; len -= lenw, ptr += lenw) {
 					ssh_set_fd_towrite(nx->session);
+					G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 					lenw = channel_write(channels[0], (char*) ptr, len);
+					G_GNUC_END_IGNORE_DEPRECATIONS
 					if (lenw <= 0) {
 						nx->running = FALSE;
 						break;
@@ -839,7 +847,9 @@ static gpointer remmina_nx_session_tunnel_main_thread(gpointer data)
 			break;
 
 		if (channels_out[0] && socketbuffer_len <= 0) {
+			G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 			len = channel_read_nonblocking(channels_out[0], socketbuffer, sizeof(socketbuffer), 0);
+			G_GNUC_END_IGNORE_DEPRECATIONS
 			if (len == SSH_ERROR || len == SSH_EOF) {
 				nx->running = FALSE;
 				break;
@@ -848,7 +858,9 @@ static gpointer remmina_nx_session_tunnel_main_thread(gpointer data)
 				socketbuffer_len = len;
 			} else {
 				/* Clean up the stderr buffer in case FreeNX send something there */
+				G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 				len = channel_read_nonblocking(channels_out[0], buffer, sizeof(buffer), 1);
+				G_GNUC_END_IGNORE_DEPRECATIONS
 			}
 		}
 

remmina-plugins/rdp/rdp_plugin.c

@@ -922,7 +922,7 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget* gp)
 			switch(e) {
 				case FREERDP_ERROR_AUTHENTICATION_FAILED:
 					remmina_plugin_service->protocol_plugin_set_error(gp, _("Authentication to RDP server %s failed.\nCheck username, password and domain."),
-						rfi->settings->ServerHostname );
+							rfi->settings->ServerHostname );
 					// Invalidate the saved password, so the user will be re-asked at next logon
 					remmina_plugin_service->file_unsave_password(remminafile);
 					break;

remmina-plugins/rdp/rdp_plugin.h

@@ -164,8 +164,6 @@ struct rf_context
 	GAsyncQueue* ui_queue;
 	guint ui_handler;
 
-
-
 	GArray* pressed_keys;
 	GAsyncQueue* event_queue;
 	gint event_pipe[2];

remmina/CMakeLists.txt

@@ -101,6 +101,8 @@ set(REMMINA_SRCS
 	src/remmina_string_array.h
 	src/remmina_string_list.c
 	src/remmina_string_list.h
+	src/remmina_survey.c
+	src/remmina_survey.h
 	src/remmina_widget_pool.c
 	src/remmina_widget_pool.h
 	src/remmina_external_tools.c
@@ -114,6 +116,10 @@ add_executable(remmina ${REMMINA_SRCS})
 include_directories(${GTK_INCLUDE_DIRS})
 target_link_libraries(remmina ${GTK_LIBRARIES})
 
+pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
+target_link_libraries(remmina ${WEBKIT_LIBRARIES})
+include_directories(${WEBKIT_INCLUDE_DIRS})
+
 find_package(X11)
 include_directories(${X11_INCLUDE_DIR})
 target_link_libraries(remmina ${X11_LIBRARIES})