[vino: 13/17] Merge branch '3'

[Chris Kühl <chriskuehl src gnome org>]

commit 55deaf6bbe7a793785bb98176a31dbdbb1bd8da9
Merge: d148b1b 309f8c2
Author: Chris Kühl <chrisk openismus com>
Date:   Tue Feb 15 17:05:36 2011 +0100

    Merge branch '3'
    
    Conflicts:
    	configure.in
    	m4/libtool.m4
    	m4/ltoptions.m4
    	m4/ltversion.m4
    	m4/lt~obsolete.m4
    	server/vino-fb.c
    	server/vino-fb.h
    	server/vino-server.c

 Makefile.am                                        |    2 +-
 capplet/Makefile.am                                |   16 +-
 capplet/vino-connectivity-info.c                   |  378 +
 .../vino-connectivity-info.h                       |   25 +-
 capplet/vino-message-box.h                         |    2 +-
 capplet/vino-preferences.c                         | 1382 +---
 capplet/vino-preferences.ui                        |  164 +-
 capplet/vino-radio-button.c                        |  181 +
 .../vino-radio-button.h                            |   21 +-
 common/.gitignore                                  |    1 +
 common/Makefile.am                                 |   10 +
 common/org.gnome.Vino.gschema.xml                  |  171 +
 common/vino-dbus.c                                 |   60 +
 server/vino-background.h => common/vino-dbus.h     |   26 +-
 common/vino-keyring.c                              |  104 +
 server/vino-background.h => common/vino-keyring.h  |   20 +-
 configure.in                                       |   38 +-
 m4/intltool.m4                                     |  216 -
 m4/libtool.m4                                      | 7437 --------------------
 m4/ltoptions.m4                                    |  369 -
 m4/ltsugar.m4                                      |  123 -
 m4/ltversion.m4                                    |   23 -
 m4/lt~obsolete.m4                                  |   98 -
 server/Makefile.am                                 |   27 +-
 server/vino-background.c                           |   64 -
 server/vino-dbus-error.h                           |    4 +-
 server/vino-dbus-listener.c                        |  483 +-
 server/vino-dbus-listener.h                        |   39 +-
 server/vino-fb.c                                   |  140 +-
 server/vino-fb.h                                   |    4 +-
 server/vino-main.c                                 |  243 +-
 server/vino-prefs.c                                |  863 +---
 server/vino-prefs.h                                |    2 +-
 server/vino-server.c                               |  164 +-
 server/vino-server.h                               |    3 +-
 server/vino-server.schemas.in                      |  250 -
 server/vino-upnp.c                                 |  111 +-
 server/vino-util.c                                 |  105 +-
 server/vino-util.h                                 |    4 +-
 39 files changed, 2026 insertions(+), 11347 deletions(-)
---
diff --cc configure.in
index 5ba45dc,e0cd251..8e4e035
--- a/configure.in
+++ b/configure.in
@@@ -31,10 -29,9 +29,9 @@@ AC_SEARCH_LIBS([strerror],[cposix]
  AC_HEADER_STDC
  AC_C_BIGENDIAN
  
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
  
 -GTK_VERSION=2.20.0
 +GTK_VERSION=2.99.0
  GLIB_VERSION=2.17.0
  DBUS_VERSION=1.2.3
  SOUP_VERSION=2.24.0
diff --cc server/vino-fb.c
index 1e0bb22,61adcd5..7225d83
--- a/server/vino-fb.c
+++ b/server/vino-fb.c
@@@ -554,9 -556,9 +556,10 @@@ vino_fb_screen_size_changed (VinoFB    
  static gboolean
  vino_fb_xdamage_idle_handler (VinoFB *vfb)
  {
-   cairo_rectangle_int_t *damage, d;
-   XRectangle    xdamage;
-   int           error;
++
+   cairo_rectangle_int_t damage;
+   XRectangle            xdamage;
+   int                   error;
  
    g_assert (!cairo_region_is_empty (vfb->priv->pending_damage));
  
@@@ -584,15 -585,15 +586,15 @@@
    if (vfb->priv->use_x_shm)
      {
        XCopyArea (vfb->priv->xdisplay,
 -		 GDK_WINDOW_XWINDOW (vfb->priv->root_window),
 +		 GDK_WINDOW_XID (vfb->priv->root_window),
  		 vfb->priv->fb_pixmap,
  		 vfb->priv->xdamage_copy_gc,
- 		 damage->x,
- 		 damage->y,
- 		 damage->width,
- 		 damage->height,
- 		 damage->x,
- 		 damage->y);
+ 		 damage.x,
+ 		 damage.y,
+ 		 damage.width,
+ 		 damage.height,
+ 		 damage.x,
+ 		 damage.y);
        XSync (vfb->priv->xdisplay, False);
      }
    else