Hello community, here is the log from the commit of package remmina for openSUSE:Factory checked in at 2013-03-25 20:42:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/remmina (Old) and /work/SRC/openSUSE:Factory/.remmina.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "remmina", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/remmina/remmina.changes 2012-08-24 13:52:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.remmina.new/remmina.changes 2013-03-25 20:42:11.000000000 +0100 @@ -1,0 +2,15 @@ +Sat Mar 23 23:04:36 UTC 2013 - [email protected] + +- enable TLS-support in VNC plugin (bnc#804320) +- add remmina-fix-scrolling-in-vnc-plugin.patch which fixes + scrolling in the VNC plugin (backport from upstream git) +- add remmina-close-ssh-tunnel-on-disconnect.patch in order to + close SSH tunnels on disconnect and avoid freezing (backport from + upstream git) +- remmina-fix-window-resize.patch which fixes resizing the window + (backport from upstream git) +- add remmina-fix-fullscreen-with-multiple-monitors.patch which + fixes fullscreen mode with multiple monitors (backport from + upstream git) + +------------------------------------------------------------------- New: ---- remmina-close-ssh-tunnel-on-disconnect.patch remmina-fix-fullscreen-with-multiple-monitors.patch remmina-fix-scrolling-in-vnc-plugin.patch remmina-fix-window-resize.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ remmina.spec ++++++ --- /var/tmp/diff_new_pack.8X4FDm/_old 2013-03-25 20:42:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8X4FDm/_new 2013-03-25 20:42:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package remmina # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,14 @@ Patch3: remmina-gtk-2-22-support.patch # PATCH-FIX-UPSTREAM remmina-remove-inline-libvncserver.patch [email protected] -- Remove inline copy of libvncserver (backport from upstream git) Patch4: remmina-remove-inline-libvncserver.patch +# PATCH-FIX-UPSTREAM remmina-fix-scrolling-in-vnc-plugin.patch [email protected] -- Fix scrolling in the VNC plugin (backport from upstream git) +Patch5: remmina-fix-scrolling-in-vnc-plugin.patch +# PATCH-FIX-UPSTREAM remmina-close-ssh-tunnel-on-disconnect.patch [email protected] -- Close SSH tunnel on disconnect and avoid freezing (backport from upstream git) +Patch6: remmina-close-ssh-tunnel-on-disconnect.patch +# PATCH-FIX-UPSTREAM remmina-fix-window-resize.patch [email protected] -- Fix resizing the window (backport from upstream git) +Patch7: remmina-fix-window-resize.patch +# PATCH-FIX-UPSTREAM remmina-fix-fullscreen-with-multiple-monitors.patch [email protected] -- Fix fullscreen mode with multiple monitors (backport from upstream git) +Patch8: remmina-fix-fullscreen-with-multiple-monitors.patch BuildRequires: cmake BuildRequires: ed BuildRequires: intltool @@ -150,12 +158,16 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 cp -r %{SOURCE1} README.SuSE %build mkdir build cd build -export CFLAGS="%{optflags}" +export CFLAGS="%{optflags} -DLIBVNCSERVER_WITH_CLIENT_TLS=1" cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR=%{_lib} \ ++++++ remmina-close-ssh-tunnel-on-disconnect.patch ++++++ commit bed49ad62d78718c0876c000a97c68cc87f12c7c Author: Jean-Louis Dupond <[email protected]> Date: Sat Sep 1 20:56:09 2012 +0200 Closes #77: Close the SSH tunnel after the connection has been closed Index: FreeRDP-Remmina-356c033/remmina/src/remmina_protocol_widget.c =================================================================== --- FreeRDP-Remmina-356c033.orig/remmina/src/remmina_protocol_widget.c +++ FreeRDP-Remmina-356c033/remmina/src/remmina_protocol_widget.c @@ -267,13 +267,7 @@ gboolean remmina_protocol_widget_close_c gp->priv->chat_window = NULL; } -#ifdef HAVE_LIBSSH - if (gp->priv->ssh_tunnel) - { - remmina_ssh_tunnel_free(gp->priv->ssh_tunnel); - gp->priv->ssh_tunnel = NULL; - } -#endif + gboolean retval; if (!gp->priv->plugin || !gp->priv->plugin->close_connection) { @@ -281,7 +275,17 @@ gboolean remmina_protocol_widget_close_c return FALSE; } - return gp->priv->plugin->close_connection(gp); + retval = gp->priv->plugin->close_connection(gp); + + #ifdef HAVE_LIBSSH + if (gp->priv->ssh_tunnel) + { + remmina_ssh_tunnel_free(gp->priv->ssh_tunnel); + gp->priv->ssh_tunnel = NULL; + } + #endif + + return retval; } static gboolean remmina_protocol_widget_emit_signal_timeout(gpointer user_data) ++++++ remmina-fix-fullscreen-with-multiple-monitors.patch ++++++ commit 348e01d27869a577ad5df9bf6286f876b34a40c0 Author: Jean-Louis Dupond <[email protected]> Date: Mon Sep 10 20:08:00 2012 +0200 Fix fullscreen mode with multiple monitors diff --git a/remmina/src/remmina_connection_window.c b/remmina/src/remmina_connection_window.c index 761b2f4..7a5b214 100644 --- a/remmina/src/remmina_connection_window.c +++ b/remmina/src/remmina_connection_window.c @@ -496,13 +496,21 @@ static void remmina_connection_holder_check_resize(RemminaConnectionHolder* cnnh DECLARE_CNNOBJ gboolean scroll_required = FALSE; GdkScreen* screen; + gint monitor; + GdkRectangle screen_size; gint screen_width, screen_height; gint server_width, server_height; remmina_connection_holder_get_desktop_size(cnnhld, &server_width, &server_height, FALSE); - screen = gdk_screen_get_default(); - screen_width = gdk_screen_get_width(screen); - screen_height = gdk_screen_get_height(screen); + screen = gtk_window_get_screen(GTK_WINDOW(cnnhld->cnnwin)); + monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(GTK_WIDGET(cnnhld->cnnwin))); +#ifdef gdk_screen_get_monitor_workarea + gdk_screen_get_monitor_workarea(screen, monitor, &screen_size); +#else + gdk_screen_get_monitor_geometry(screen, monitor, &screen_size); +#endif + screen_width = screen_size.width; + screen_height = screen_size.height; if (!remmina_protocol_widget_get_expand(REMMINA_PROTOCOL_WIDGET(cnnobj->proto)) && (server_width <= 0 || server_height <= 0 || screen_width < server_width ++++++ remmina-fix-scrolling-in-vnc-plugin.patch ++++++ commit c422e9c0396e405ef5a3d2a6b24dbc83c20afe2f Author: Jean-Louis Dupond <[email protected]> Date: Wed Apr 25 11:57:39 2012 +0200 Also fix scrolling on VNC plugin Index: FreeRDP-Remmina-356c033/remmina-plugins/rdp/rdp_event.c =================================================================== --- FreeRDP-Remmina-356c033.orig/remmina-plugins/rdp/rdp_event.c +++ FreeRDP-Remmina-356c033/remmina-plugins/rdp/rdp_event.c @@ -468,7 +468,7 @@ void remmina_rdp_event_init(RemminaProto gtk_container_add(GTK_CONTAINER(gp), rfi->drawing_area); gtk_widget_add_events(rfi->drawing_area, GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK); + | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); gtk_widget_set_can_focus(rfi->drawing_area, TRUE); remmina_plugin_service->protocol_plugin_register_hostkey(gp, rfi->drawing_area); Index: FreeRDP-Remmina-356c033/remmina-plugins/vnc/vnc_plugin.c =================================================================== --- FreeRDP-Remmina-356c033.orig/remmina-plugins/vnc/vnc_plugin.c +++ FreeRDP-Remmina-356c033/remmina-plugins/vnc/vnc_plugin.c @@ -1847,7 +1847,7 @@ static void remmina_plugin_vnc_init(Remm gtk_widget_add_events( gpdata->drawing_area, GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK - | GDK_KEY_RELEASE_MASK); + | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); gtk_widget_set_can_focus(gpdata->drawing_area, TRUE); #if GTK_VERSION == 3 ++++++ remmina-fix-window-resize.patch ++++++ commit 1901a1e9e5282c1deca2f5f98476e2c7e9243d35 Author: Jean-Louis Dupond <[email protected]> Date: Mon Sep 10 14:12:11 2012 +0200 Closes #63: fix typo when fitting window diff --git a/remmina/src/remmina_connection_window.c b/remmina/src/remmina_connection_window.c index 7ff1246..2ba8193 100644 --- a/remmina/src/remmina_connection_window.c +++ b/remmina/src/remmina_connection_window.c @@ -436,7 +436,7 @@ static gboolean remmina_connection_holder_toolbar_autofit_restore(RemminaConnect remmina_connection_holder_get_desktop_size(cnnhld, &width, &height, TRUE); gtk_widget_get_allocation(priv->notebook, &na); gtk_widget_get_allocation(cnnobj->scrolled_container, &ca); - gtk_widget_get_allocation(priv->toolbar, &ca); + gtk_widget_get_allocation(priv->toolbar, &ta); gtk_window_resize(GTK_WINDOW(cnnhld->cnnwin), MAX(1, width + na.width - ca.width), MAX(1, height + ta.height + na.height - ca.height)); gtk_container_check_resize(GTK_CONTAINER(cnnhld->cnnwin)); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
