vinagre r552 - in trunk: . src

[jwendell svn gnome org]

Author: jwendell
Date: Thu Dec 18 14:43:16 2008
New Revision: 552
URL: http://svn.gnome.org/viewvc/vinagre?rev=552&view=rev

Log:
2008-12-15  Jonh Wendell <jwendell gnome org>

	* configure.ac: Depends on gtk-vnc 0.3.8
	* src/vinagre-tab.c: Let scaling work on composited screens.



Modified:
   trunk/ChangeLog
   trunk/INSTALL
   trunk/README
   trunk/configure.ac
   trunk/src/vinagre-tab.c

Modified: trunk/INSTALL
==============================================================================
--- trunk/INSTALL	(original)
+++ trunk/INSTALL	Thu Dec 18 14:43:16 2008
@@ -8,7 +8,7 @@
  - libglade-2.0
  - gconf-2.0
  - gnome-keyring
- - gtk-vnc widget >= 0.3.7 (http://gtk-vnc.sf.net)
+ - gtk-vnc widget >= 0.3.8 (http://sourceforge.net/projects/gtk-vnc)
  - avahi-gobject and avahi-ui >= 0.6.22
  - libpanelapplet-2.0 >= 2.0.0
 

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Thu Dec 18 14:43:16 2008
@@ -28,13 +28,14 @@
 Enabling scaling
 ================
 
-  - In order to enable scaling in Vinagre, gtk-vnc widget must have been
-  compiled with this feature enabled.
-    Simply build gtk-vnc with the flag '--with-gtkglext=yes', in the
-    configure stage.
-    Notice that this version of Vinagre (2.24.x) requires gtk-vnc 0.3.7. Newer
-  gtk-vnc versions don't use GtkGL for scaling anymore and thus break Vinagre
-  scaling.
+ - Current version (2.25 an up):
+  Scaling should be working out-of-the-box, as it relies on cairo, and cairo
+  is present on most platforms. Note that gtk-vnc >= 0.3.8 is required.
+
+ - Older versions (2.24 and earlier):
+  In order to enable scaling in Vinagre, gtk-vnc widget must have been
+  compiled with this feature enabled. Just build gtk-vnc with the flag
+  '--with-gtkglext=yes', in the configure stage.
 
 Bookmarks
 =========

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Dec 18 14:43:16 2008
@@ -39,7 +39,7 @@
 LIBGLADE_REQUIRED=2.6.0
 GCONF_REQUIRED=2.16.0
 GTHREAD_REQUIRED=2.0.0
-GTK_VNC_REQUIRED=0.3.7
+GTK_VNC_REQUIRED=0.3.8
 AVAHI_REQUIRED=0.6.22
 PANEL_REQUIRED_VERSION=2.0.0
 

Modified: trunk/src/vinagre-tab.c
==============================================================================
--- trunk/src/vinagre-tab.c	(original)
+++ trunk/src/vinagre-tab.c	Thu Dec 18 14:43:16 2008
@@ -1129,14 +1129,6 @@
   if (vnc_display_get_scaling (VNC_DISPLAY (tab->priv->vnc)) == active)
     return TRUE;
 
-  if (active &&
-      gdk_screen_is_composited (gtk_widget_get_screen (GTK_WIDGET (tab->priv->window))))
-    {
-      vinagre_utils_show_error (NULL, _("Scaling does not work properly on composited windows. Disable the visual effects and try again."),
-				GTK_WINDOW (tab->priv->window));
-      return FALSE;
-    }
-
   vnc_display_set_force_size (VNC_DISPLAY(tab->priv->vnc), !active);
   if (!vnc_display_set_scaling (VNC_DISPLAY (tab->priv->vnc), active))
     {