Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/Remmina/Remmina.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorllyzs <llyzs.vic@gmail.com>2011-01-16 18:51:33 +0300
committerllyzs <llyzs@b6cfa94a-2857-405c-b0d6-536ef9fc39e1>2011-01-16 18:51:33 +0300
commit37eb9412a64d8502c3308ce2b6490a626b96602a (patch)
treeb45f09d25d2e8aae4bd7503a2c347398a41893f8 /remmina
parent24634538be337a2c5a80bb9536f379d538672a54 (diff)
Do not resize window when switching between tabs
git-svn-id: https://remmina.svn.sourceforge.net/svnroot/remmina/trunk@312 b6cfa94a-2857-405c-b0d6-536ef9fc39e1
Diffstat (limited to 'remmina')
-rw-r--r--remmina/configure.ac2
-rw-r--r--remmina/src/remminaconnectionwindow.c10
2 files changed, 9 insertions, 3 deletions
diff --git a/remmina/configure.ac b/remmina/configure.ac
index c8a40e378..8bf162906 100644
--- a/remmina/configure.ac
+++ b/remmina/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60)
-AC_INIT(remmina, 0.9.2)
+AC_INIT(remmina, 0.9.3)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([src/remmina.c])
diff --git a/remmina/src/remminaconnectionwindow.c b/remmina/src/remminaconnectionwindow.c
index f7d694f9b..b423bb617 100644
--- a/remmina/src/remminaconnectionwindow.c
+++ b/remmina/src/remminaconnectionwindow.c
@@ -1946,7 +1946,10 @@ remmina_connection_holder_on_switch_page_real (gpointer data)
{
remmina_connection_holder_update_toolbar (cnnhld);
remmina_connection_holder_grab_focus (priv->notebook);
- remmina_connection_holder_check_resize (cnnhld);
+ if (cnnhld->cnnwin->priv->view_mode != SCROLLED_WINDOW_MODE)
+ {
+ remmina_connection_holder_check_resize (cnnhld);
+ }
}
priv->switch_page_handler = 0;
return FALSE;
@@ -2409,7 +2412,10 @@ remmina_connection_object_on_disconnect (RemminaProtocolWidget *gp, RemminaConne
static void
remmina_connection_object_on_desktop_resize (RemminaProtocolWidget *gp, RemminaConnectionObject *cnnobj)
{
- remmina_connection_holder_check_resize (cnnobj->cnnhld);
+ if (cnnobj->cnnhld->cnnwin->priv->view_mode != SCROLLED_WINDOW_MODE)
+ {
+ remmina_connection_holder_check_resize (cnnobj->cnnhld);
+ }
}
gboolean