Merge lp:~noskcaj/ubuntu/vivid/remmina/1.1.2 into lp:ubuntu/vivid/remmina

[Jackson Doak]

Merge from debian

[Marc Deslauriers (mdeslaur)]

Thanks for this merge, I do have a few comments though:

1- Why did you drop debian/docs?
2- Could you please remove indicator_set_title.patch if it's not being applied?
3- Please document the switch to libvte-2.91-dev in the changelog.

Thanks!

review: Needs Fixing

Unmerged revisions

28. By Jackson Doak on 2014-12-20

* Merge with Debian, remaining changes:
  + debian/control:
    - Build-depend on libappindicator3-dev, intltool
  + debian/rules:
    - Build with libappindicator
    - Call intltool-update on build
  + debian/patches/translations.patch,
    - Make translatable and add keywords.
* Drop vte-2.91.patch. Fixed upstream
* New upstream release.
  - Drop RDP_certificate_crash.patch, already available upstream.
  - Fix bugs with plugins using GtkSocket.
* debian/patches/RDP_certificate_crash.patch:
  - Cherry-pick patches from upstream to fix a crash when not
    accepting certificate for RDP server (Closes: #766671).

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-11-07 16:17:53 +0000
+++ .pc/applied-patches	2014-12-20 01:21:24 +0000
@@ -1,3 +1,2 @@
 translations.patch
 external_tools.patch
-vte-2.91.patch

=== modified file '.pc/external_tools.patch/remmina/CMakeLists.txt'
--- .pc/external_tools.patch/remmina/CMakeLists.txt	2014-09-29 08:11:58 +0000
+++ .pc/external_tools.patch/remmina/CMakeLists.txt	2014-12-20 01:21:24 +0000
@@ -137,17 +137,26 @@
 	target_link_libraries(remmina ${AVAHI_LIBRARIES})
 endif()
 
-if(GTK3_FOUND)
-	set(_VTE_VERSION_NUM 2.90)
-else()
+option(WITH_VTE "Build with support for VTE" ON)
+if(GTK3_FOUND AND WITH_VTE)
+	set(_VTE_VERSION_NUMS 2.91 2.90)
+	foreach(__VTE_VERSION ${_VTE_VERSION_NUMS})
+		set(_VTE_VERSION_NUM ${__VTE_VERSION})
+		find_package(VTE)
+		if(VTE_FOUND)
+			break()
+		endif()
+		message(STATUS "VTE ${__VTE_VERSION} not found")
+	endforeach(__VTE_VERSION)
+elseif(WITH_VTE)
 	set(_VTE_VERSION_NUM)
+	find_package(VTE)
 endif()
 
-find_suggested_package(VTE _VTE_VERSION_NUM)
-if(VTE_FOUND)
-	add_definitions(-DHAVE_LIBVTE)
-	include_directories(${VTE_INCLUDE_DIRS})
-	target_link_libraries(remmina ${VTE_LIBRARIES})
+if (VTE_FOUND)
+        add_definitions(-DHAVE_LIBVTE)
+        include_directories(${VTE_INCLUDE_DIRS})
+        target_link_libraries(remmina ${VTE_LIBRARIES})
 endif()
 
 if(GTK3_FOUND)

=== removed directory '.pc/vte-2.91.patch'
=== removed directory '.pc/vte-2.91.patch/cmake'
=== removed file '.pc/vte-2.91.patch/cmake/FindVTE.cmake'
--- .pc/vte-2.91.patch/cmake/FindVTE.cmake	2014-11-07 16:17:53 +0000
+++ .pc/vte-2.91.patch/cmake/FindVTE.cmake	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-# Remmina - The GTK+ Remote Desktop Client
-#
-# Copyright (C) 2011 Marc-Andre Moreau
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, 
-# Boston, MA 02111-1307, USA.
-
-if(NOT _VTE_VERSION_NUM)
-	set(_VTE_LIB_NAME vte)
-	set(_VTE_VERSION vte)
-else()
-	set(_VTE_LIB_NAME vte${_VTE_VERSION_NUM})
-	set(_VTE_VERSION vte-${_VTE_VERSION_NUM})
-endif()
-
-string(REPLACE . _ _VTE_LIB_NAME ${_VTE_LIB_NAME})
-
-pkg_check_modules(PC_VTE ${_VTE_VERSION})
-
-find_path(VTE_INCLUDE_DIR NAMES vte/vte.h
-	HINTS ${PC_VTE_INCLUDEDIR} ${PC_VTE_INCLUDE_DIRS}
-	PATH_SUFFIXES ${_VTE_VERSION})
-
-find_library(VTE_LIBRARY NAMES ${_VTE_LIB_NAME})
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(VTE DEFAULT_MSG VTE_LIBRARY VTE_INCLUDE_DIR)
-
-set(VTE_LIBRARIES ${VTE_LIBRARY})
-set(VTE_INCLUDE_DIRS ${VTE_INCLUDE_DIR})
-
-mark_as_advanced(VTE_INCLUDE_DIR VTE_LIBRARY)
-

=== removed directory '.pc/vte-2.91.patch/remmina'
=== removed file '.pc/vte-2.91.patch/remmina/CMakeLists.txt'
--- .pc/vte-2.91.patch/remmina/CMakeLists.txt	2014-11-07 16:17:53 +0000
+++ .pc/vte-2.91.patch/remmina/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-# src/remmina - The GTK+ Remote Desktop Client
-#
-# Copyright (C) 2011 Marc-Andre Moreau
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, 
-# Boston, MA 02111-1307, USA.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL. If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so. If you
-# do not wish to do so, delete this exception statement from your
-# version. If you delete this exception statement from all source
-# files in the program, then also delete it here.
-
-
-cmake_minimum_required(VERSION 2.8)
-
-set(REMMINA_SRCS
-	src/remmina_about.c
-	src/remmina_about.h
-	src/remmina_applet_menu.c
-	src/remmina_applet_menu.h
-	src/remmina_applet_menu_item.c
-	src/remmina_applet_menu_item.h
-	src/remmina_avahi.c
-	src/remmina_avahi.h
-	src/remmina.c
-	src/remmina_chain_button.c
-	src/remmina_chain_button.h
-	src/remmina_chat_window.c
-	src/remmina_chat_window.h
-	src/remmina_connection_window.c
-	src/remmina_connection_window.h
-	src/remmina_crypt.c
-	src/remmina_crypt.h
-	src/remmina_exec.c
-	src/remmina_exec.h
-	src/remmina_file.c
-	src/remmina_file_editor.c
-	src/remmina_file_editor.h
-	src/remmina_file.h
-	src/remmina_file_manager.c
-	src/remmina_file_manager.h
-	src/remmina_ftp_client.c
-	src/remmina_ftp_client.h
-	src/remmina_icon.c
-	src/remmina_icon.h
-	src/remmina_init_dialog.c
-	src/remmina_init_dialog.h
-	src/remmina_key_chooser.c
-	src/remmina_key_chooser.h
-	src/remmina_log.c
-	src/remmina_log.h
-	src/remmina_main.c
-	src/remmina_main.h
-	src/remmina_marshals.c
-	src/remmina_marshals.h
-	src/remmina_marshals.list
-	src/remmina_plugin_manager.c
-	src/remmina_plugin_manager.h
-	src/remmina_pref.c
-	src/remmina_pref_dialog.c
-	src/remmina_pref_dialog.h
-	src/remmina_pref.h
-	src/remmina_protocol_widget.c
-	src/remmina_protocol_widget.h
-	src/remmina_public.c
-	src/remmina_public.h
-	src/remmina_scaler.c
-	src/remmina_scaler.h
-	src/remmina_scrolled_viewport.c
-	src/remmina_scrolled_viewport.h
-	src/remmina_sftp_client.c
-	src/remmina_sftp_client.h
-	src/remmina_sftp_plugin.c
-	src/remmina_sftp_plugin.h
-	src/remmina_ssh.c
-	src/remmina_ssh.h
-	src/remmina_ssh_plugin.c
-	src/remmina_ssh_plugin.h
-	src/remmina_string_array.c
-	src/remmina_string_array.h
-	src/remmina_string_list.c
-	src/remmina_string_list.h
-	src/remmina_widget_pool.c
-	src/remmina_widget_pool.h
-	src/remmina_external_tools.c
-	src/remmina_external_tools.h
-	)
-
-add_executable(remmina ${REMMINA_SRCS})
-
-include_directories(${GTK_INCLUDE_DIRS})
-target_link_libraries(remmina ${GTK_LIBRARIES})
-
-find_package(X11)
-include_directories(${X11_INCLUDE_DIR})
-target_link_libraries(remmina ${X11_LIBRARIES})
-
-find_suggested_package(LIBSSH)
-if(LIBSSH_FOUND)
-	add_definitions(-DHAVE_LIBSSH)
-	include_directories(${LIBSSH_INCLUDE_DIRS})
-	target_link_libraries(remmina ${LIBSSH_LIBRARIES})
-endif()
-
-if(PTHREAD_FOUND)
-	include_directories(${PTHREAD_INCLUDE_DIRS})
-	target_link_libraries(remmina ${PTHREAD_LIBRARIES})
-endif()
-
-if(GCRYPT_FOUND)
-	include_directories(${GCRYPT_INCLUDE_DIRS})
-	target_link_libraries(remmina ${GCRYPT_LIBRARIES})
-endif()
-
-if(AVAHI_FOUND)
-	include_directories(${AVAHI_INCLUDE_DIRS})
-	target_link_libraries(remmina ${AVAHI_LIBRARIES})
-endif()
-
-if(GTK3_FOUND)
-	set(_VTE_VERSION_NUM 2.90)
-else()
-	set(_VTE_VERSION_NUM)
-endif()
-
-find_suggested_package(VTE _VTE_VERSION_NUM)
-if(VTE_FOUND)
-	add_definitions(-DHAVE_LIBVTE)
-	include_directories(${VTE_INCLUDE_DIRS})
-	target_link_libraries(remmina ${VTE_LIBRARIES})
-endif()
-
-if(GTK3_FOUND)
-	find_suggested_package(APPINDICATOR)
-	if(APPINDICATOR_FOUND)
-		add_definitions(-DHAVE_LIBAPPINDICATOR)
-		include_directories(${APPINDICATOR_INCLUDE_DIRS})
-		target_link_libraries(remmina ${APPINDICATOR_LIBRARIES})
-	endif()
-endif()
-
-if(WITH_TRANSLATIONS)
-	add_subdirectory(po)
-endif()
-add_subdirectory(icons)
-add_subdirectory(desktop)
-
-install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina.pc.in ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-

=== removed directory '.pc/vte-2.91.patch/remmina/src'
=== removed file '.pc/vte-2.91.patch/remmina/src/remmina_ssh_plugin.c'
--- .pc/vte-2.91.patch/remmina/src/remmina_ssh_plugin.c	2014-11-07 16:17:53 +0000
+++ .pc/vte-2.91.patch/remmina/src/remmina_ssh_plugin.c	1970-01-01 00:00:00 +0000
@@ -1,364 +0,0 @@
-/*
- * Remmina - The GTK+ Remote Desktop Client
- * Copyright (C) 2010-2011 Vic Lee
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, 
- * Boston, MA 02111-1307, USA.
- *
- *  In addition, as a special exception, the copyright holders give
- *  permission to link the code of portions of this program with the
- *  OpenSSL library under certain conditions as described in each
- *  individual source file, and distribute linked combinations
- *  including the two.
- *  You must obey the GNU General Public License in all respects
- *  for all of the code used other than OpenSSL. *  If you modify
- *  file(s) with this exception, you may extend this exception to your
- *  version of the file(s), but you are not obligated to do so. *  If you
- *  do not wish to do so, delete this exception statement from your
- *  version. *  If you delete this exception statement from all source
- *  files in the program, then also delete it here.
- *
- */
-
-#include "config.h"
-
-#if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE)
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <vte/vte.h>
-#include "remmina_public.h"
-#include "remmina_plugin_manager.h"
-#include "remmina_ssh.h"
-#include "remmina_protocol_widget.h"
-#include "remmina_pref.h"
-#include "remmina_ssh_plugin.h"
-
-#define REMMINA_PLUGIN_SSH_FEATURE_TOOL_COPY  1
-#define REMMINA_PLUGIN_SSH_FEATURE_TOOL_PASTE 2
-
-/***** The SSH plugin implementation *****/
-typedef struct _RemminaPluginSshData
-{
-	RemminaSSHShell *shell;
-	GtkWidget *vte;
-	pthread_t thread;
-}RemminaPluginSshData;
-
-static RemminaPluginService *remmina_plugin_service = NULL;
-
-static gpointer
-remmina_plugin_ssh_main_thread (gpointer data)
-{
-	RemminaProtocolWidget *gp = (RemminaProtocolWidget*) data;
-	RemminaPluginSshData *gpdata;
-	RemminaFile *remminafile;
-	RemminaSSH *ssh;
-	RemminaSSHShell *shell = NULL;
-	gboolean cont = FALSE;
-	gint ret;
-	gchar *charset;
-
-	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL);
-	CANCEL_ASYNC
-
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
-
-	ssh = g_object_get_data (G_OBJECT(gp), "user-data");
-	if (ssh)
-	{
-		/* Create SSH Shell connection based on existing SSH session */
-		shell = remmina_ssh_shell_new_from_ssh (ssh);
-		if (remmina_ssh_init_session (REMMINA_SSH (shell)) &&
-				remmina_ssh_auth (REMMINA_SSH (shell), NULL) > 0 &&
-				remmina_ssh_shell_open (shell, (RemminaSSHExitFunc) remmina_plugin_service->protocol_plugin_close_connection, gp))
-		{
-			cont = TRUE;
-		}
-	}
-	else
-	{
-		/* New SSH Shell connection */
-		remminafile = remmina_plugin_service->protocol_plugin_get_file (gp);
-		remmina_plugin_service->file_set_string (remminafile, "ssh_server",
-				remmina_plugin_service->file_get_string (remminafile, "server"));
-
-		shell = remmina_ssh_shell_new_from_file (remminafile);
-		while (1)
-		{
-			if (!remmina_ssh_init_session (REMMINA_SSH (shell)))
-			{
-				remmina_plugin_service->protocol_plugin_set_error (gp, "%s", REMMINA_SSH (shell)->error);
-				break;
-			}
-
-			ret = remmina_ssh_auth_gui (REMMINA_SSH (shell),
-					REMMINA_INIT_DIALOG (remmina_protocol_widget_get_init_dialog (gp)), TRUE);
-			if (ret == 0)
-			{
-				remmina_plugin_service->protocol_plugin_set_error (gp, "%s", REMMINA_SSH (shell)->error);
-			}
-			if (ret <= 0) break;
-
-			if (!remmina_ssh_shell_open (shell, (RemminaSSHExitFunc) remmina_plugin_service->protocol_plugin_close_connection, gp))
-			{
-				remmina_plugin_service->protocol_plugin_set_error (gp, "%s", REMMINA_SSH (shell)->error);
-				break;
-			}
-
-			cont = TRUE;
-			break;
-		}
-	}
-	if (!cont)
-	{
-		if (shell) remmina_ssh_shell_free (shell);
-		IDLE_ADD ((GSourceFunc) remmina_plugin_service->protocol_plugin_close_connection, gp);
-		return NULL;
-	}
-
-	gpdata->shell = shell;
-
-	charset = REMMINA_SSH (shell)->charset;
-
-	THREADS_ENTER
-	if (charset && charset[0] != '\0')
-	{
-		vte_terminal_set_encoding (VTE_TERMINAL (gpdata->vte), charset);
-	}
-	vte_terminal_set_pty (VTE_TERMINAL (gpdata->vte), shell->slave);
-	THREADS_LEAVE
-
-	remmina_plugin_service->protocol_plugin_emit_signal (gp, "connect");
-
-	gpdata->thread = 0;
-	return NULL;
-}
-
-static gboolean
-remmina_plugin_ssh_on_focus_in (GtkWidget *widget, GdkEventFocus *event, RemminaProtocolWidget *gp)
-{
-	RemminaPluginSshData *gpdata;
-
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
-	gtk_widget_grab_focus (gpdata->vte);
-	return TRUE;
-}
-
-static gboolean
-remmina_plugin_ssh_on_size_allocate (GtkWidget *widget, GtkAllocation *alloc, RemminaProtocolWidget *gp)
-{
-	RemminaPluginSshData *gpdata;
-	gint cols, rows;
-
-	if (!gtk_widget_get_mapped (widget)) return FALSE;
-
-	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));
-
-	remmina_ssh_shell_set_size (gpdata->shell, cols, rows);
-
-	return FALSE;
-}
-
-static void
-remmina_plugin_ssh_set_vte_pref (RemminaProtocolWidget *gp)
-{
-	RemminaPluginSshData *gpdata;
-
-	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);
-	}
-	vte_terminal_set_allow_bold (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_allow_bold_text);
-	if (remmina_pref.vte_lines > 0)
-	{
-		vte_terminal_set_scrollback_lines (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_lines);
-	}
-}
-
-static void
-remmina_plugin_ssh_init (RemminaProtocolWidget *gp)
-{
-	RemminaPluginSshData *gpdata;
-	GtkWidget *hbox;
-	GtkWidget *vscrollbar;
-	GtkWidget *vte;
-
-	gpdata = g_new0 (RemminaPluginSshData, 1);
-	g_object_set_data_full (G_OBJECT(gp), "plugin-data", gpdata, g_free);
-
-#if GTK_VERSION == 3
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#elif GTK_VERSION == 2
-	hbox = gtk_hbox_new (FALSE, 0);
-#endif
-	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);
-
-	vte = vte_terminal_new ();
-	gtk_widget_show(vte);
-	vte_terminal_set_size (VTE_TERMINAL (vte), 80, 25);
-	vte_terminal_set_scroll_on_keystroke (VTE_TERMINAL (vte), TRUE);
-	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);
-
-	remmina_plugin_service->protocol_plugin_register_hostkey (gp, vte);
-
-#if GTK_VERSION == 3
-	vscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, vte_terminal_get_adjustment (VTE_TERMINAL (vte)));
-#elif GTK_VERSION == 2
-	vscrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment (VTE_TERMINAL (vte)));
-#endif
-	gtk_widget_show(vscrollbar);
-	gtk_box_pack_start (GTK_BOX (hbox), vscrollbar, FALSE, TRUE, 0);
-}
-
-static gboolean
-remmina_plugin_ssh_open_connection (RemminaProtocolWidget *gp)
-{
-	RemminaPluginSshData *gpdata;
-
-	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);
-	remmina_plugin_service->protocol_plugin_set_height (gp, 480);
-
-	if (pthread_create (&gpdata->thread, NULL, remmina_plugin_ssh_main_thread, gp))
-	{
-		remmina_plugin_service->protocol_plugin_set_error (gp,
-				"Failed to initialize pthread. Falling back to non-thread mode...");
-		gpdata->thread = 0;
-		return FALSE;
-	}
-	else
-	{
-		return TRUE;
-	}
-	return TRUE;
-}
-
-static gboolean
-remmina_plugin_ssh_close_connection (RemminaProtocolWidget *gp)
-{
-	RemminaPluginSshData *gpdata;
-
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
-	if (gpdata->thread)
-	{
-		pthread_cancel (gpdata->thread);
-		if (gpdata->thread) pthread_join (gpdata->thread, NULL);
-	}
-	if (gpdata->shell)
-	{
-		remmina_ssh_shell_free (gpdata->shell);
-		gpdata->shell = NULL;
-	}
-
-	remmina_plugin_service->protocol_plugin_emit_signal (gp, "disconnect");
-	return FALSE;
-}
-
-static gboolean
-remmina_plugin_ssh_query_feature (RemminaProtocolWidget *gp, const RemminaProtocolFeature *feature)
-{
-	return TRUE;
-}
-
-static void
-remmina_plugin_ssh_call_feature (RemminaProtocolWidget *gp, const RemminaProtocolFeature *feature)
-{
-	RemminaPluginSshData *gpdata;
-
-	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
-	switch (feature->id)
-	{
-		case REMMINA_PROTOCOL_FEATURE_TOOL_SSH:
-		remmina_plugin_service->open_connection (
-				remmina_file_dup_temp_protocol (remmina_plugin_service->protocol_plugin_get_file (gp), "SSH"),
-				NULL, gpdata->shell, NULL);
-		return;
-		case REMMINA_PROTOCOL_FEATURE_TOOL_SFTP:
-		remmina_plugin_service->open_connection (
-				remmina_file_dup_temp_protocol (remmina_plugin_service->protocol_plugin_get_file (gp), "SFTP"),
-				NULL, gpdata->shell, NULL);
-		return;
-		case REMMINA_PLUGIN_SSH_FEATURE_TOOL_COPY:
-		vte_terminal_copy_clipboard (VTE_TERMINAL (gpdata->vte));
-		return;
-		case REMMINA_PLUGIN_SSH_FEATURE_TOOL_PASTE:
-		vte_terminal_paste_clipboard (VTE_TERMINAL (gpdata->vte));
-		return;
-	}
-}
-
-static RemminaProtocolFeature remmina_plugin_ssh_features[] =
-{
-	{	REMMINA_PROTOCOL_FEATURE_TYPE_TOOL, REMMINA_PLUGIN_SSH_FEATURE_TOOL_COPY, N_("Copy"), GTK_STOCK_COPY, NULL},
-	{	REMMINA_PROTOCOL_FEATURE_TYPE_TOOL, REMMINA_PLUGIN_SSH_FEATURE_TOOL_PASTE, N_("Paste"), GTK_STOCK_PASTE, NULL},
-	{	REMMINA_PROTOCOL_FEATURE_TYPE_END, 0, NULL, NULL, NULL}
-};
-
-static RemminaProtocolPlugin remmina_plugin_ssh =
-{
-	REMMINA_PLUGIN_TYPE_PROTOCOL,
-	"SSH",
-	N_("SSH - Secure Shell"),
-	GETTEXT_PACKAGE,
-	VERSION,
-
-	"utilities-terminal",
-	"utilities-terminal",
-	NULL,
-	NULL,
-	REMMINA_PROTOCOL_SSH_SETTING_SSH,
-	remmina_plugin_ssh_features,
-
-	remmina_plugin_ssh_init,
-	remmina_plugin_ssh_open_connection,
-	remmina_plugin_ssh_close_connection,
-	remmina_plugin_ssh_query_feature,
-	remmina_plugin_ssh_call_feature
-};
-
-void
-remmina_ssh_plugin_register (void)
-{
-	remmina_plugin_ssh_features[0].opt3 = GUINT_TO_POINTER (remmina_pref.vte_shortcutkey_copy);
-	remmina_plugin_ssh_features[1].opt3 = GUINT_TO_POINTER (remmina_pref.vte_shortcutkey_paste);
-
-	remmina_plugin_service = &remmina_plugin_manager_service;
-	remmina_plugin_service->register_plugin ((RemminaPlugin *) &remmina_plugin_ssh);
-
-	ssh_threads_set_callbacks(ssh_threads_get_pthread());
-	ssh_init();
-
-}
-
-#else
-
-void remmina_ssh_plugin_register(void)
-{
-}
-
-#endif
-

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-11-07 16:17:53 +0000
+++ CMakeLists.txt	2014-12-20 01:21:24 +0000
@@ -94,7 +94,7 @@
 set(WITH_LIBRARY_VERSIONING "ON")
 set(REMMINA_VERSION_MAJOR "1")
 set(REMMINA_VERSION_MINOR "1")
-set(REMMINA_VERSION_REVISION "0")
+set(REMMINA_VERSION_REVISION "2")
 #^set(REMMINA_VERSION_SUFFIX "")
 set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}")
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-07 16:17:53 +0000
+++ debian/changelog	2014-12-20 01:21:24 +0000
@@ -1,3 +1,34 @@
+remmina (1.1.2-1ubuntu1) vivid; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    + debian/control:
+      - Build-depend on libappindicator3-dev, intltool
+    + debian/rules:
+      - Build with libappindicator
+      - Call intltool-update on build
+    + debian/patches/translations.patch,
+      - Make translatable and add keywords.
+  * Drop vte-2.91.patch. Fixed upstream
+
+ -- Jackson Doak <[e-mail]>  Sat, 20 Dec 2014 12:15:44 +1100
+
+remmina (1.1.2-1) experimental; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * New upstream release.
+    - Drop RDP_certificate_crash.patch, already available upstream.
+    - Fix bugs with plugins using GtkSocket.
+
+ -- Luca Falavigna <[e-mail]>  Fri, 19 Dec 2014 09:08:46 +0100
+
+remmina (1.1.1-2) unstable; urgency=medium
+
+  * debian/patches/RDP_certificate_crash.patch:
+    - Cherry-pick patches from upstream to fix a crash when not
+      accepting certificate for RDP server (Closes: #766671).
+
+ -- Luca Falavigna <[e-mail]>  Thu, 20 Nov 2014 21:08:11 +0100
+
 remmina (1.1.1-1ubuntu1) vivid; urgency=low
 
   * Merge with Debian, remaining Ubuntu changes: (LP: #1358770)

=== modified file 'debian/patches/external_tools.patch'
--- debian/patches/external_tools.patch	2014-09-29 08:11:58 +0000
+++ debian/patches/external_tools.patch	2014-12-20 01:21:24 +0000
@@ -27,7 +27,7 @@
 ===================================================================
 --- remmina.orig/remmina/CMakeLists.txt
 +++ remmina/remmina/CMakeLists.txt
-@@ -164,7 +164,6 @@ if(WITH_TRANSLATIONS)
+@@ -173,7 +173,6 @@ if(WITH_TRANSLATIONS)
  endif()
  add_subdirectory(icons)
  add_subdirectory(desktop)

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-11-07 16:17:53 +0000
+++ debian/patches/series	2014-12-20 01:21:24 +0000
@@ -1,3 +1,2 @@
 translations.patch
 external_tools.patch
-vte-2.91.patch

=== removed file 'debian/patches/vte-2.91.patch'
--- debian/patches/vte-2.91.patch	2014-11-07 16:17:53 +0000
+++ debian/patches/vte-2.91.patch	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-Description: Port to vte 2.91
-Forwarded: https://github.com/FreeRDP/Remmina/pull/371/files
-Author: Iain Lane <[e-mail]>
-
-Index: b/remmina/CMakeLists.txt
-===================================================================
---- a/remmina/CMakeLists.txt
-+++ b/remmina/CMakeLists.txt
-@@ -138,7 +138,7 @@
- endif()
- 
- if(GTK3_FOUND)
--	set(_VTE_VERSION_NUM 2.90)
-+	set(_VTE_VERSION_NUM 2.91)
- else()
- 	set(_VTE_VERSION_NUM)
- endif()
-Index: b/cmake/FindVTE.cmake
-===================================================================
---- a/cmake/FindVTE.cmake
-+++ b/cmake/FindVTE.cmake
-@@ -21,11 +21,17 @@
- 	set(_VTE_LIB_NAME vte)
- 	set(_VTE_VERSION vte)
- else()
--	set(_VTE_LIB_NAME vte${_VTE_VERSION_NUM})
-+	if(${_VTE_VERSION_NUM} VERSION_LESS 2.91)
-+		set(_VTE_LIB_NAME vte${_VTE_VERSION_NUM})
-+	else()
-+		set(_VTE_LIB_NAME vte-${_VTE_VERSION_NUM})
-+	endif()
- 	set(_VTE_VERSION vte-${_VTE_VERSION_NUM})
- endif()
- 
--string(REPLACE . _ _VTE_LIB_NAME ${_VTE_LIB_NAME})
-+if(${_VTE_VERSION_NUM} VERSION_LESS 2.91)
-+	string(REPLACE . _ _VTE_LIB_NAME ${_VTE_LIB_NAME})
-+endif()
- 
- pkg_check_modules(PC_VTE ${_VTE_VERSION})
- 
-Index: b/remmina/src/remmina_ssh_plugin.c
-===================================================================
---- a/remmina/src/remmina_ssh_plugin.c
-+++ b/remmina/src/remmina_ssh_plugin.c
-@@ -136,9 +136,18 @@
- 	THREADS_ENTER
- 	if (charset && charset[0] != '\0')
- 	{
-+#if !VTE_CHECK_VERSION(0,38,0)
- 		vte_terminal_set_encoding (VTE_TERMINAL (gpdata->vte), charset);
-+#else
-+		vte_terminal_set_encoding (VTE_TERMINAL (gpdata->vte), charset, NULL);
-+#endif
- 	}
-+#if !VTE_CHECK_VERSION(0,38,0)
- 	vte_terminal_set_pty (VTE_TERMINAL (gpdata->vte), shell->slave);
-+#else
-+	vte_terminal_set_pty (VTE_TERMINAL (gpdata->vte),
-+                          vte_pty_new_foreign_sync (shell->slave, NULL, NULL));
-+#endif
- 	THREADS_LEAVE
- 
- 	remmina_plugin_service->protocol_plugin_emit_signal (gp, "connect");
-@@ -183,7 +192,12 @@
- 	gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
- 	if (remmina_pref.vte_font && remmina_pref.vte_font[0])
- 	{
-+#if !VTE_CHECK_VERSION(0,38,0)
- 		vte_terminal_set_font_from_string (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_font);
-+#else
-+		vte_terminal_set_font (VTE_TERMINAL (gpdata->vte),
-+							   pango_font_description_from_string (remmina_pref.vte_font));
-+#endif
- 	}
- 	vte_terminal_set_allow_bold (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_allow_bold_text);
- 	if (remmina_pref.vte_lines > 0)
-@@ -224,10 +238,18 @@
- 	remmina_plugin_service->protocol_plugin_register_hostkey (gp, vte);
- 
- #if GTK_VERSION == 3
-+#if VTE_CHECK_VERSION(0, 38, 0)
-+	vscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (vte)));
-+#else
- 	vscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, vte_terminal_get_adjustment (VTE_TERMINAL (vte)));
-+#endif
- #elif GTK_VERSION == 2
-+#if VTE_CHECK_VERSION(0, 38, 0)
-+	vscrollbar = gtk_vscrollbar_new (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE_TERMINAL (vte)));
-+#else
- 	vscrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment (VTE_TERMINAL (vte)));
- #endif
-+#endif
- 	gtk_widget_show(vscrollbar);
- 	gtk_box_pack_start (GTK_BOX (hbox), vscrollbar, FALSE, TRUE, 0);
- }

=== modified file 'remmina-plugins/rdp/rdp_event.c'
--- remmina-plugins/rdp/rdp_event.c	2014-11-07 16:17:53 +0000
+++ remmina-plugins/rdp/rdp_event.c	2014-12-20 01:21:24 +0000
@@ -54,6 +54,9 @@
 #endif
 
 	rfi = GET_DATA(gp);
+	if ( !rfi )
+		return;
+
 	input = rfi->instance->input;
 	UINT32 toggle_keys_state = 0;
 
@@ -88,6 +91,8 @@
 	RemminaPluginRdpEvent* event;
 
 	rfi = GET_DATA(gp);
+	if ( !rfi )
+		return;
 
 	if (rfi->event_queue)
 	{
@@ -454,6 +459,8 @@
 	DWORD scancode;
 
 	rfi = GET_DATA(gp);
+	if ( !rfi ) return TRUE;
+
 	rdp_event.type = REMMINA_RDP_EVENT_TYPE_SCANCODE;
 	rdp_event.key_event.up = (event->type == GDK_KEY_PRESS ? False : True);
 	rdp_event.key_event.extended = False;
@@ -535,6 +542,8 @@
 	GtkClipboard* clipboard;
 
 	rfi = GET_DATA(gp);
+	if ( !rfi ) return;
+
 	rfi->drawing_area = gtk_drawing_area_new();
 	gtk_widget_show(rfi->drawing_area);
 	gtk_container_add(GTK_CONTAINER(gp), rfi->drawing_area);
@@ -608,7 +617,7 @@
 	RemminaPluginRdpUiObject* ui;
 
 	rfi = GET_DATA(gp);
-
+	if ( !rfi ) return;
 
 	/* unregister the clipboard monitor */
 	if (rfi->clipboard_handler)
@@ -702,7 +711,7 @@
 	rfContext* rfi = GET_DATA(gp);
 	rdpPointer* pointer = (rdpPointer*)ui->cursor.pointer;
 #if GTK_VERSION == 3
-	cairo_surface_t* surface;	
+	cairo_surface_t* surface;
 	UINT8* data = malloc(pointer->width * pointer->height * 4);
 #else
 	guchar *data = g_malloc0(pointer->width * pointer->height * 4);
@@ -715,7 +724,7 @@
 	cairo_surface_destroy(surface);
 #else
 	pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, TRUE, 8, pointer->width, pointer->height, (pointer->width * 4), NULL, NULL);
-#endif	
+#endif
 	((rfPointer*)ui->cursor.pointer)->cursor = gdk_cursor_new_from_pixbuf(rfi->display, pixbuf, pointer->xPos, pointer->yPos);
 }
 
@@ -728,7 +737,7 @@
 	g_object_unref(ui->cursor.pointer->cursor);
 #else
 	gdk_cursor_unref(ui->cursor.pointer->cursor);
-#endif	
+#endif
 	ui->cursor.pointer->cursor = NULL;
 	g_cond_signal(rfi->gcond);
 	g_mutex_unlock(rfi->gmutex);

=== modified file 'remmina-plugins/rdp/rdp_plugin.c'
--- remmina-plugins/rdp/rdp_plugin.c	2014-11-07 16:17:53 +0000
+++ remmina-plugins/rdp/rdp_plugin.c	2014-12-20 01:21:24 +0000
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, 
+ * Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  *
  *  In addition, as a special exception, the copyright holders give
@@ -338,6 +338,7 @@
 	instance->update->DesktopResize = rf_desktop_resize;
 
 	freerdp_channels_post_connect(instance->context->channels, instance);
+	rfi->connected = True;
 
 	remmina_plugin_service->protocol_plugin_emit_signal(gp, "connect");
 
@@ -375,7 +376,7 @@
 
 		s_domain = remmina_plugin_service->protocol_plugin_init_get_domain(gp);
 		if (s_domain) rfi->settings->Domain = strdup(s_domain);
-		
+
 		save = remmina_plugin_service->protocol_plugin_init_get_savepassword(gp);
 		if (save)
 		{
@@ -383,13 +384,13 @@
 			// into remminafile->settings. They will be saved later, when disconnecting, by
 			// remmina_connection_object_on_disconnect of remmina_connection_window.c
 			// (this operation should be called "save credentials" and not "save password")
-			
+
 			remmina_plugin_service->file_set_string( remminafile, "username", s_username );
 			remmina_plugin_service->file_set_string( remminafile, "password", s_password );
 			remmina_plugin_service->file_set_string( remminafile, "domain", s_domain );
-			
+
 		}
-		
+
 		if ( s_username ) g_free( s_username );
 		if ( s_password ) g_free( s_password );
 		if ( s_domain ) g_free( s_domain );
@@ -470,9 +471,9 @@
 	fd_set wfds_set;
 	rfContext* rfi;
 	wMessage* event;
-	
+
 	rdpChannels *channels;
-	
+
 
 	memset(rfds, 0, sizeof(rfds));
 	memset(wfds, 0, sizeof(wfds));
@@ -561,39 +562,18 @@
 	}
 }
 
-gboolean remmina_rdp_load_plugin(rdpChannels* channels, rdpSettings* settings, const char* name, rdpSettings* plugin_data)
-{
-	void* entry = NULL;
-
-	entry = freerdp_channels_client_find_static_entry("VirtualChannelEntry", name);
-
-	if (entry)
-	{
-		if (freerdp_channels_client_load(channels, settings, entry, plugin_data) == 0)
-		{
-			g_printf("loading channel %s (static)\n", name);
-			return TRUE;
-		}
-	}
-
-	g_printf("loading channel %s (plugin)\n", name);
-	freerdp_channels_load_plugin(channels, settings, name, plugin_data);
-
-	return TRUE;
-}
-
 int remmina_rdp_load_static_channel_addin(rdpChannels* channels, rdpSettings* settings, char* name, void* data)
 {
 	void* entry;
 
 	entry = freerdp_load_channel_addin_entry(name, NULL, NULL, FREERDP_ADDIN_CHANNEL_STATIC);
-	
-	
-	
+
+
+
 
 	if (entry)
 	{
-	
+
 		if (freerdp_channels_client_load(channels, settings, entry, data) == 0)
 		{
 			fprintf(stderr, "loading channel %s\n", name);
@@ -630,8 +610,6 @@
 	gint port;
 	gchar* host;
 	gchar* value;
-	gint rdpdr_num;
-	gint drdynvc_num;
 	gint rdpsnd_rate;
 	gint rdpsnd_channel;
 	char *rdpsnd_params[3];
@@ -664,7 +642,7 @@
 		dest_server = remmina_plugin_service->file_get_string(remminafile, "server");
 		if ( dest_server ) {
 			remmina_plugin_service->get_server_port(dest_server, 0, &dest_host, &dest_port);
-			rfi->settings->CertificateName = _strdup( dest_host );
+			rfi->settings->CertificateName = strdup( dest_host );
 			g_free(dest_host);
 		}
 	}
@@ -701,12 +679,17 @@
 
 	if (remmina_plugin_service->file_get_string(remminafile, "clientname"))
 	{
-		strncpy(rfi->settings->ClientHostname, remmina_plugin_service->file_get_string(remminafile, "clientname"),
-			sizeof(rfi->settings->ClientHostname) - 1);
+		s = remmina_plugin_service->file_get_string(remminafile, "clientname");
+		if ( s ) {
+			free( rfi->settings->ClientHostname );
+			rfi->settings->ClientHostname = strdup(s);
+			g_free(s);
+		}
 	}
 	else
 	{
-		strncpy(rfi->settings->ClientHostname, g_get_host_name(), sizeof(rfi->settings->ClientHostname) - 1);
+		free( rfi->settings->ClientHostname );
+		rfi->settings->ClientHostname = strdup( g_get_host_name() );
 	}
 
 	if (remmina_plugin_service->file_get_string(remminafile, "exec"))
@@ -783,8 +766,6 @@
 	rfi->settings->FastPathInput = True;
 	rfi->settings->FastPathOutput = True;
 
-	drdynvc_num = 0;
-
 	cs = remmina_plugin_service->file_get_string(remminafile, "sound");
 
 	if (g_strcmp0(cs, "remote") == 0)
@@ -822,14 +803,8 @@
 
 	}
 
-	if (drdynvc_num)
-	{
-		remmina_rdp_load_plugin(rfi->instance->context->channels, rfi->settings, "drdynvc", rfi->drdynvc_data);
-	}
-
 	rfi->settings->RedirectClipboard = ( remmina_plugin_service->file_get_int(remminafile, "disableclipboard", FALSE) ? FALSE: TRUE );
 
-	rdpdr_num = 0;
 	cs = remmina_plugin_service->file_get_string(remminafile, "sharefolder");
 
 	if (cs && cs[0] == '/')
@@ -854,28 +829,32 @@
 
 		freerdp_device_collection_add(rfi->settings, (RDPDR_DEVICE*) drive);
 		rfi->settings->DeviceRedirection = TRUE;
-		rdpdr_num++;
 	}
 
 	if (remmina_plugin_service->file_get_int(remminafile, "shareprinter", FALSE))
 	{
-//		rfi->rdpdr_data[rdpdr_num].size = sizeof(RDP_PLUGIN_DATA);
-//		rfi->rdpdr_data[rdpdr_num].data[0] = "printer";
-		rdpdr_num++;
+		RDPDR_PRINTER* printer;
+		printer = (RDPDR_PRINTER*) malloc(sizeof(RDPDR_PRINTER));
+		ZeroMemory(printer, sizeof(RDPDR_PRINTER));
+
+		printer->Type = RDPDR_DTYP_PRINT;
+
+		freerdp_device_collection_add(rfi->settings, (RDPDR_DEVICE*) printer);
+		rfi->settings->DeviceRedirection = TRUE;
+
 	}
 
 	if (remmina_plugin_service->file_get_int(remminafile, "sharesmartcard", FALSE))
 	{
-        //rfi->rdpdr_data[rdpdr_num].size = sizeof(RDP_PLUGIN_DATA);
-        //rfi->rdpdr_data[rdpdr_num].data[0] = "scard";
-        //rfi->rdpdr_data[rdpdr_num].data[1] = "scard";
-		rdpdr_num++;
-	}
-
-	if (rdpdr_num)
-	{
-		//remmina_rdp_load_plugin(rfi->channels, rfi->settings, "rdpdr", rfi->rdpdr_data);
-        remmina_rdp_load_plugin(rfi->instance->context->channels, rfi->settings, "rdpdr", rfi->settings);
+		RDPDR_SMARTCARD* smartcard;
+		smartcard = (RDPDR_SMARTCARD*) malloc(sizeof(RDPDR_SMARTCARD));
+		ZeroMemory(smartcard, sizeof(RDPDR_SMARTCARD));
+
+		smartcard->Type = RDPDR_DTYP_SMARTCARD;
+		smartcard->Name = _strdup("scard");
+
+		freerdp_device_collection_add(rfi->settings, (RDPDR_DEVICE*) smartcard);
+		rfi->settings->DeviceRedirection = TRUE;
 	}
 
 
@@ -889,7 +868,7 @@
 
 		return FALSE;
 	}
-	
+
 
 
 	remmina_rdp_main_loop(gp);
@@ -917,7 +896,7 @@
 {
 	freerdp* instance;
 	rfContext* rfi;
-	
+
 	freerdp_register_addin_provider(freerdp_channels_load_static_addin_entry, 0);
 
 	instance = freerdp_new();
@@ -938,6 +917,7 @@
 	rfi->instance = instance;
 	rfi->settings = instance->settings;
 	rfi->instance->context->channels = freerdp_channels_new();
+	rfi->connected = False;
 
 	pthread_mutex_init(&rfi->mutex, NULL);
 
@@ -972,7 +952,7 @@
 {
 	rfContext* rfi;
 	freerdp* instance;
-	
+
 
 	rfi = GET_DATA(gp);
 	instance = rfi->instance;
@@ -995,13 +975,12 @@
 
 	if (instance)
 	{
-		if (instance->context->channels)
-		{
-			//freerdp_channels_close(rfi->channels, instance);
-			freerdp_channels_free(instance->context->channels);
-			instance->context->channels = NULL;
+		if ( rfi->connected ) {
+			if (instance->context->channels)
+				freerdp_channels_close(instance->context->channels, instance);
+			freerdp_disconnect(instance);
+			rfi->connected = False;
 		}
-		freerdp_disconnect(instance);
 	}
 
 	if (rfi->rfx_context)
@@ -1012,8 +991,17 @@
 
 	if (instance)
 	{
-		//freerdp_context_free(instance); /* context is rfContext* rfi */
+		/* Remove instance->context from gp object data to avoid double free */
+		g_object_steal_data(G_OBJECT(gp), "plugin-data");
+
+		if (instance->context->channels) {
+			freerdp_channels_free(instance->context->channels);
+			instance->context->channels = NULL;
+		}
+
+		freerdp_context_free(instance); /* context is rfContext* rfi */
 		freerdp_free(instance);
+		rfi->instance = NULL;
 	}
 
 	return FALSE;

=== modified file 'remmina-plugins/rdp/rdp_plugin.h'
--- remmina-plugins/rdp/rdp_plugin.h	2014-11-07 16:17:53 +0000
+++ remmina-plugins/rdp/rdp_plugin.h	2014-12-20 01:21:24 +0000
@@ -1,6 +1,6 @@
 /*
  * Remmina - The GTK+ Remote Desktop Client
- * Copyright (C) 2010-2011 Vic Lee 
+ * Copyright (C) 2010-2011 Vic Lee
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, 
+ * Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  *
  *  In addition, as a special exception, the copyright holders give
@@ -106,6 +106,8 @@
 
 	RFX_CONTEXT* rfx_context;
 
+	gboolean connected;
+
 	gboolean sw_gdi;
 	GtkWidget* drawing_area;
 	gint scale_width;

=== modified file 'remmina/CMakeLists.txt'
--- remmina/CMakeLists.txt	2014-11-07 16:17:53 +0000
+++ remmina/CMakeLists.txt	2014-12-20 01:21:24 +0000
@@ -137,17 +137,26 @@
 	target_link_libraries(remmina ${AVAHI_LIBRARIES})
 endif()
 
-if(GTK3_FOUND)
-	set(_VTE_VERSION_NUM 2.91)
-else()
+option(WITH_VTE "Build with support for VTE" ON)
+if(GTK3_FOUND AND WITH_VTE)
+	set(_VTE_VERSION_NUMS 2.91 2.90)
+	foreach(__VTE_VERSION ${_VTE_VERSION_NUMS})
+		set(_VTE_VERSION_NUM ${__VTE_VERSION})
+		find_package(VTE)
+		if(VTE_FOUND)
+			break()
+		endif()
+		message(STATUS "VTE ${__VTE_VERSION} not found")
+	endforeach(__VTE_VERSION)
+elseif(WITH_VTE)
 	set(_VTE_VERSION_NUM)
+	find_package(VTE)
 endif()
 
-find_suggested_package(VTE _VTE_VERSION_NUM)
-if(VTE_FOUND)
-	add_definitions(-DHAVE_LIBVTE)
-	include_directories(${VTE_INCLUDE_DIRS})
-	target_link_libraries(remmina ${VTE_LIBRARIES})
+if (VTE_FOUND)
+        add_definitions(-DHAVE_LIBVTE)
+        include_directories(${VTE_INCLUDE_DIRS})
+        target_link_libraries(remmina ${VTE_LIBRARIES})
 endif()
 
 if(GTK3_FOUND)

=== modified file 'remmina/external_tools/CMakeLists.txt'
--- remmina/external_tools/CMakeLists.txt	2014-09-28 10:10:16 +0000
+++ remmina/external_tools/CMakeLists.txt	2014-12-20 01:21:24 +0000
@@ -30,10 +30,7 @@
 # version. If you delete this exception statement from all source
 # files in the program, then also delete it here.
 
-
-set(EXTERNAL_TOOLS_DIR "$ENV{HOME}/.remmina/external_tools")
-
-file(MAKE_DIRECTORY ${EXTERNAL_TOOLS_DIR})
+set(EXTERNAL_TOOLS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/remmina/external_tools")
 
 INSTALL(PROGRAMS launcher.sh pause.sh remmina_filezilla_sftp.sh remmina_filezilla_sftp_pki.sh remmina_nslookup.sh remmina_ping.sh remmina_traceroute.sh DESTINATION ${EXTERNAL_TOOLS_DIR})
 

=== modified file 'remmina/src/remmina_about.c'
--- remmina/src/remmina_about.c	2014-10-13 16:57:50 +0000
+++ remmina/src/remmina_about.c	2014-12-20 01:21:24 +0000
@@ -50,6 +50,7 @@
 		"Alex Chateau <[e-mail]>",
 		"Alexander Logvinov <[e-mail]>",
 		"Antenore Gatta <[e-mail]>",
+		"Fabio Castelli (Muflone) <[e-mail]>",
 		"Giovanni Panozzo <[e-mail]>",
 		"Harun Trefry <[e-mail]>",
 		"Nikolay Botev <[e-mail]>",

=== modified file 'remmina/src/remmina_connection_window.c'
--- remmina/src/remmina_connection_window.c	2014-11-07 16:17:53 +0000
+++ remmina/src/remmina_connection_window.c	2014-12-20 01:21:24 +0000
@@ -1982,15 +1982,9 @@
 		tab = remmina_connection_object_create_tab(cnnobj);
 		remmina_connection_object_append_page(cnnobj, to, tab, view_mode);
 
-#if GTK_VERSION == 3		
-		/* Reparent cnnobj->viewport */
-		g_object_ref(cnnobj->viewport);
-		gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(cnnobj->viewport)), cnnobj->viewport);
-		gtk_container_add(GTK_CONTAINER(cnnobj->scrolled_container), cnnobj->viewport );
-		g_object_unref(cnnobj->viewport);
-#elif GTK_VERSION == 2
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		gtk_widget_reparent(cnnobj->viewport, cnnobj->scrolled_container);
-#endif
+		G_GNUC_END_IGNORE_DEPRECATIONS
 
 		if (cnnobj->window)
 		{
@@ -2518,16 +2512,9 @@
 		tab = remmina_connection_object_create_tab(cnnobj);
 		i = remmina_connection_object_append_page(cnnobj, GTK_NOTEBOOK(cnnhld->cnnwin->priv->notebook), tab,
 				cnnhld->cnnwin->priv->view_mode);
-				
-#if GTK_VERSION == 3		
-		/* Reparent cnnobj->viewport */
-		g_object_ref(cnnobj->viewport);
-		gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(cnnobj->viewport)), cnnobj->viewport);
-		gtk_container_add(GTK_CONTAINER(cnnobj->scrolled_container), cnnobj->viewport );
-		g_object_unref(cnnobj->viewport);
-#elif GTK_VERSION == 2
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		gtk_widget_reparent(cnnobj->viewport, cnnobj->scrolled_container);
-#endif
+		G_GNUC_END_IGNORE_DEPRECATIONS
 
 		gtk_window_present(GTK_WINDOW(cnnhld->cnnwin));
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(cnnhld->cnnwin->priv->notebook), i);

=== modified file 'remmina/src/remmina_string_list.c'
--- remmina/src/remmina_string_list.c	2014-10-05 14:18:20 +0000
+++ remmina/src/remmina_string_list.c	2014-12-20 01:21:24 +0000
@@ -60,7 +60,11 @@
 
 static void remmina_string_list_status_hints(RemminaStringList *gsl)
 {
+#if GTK_VERSION == 3
+	gtk_widget_override_color(gsl->status_label, GTK_STATE_NORMAL, NULL);
+#else
 	gtk_widget_modify_fg(gsl->status_label, GTK_STATE_NORMAL, NULL);
+#endif
 	gtk_label_set_text(GTK_LABEL(gsl->status_label), gsl->hints);
 }
 
@@ -205,7 +209,7 @@
 #if GTK_CHECK_VERSION(3, 12, 0)
 	gtk_widget_set_margin_end (GTK_FRAME(frame), 80);
 #else
-	gtk_widget_set_margin_right (GTK_FRAME(frame), 80);
+	gtk_widget_set_margin_right (frame, 80);
 #endif
 	gtk_grid_attach(GTK_GRID(gsl), frame, 0, 0, 1, 1);