r27693 - in /desktop/experimental/vino/debian: changelog patches/config_h_defines.patch patches/series

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Wed Apr 20 15:18:43 UTC 2011


Author: jordi
Date: Wed Apr 20 15:18:40 2011
New Revision: 27693

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27693
Log:
* FIXME: Needs ftbfs fix for gnutls.
* Add config_h_defines.patch to fix the mess of mismatches between
  defines declared by configure and what the code actually checked for.

Added:
    desktop/experimental/vino/debian/patches/config_h_defines.patch
Modified:
    desktop/experimental/vino/debian/changelog
    desktop/experimental/vino/debian/patches/series

Modified: desktop/experimental/vino/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/changelog?rev=27693&op=diff
==============================================================================
--- desktop/experimental/vino/debian/changelog [utf-8] (original)
+++ desktop/experimental/vino/debian/changelog [utf-8] Wed Apr 20 15:18:40 2011
@@ -1,6 +1,6 @@
 vino (3.0.0-1) UNRELEASED; urgency=low
 
-  * FIXME: Check if all features work (some libs missing from deps).
+  * FIXME: Needs ftbfs fix for gnutls.
   * New upstream stable release.
   * Adjust Build-Depends for the GTK+3 port.
   * Update ipv6 patch to use new config.h names.
@@ -10,6 +10,8 @@
   * Add a Homepage field.
   * Bump Standards-Version to 3.9.2.
   * Use --with-* switches for features with configure.
+  * Add config_h_defines.patch to fix the mess of mismatches between
+    defines declared by configure and what the code actually checked for.
 
  -- Jordi Mallach <jordi at debian.org>  Sun, 17 Apr 2011 19:33:57 +0200
 

Added: desktop/experimental/vino/debian/patches/config_h_defines.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/config_h_defines.patch?rev=27693&op=file
==============================================================================
--- desktop/experimental/vino/debian/patches/config_h_defines.patch (added)
+++ desktop/experimental/vino/debian/patches/config_h_defines.patch [utf-8] Wed Apr 20 15:18:40 2011
@@ -1,0 +1,595 @@
+--- a/server/vino-status-icon.c
++++ b/server/vino-status-icon.c
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ #include <gio/gdesktopappinfo.h>
+ #include <string.h>
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
+ #endif
+ 
+@@ -42,7 +42,7 @@
+   GtkWidget  *disconnect_dialog;
+   VinoStatusIconVisibility visibility;
+ 
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+   NotifyNotification *new_client_notification;
+ #endif
+ };
+@@ -69,7 +69,7 @@
+ {
+   VinoStatusIcon *icon = VINO_STATUS_ICON (object);
+ 
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+   if (icon->priv->new_client_notification)
+     g_object_unref (icon->priv->new_client_notification);
+   icon->priv->new_client_notification = NULL;
+@@ -564,19 +564,19 @@
+   g_type_class_add_private (gobject_class, sizeof (VinoStatusIconPrivate));
+ }
+ 
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+ static void
+ vino_status_handle_new_client_notification_closed (VinoStatusIcon *icon)
+ {
+   g_object_unref (icon->priv->new_client_notification);
+   icon->priv->new_client_notification = NULL;
+ }
+-#endif /* VINO_ENABLE_LIBNOTIFY */
++#endif /* VINO_HAVE_LIBNOTIFY */
+ 
+ static gboolean
+ vino_status_icon_show_new_client_notification (gpointer user_data)
+ {
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+ #define NOTIFICATION_TIMEOUT 5
+ 
+   GError     *error;
+@@ -631,7 +631,7 @@
+     }
+ 
+   icon->priv->new_client_notification =
+-#ifdef VINO_HAS_LIBNOTIFY_0_7
++#ifdef VINO_HAVE_LIBNOTIFY_0_7
+     notify_notification_new (summary,
+                              body,
+                              "preferences-desktop-remote-desktop");
+@@ -662,7 +662,7 @@
+   g_free (user_data);
+ 
+ #undef NOTIFICATION_TIMEOUT
+-#endif /* VINO_ENABLE_LIBNOTIFY */
++#endif /* VINO_HAVE_LIBNOTIFY */
+ 
+   return FALSE;
+ }
+--- a/server/vino-status-tube-icon.c
++++ b/server/vino-status-tube-icon.c
+@@ -24,7 +24,7 @@
+ #include <string.h>
+ #include <gtk/gtk.h>
+ #include <gio/gdesktopappinfo.h>
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+ #include <glib/gi18n.h>
+ #include <libnotify/notify.h>
+ #endif
+@@ -40,7 +40,7 @@
+   GtkWidget *disconnect_dialog;
+   VinoStatusTubeIconVisibility visibility;
+ 
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+   NotifyNotification *new_client_notification;
+ #endif
+ };
+@@ -59,7 +59,7 @@
+ {
+   VinoStatusTubeIcon *icon = VINO_STATUS_TUBE_ICON (object);
+ 
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+   if (icon->priv->new_client_notification != NULL)
+     {
+       notify_notification_close (icon->priv->new_client_notification, NULL);
+@@ -107,7 +107,7 @@
+ vino_status_tube_icon_init (VinoStatusTubeIcon *icon)
+ {
+   icon->priv = G_TYPE_INSTANCE_GET_PRIVATE (icon, VINO_TYPE_STATUS_TUBE_ICON, VinoStatusTubeIconPrivate);
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+   icon->priv->new_client_notification = NULL;
+ #endif
+ }
+@@ -375,7 +375,7 @@
+     }
+ }
+ 
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+ static void
+ vino_status_tube_icon_show_invalidated_notif_closed
+     (VinoStatusTubeIcon *icon)
+@@ -389,7 +389,7 @@
+ vino_status_tube_icon_show_notif (VinoStatusTubeIcon *icon,
+     const gchar *summary, const gchar *body, gboolean invalidated)
+ {
+-#ifdef VINO_ENABLE_LIBNOTIFY
++#ifdef VINO_HAVE_LIBNOTIFY
+ #define NOTIFICATION_TIMEOUT 5
+ 
+   GError *error;
+@@ -414,7 +414,7 @@
+       filename = "stock_person";
+ 
+   icon->priv->new_client_notification =
+-#ifdef VINO_HAS_LIBNOTIFY_0_7
++#ifdef VINO_HAVE_LIBNOTIFY_0_7
+       notify_notification_new (summary, body, filename);
+ #else
+       notify_notification_new_with_status_icon (summary, body,
+@@ -441,6 +441,6 @@
+ #else
+   if (invalidated)
+     vino_tube_server_fire_closed (icon->priv->server);
+-#endif /* VINO_ENABLE_LIBNOTIFY */
++#endif /* VINO_HAVE_LIBNOTIFY */
+ }
+ 
+--- a/server/vino-server.c
++++ b/server/vino-server.c
+@@ -39,7 +39,7 @@
+ #include <sys/poll.h>
+ #include <gtk/gtk.h>
+ 
+-#ifdef VINO_ENABLE_KEYRING
++#ifdef VINO_HAVE_KEYRING
+ #include <gnome-keyring.h>
+ #endif
+ 
+@@ -674,7 +674,7 @@
+ static char *
+ vino_server_get_password_from_keyring (VinoServer *server)
+ {
+-#ifdef VINO_ENABLE_KEYRING
++#ifdef VINO_HAVE_KEYRING
+   GnomeKeyringNetworkPasswordData *found_item;
+   GnomeKeyringResult               result;
+   GList                           *matches;
+@@ -1718,14 +1718,14 @@
+   rfbClearSecurityTypes (server->priv->rfb_screen);
+   rfbClearAuthTypes (server->priv->rfb_screen);
+ 
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+   rfbAddSecurityType (server->priv->rfb_screen, rfbTLS);
+ #endif
+       
+   if (server->priv->auth_methods & VINO_AUTH_VNC)
+     {
+       rfbAddAuthType (server->priv->rfb_screen, rfbVncAuth);
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+       if (!server->priv->require_encryption)
+ #endif
+ 	rfbAddSecurityType (server->priv->rfb_screen, rfbVncAuth);
+@@ -1734,7 +1734,7 @@
+   if (server->priv->auth_methods & VINO_AUTH_NONE)
+     {
+       rfbAddAuthType (server->priv->rfb_screen, rfbNoAuth);
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+       if (!server->priv->require_encryption)
+ #endif
+ 	rfbAddSecurityType (server->priv->rfb_screen, rfbNoAuth);
+--- a/server/vino-upnp.c
++++ b/server/vino-upnp.c
+@@ -30,7 +30,7 @@
+ #include "miniupnp/miniupnpc.h"
+ #include "miniupnp/upnpcommands.h"
+ 
+-#ifdef VINO_ENABLE_NETWORKMANAGER
++#ifdef VINO_HAVE_NETWORKMANAGER
+ #include <NetworkManager/NetworkManager.h>
+ #endif
+ 
+@@ -45,7 +45,7 @@
+   gboolean         have_igd;
+   int              port;
+   int              internal_port;
+-#ifdef VINO_ENABLE_NETWORKMANAGER
++#ifdef VINO_HAVE_NETWORKMANAGER
+   GDBusConnection *bus;
+   GDBusProxy      *proxy_nm, *proxy_name;
+ #endif
+@@ -132,7 +132,7 @@
+ 
+   vino_upnp_remove_port (upnp);
+ 
+-#ifdef VINO_ENABLE_NETWORKMANAGER
++#ifdef VINO_HAVE_NETWORKMANAGER
+   if (upnp->priv->proxy_nm)
+     {
+       g_object_unref (upnp->priv->proxy_nm);
+@@ -166,7 +166,7 @@
+   g_type_class_add_private (gobject_class, sizeof (VinoUpnpPrivate));
+ }
+ 
+-#ifdef VINO_ENABLE_NETWORKMANAGER
++#ifdef VINO_HAVE_NETWORKMANAGER
+ static void setup_network_monitor (VinoUpnp *upnp);
+ #endif
+ 
+@@ -181,7 +181,7 @@
+   upnp->priv->port = -1;
+   upnp->priv->internal_port = -1;
+ 
+-#ifdef VINO_ENABLE_NETWORKMANAGER
++#ifdef VINO_HAVE_NETWORKMANAGER
+   upnp->priv->proxy_nm = NULL;
+   upnp->priv->proxy_name = NULL;
+   upnp->priv->bus = NULL;
+@@ -333,7 +333,7 @@
+   return upnp->priv->port;
+ }
+ 
+-#ifdef VINO_ENABLE_NETWORKMANAGER
++#ifdef VINO_HAVE_NETWORKMANAGER
+ static gboolean
+ redo_forward (gpointer data)
+ {
+@@ -403,4 +403,4 @@
+                             NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE,
+                             NULL, proxy_created, g_object_ref (upnp));
+ }
+-#endif /* HAVE_NETWORKMANAGER */
++#endif /* VINO_HAVE_NETWORKMANAGER */
+--- a/tools/vino-passwd.c
++++ b/tools/vino-passwd.c
+@@ -37,7 +37,7 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ 
+-#ifdef VINO_ENABLE_KEYRING
++#ifdef VINO_HAVE_KEYRING
+ #include <gnome-keyring.h>
+ #endif
+ 
+@@ -48,7 +48,7 @@
+ static gboolean
+ vino_passwd_set_password_in_keyring (const char *password)
+ {
+-#ifdef VINO_ENABLE_KEYRING
++#ifdef VINO_HAVE_KEYRING
+   GnomeKeyringResult result;
+   guint32            item_id;
+ 
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -375,7 +375,7 @@
+     case RFB_SECURITY_TYPE:
+ 	rfbAuthProcessSecurityTypeMessage(cl);
+ 	return;
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     case RFB_TLS_HANDSHAKE:
+ 	rfbAuthProcessTLSHandshake(cl);
+ 	return;
+--- a/server/vino-main.c
++++ b/server/vino-main.c
+@@ -36,7 +36,7 @@
+ #include "vino-dbus-listener.h"
+ #include "eggsmclient.h"
+ 
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ #include <gnutls/gnutls.h>
+ 
+ # ifdef GNOME_ENABLE_DEBUG
+@@ -47,7 +47,7 @@
+   fputs (str, stderr);
+ }
+ # endif
+-#endif /* HAVE_GNUTLS */
++#endif /* VINO_HAVE_GNUTLS */
+ 
+ typedef struct
+ {
+@@ -228,13 +228,13 @@
+ 
+ #ifdef GNOME_ENABLE_DEBUG
+   vino_setup_debug_flags ();
+-# ifdef HAVE_GNUTLS
++# ifdef VINO_HAVE_GNUTLS
+   if (_vino_debug_flags & VINO_DEBUG_TLS)
+     {
+       gnutls_global_set_log_level (10);
+       gnutls_global_set_log_function (vino_debug_gnutls);
+     }
+-# endif /* HAVE_GNUTLS */
++# endif /* VINO_HAVE_GNUTLS */
+ #endif
+ 
+   /* Session management */
+--- a/server/libvncserver/auth.c
++++ b/server/libvncserver/auth.c
+@@ -31,7 +31,7 @@
+ void
+ rfbAuthInitScreen(rfbScreenInfoPtr rfbScreen)
+ {
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ #define DH_BITS 1024
+ 
+     gnutls_global_init();
+@@ -45,22 +45,22 @@
+ 				     rfbScreen->dhParams);
+ 
+ #undef DH_BITS
+-#endif /* HAVE_GNUTLS */
++#endif /* VINO_HAVE_GNUTLS */
+ }
+ 
+ void
+ rfbAuthCleanupScreen(rfbScreenInfoPtr rfbScreen)
+ {
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     gnutls_dh_params_deinit(rfbScreen->dhParams);
+ 
+     gnutls_anon_free_server_credentials(rfbScreen->anonCredentials);
+   
+     gnutls_global_deinit();
+-#endif /* HAVE_GNUTLS */
++#endif /* VINO_HAVE_GNUTLS */
+ }
+ 
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ static rfbBool
+ rfbAuthTLSHandshake(rfbClientPtr cl)
+ {
+@@ -95,7 +95,7 @@
+ 
+     return TRUE;
+ }
+-#endif /* HAVE_GNUTLS */
++#endif /* VINO_HAVE_GNUTLS */
+ 
+ static rfbBool
+ rfbAuthClientAuthenticated(rfbClientPtr cl)
+@@ -206,7 +206,7 @@
+ void
+ rfbAuthCleanupClient(rfbClientPtr cl)
+ {
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     if (cl->tlsSession) {
+ 	if (cl->sock)
+ 	    gnutls_bye(cl->tlsSession, GNUTLS_SHUT_WR);
+@@ -214,10 +214,10 @@
+ 	gnutls_deinit(cl->tlsSession);
+ 	cl->tlsSession = NULL;
+     }
+-#endif /* HAVE_GNUTLS */
++#endif /* VINO_HAVE_GNUTLS */
+ }
+ 
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ static void
+ rfbAuthListAuthTypes(rfbClientPtr cl)
+ {
+@@ -238,7 +238,7 @@
+         return;
+     }
+ }
+-#endif /* HAVE_GNUTLS */
++#endif /* VINO_HAVE_GNUTLS */
+ 
+ void
+ rfbAuthProcessSecurityTypeMessage(rfbClientPtr cl)
+@@ -267,7 +267,7 @@
+     }
+ 
+     switch (securityType) {
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     case rfbTLS:
+ 	if (!rfbAuthTLSHandshake(cl))
+ 	    return;
+@@ -299,7 +299,7 @@
+     }
+ }
+ 
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ void
+ rfbAuthProcessTLSHandshake(rfbClientPtr cl)
+ {
+@@ -321,7 +321,7 @@
+ 
+     rfbAuthListAuthTypes(cl);
+ }
+-#endif /* HAVE_GNUTLS */
++#endif /* VINO_HAVE_GNUTLS */
+ 
+ void
+ rfbAuthProcessAuthTypeMessage(rfbClientPtr cl)
+--- a/server/libvncserver/main.c
++++ b/server/libvncserver/main.c
+@@ -560,7 +560,7 @@
+ 	return "No Authentication";
+     case rfbVncAuth:
+ 	return "VNC Authentication";
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     case rfbTLS:
+ 	return "TLS";
+ #endif
+@@ -580,7 +580,7 @@
+     switch (securityType) {
+     case rfbNoAuth:
+     case rfbVncAuth:
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     case rfbTLS:
+ #endif
+ 	rfbScreen->securityTypes[rfbScreen->nSecurityTypes] = securityType;
+--- a/server/libvncserver/rfb/rfb.h
++++ b/server/libvncserver/rfb/rfb.h
+@@ -37,7 +37,7 @@
+ #include <string.h>
+ #include "rfbproto.h"
+ #include "rfbregion.h"
+-#ifdef VINO_HAVE_GNUTLS
++#ifdef VINO_VINO_HAVE_GNUTLS
+ #include <gnutls/gnutls.h>
+ #endif
+ 
+@@ -134,7 +134,7 @@
+     int authTypes[RFB_MAX_N_AUTH_TYPES];
+     int nAuthTypes;
+     PasswordCheckProcPtr passwordCheck;
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     gnutls_anon_server_credentials anonCredentials;
+     gnutls_dh_params dhParams;
+ #endif
+@@ -211,7 +211,7 @@
+     ClientGoneHookPtr clientGoneHook;
+ 
+     SOCKET sock;
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     gnutls_session tlsSession;
+     rfbBool useTLS;
+ #endif
+@@ -220,7 +220,7 @@
+     enum {
+         RFB_PROTOCOL_VERSION,   /* establishing protocol version */
+         RFB_SECURITY_TYPE,      /* negotiating security type */
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ 	RFB_TLS_HANDSHAKE,      /* completing the TLS handshake */
+ #endif
+ 	RFB_AUTH_TYPE,          /* negotiating authentication type */
+@@ -466,7 +466,7 @@
+ extern void rfbAuthProcessSecurityTypeMessage(rfbClientPtr cl);
+ extern void rfbAuthProcessAuthTypeMessage(rfbClientPtr cl);
+ extern void rfbAuthProcessClientMessage(rfbClientPtr cl);
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ extern void rfbAuthProcessTLSHandshake(rfbClientPtr cl);
+ #endif
+ extern void rfbAuthPasswordChecked(rfbClientPtr cl, enum rfbNewClientAction result);
+--- a/server/libvncserver/rfb/rfbproto.h
++++ b/server/libvncserver/rfb/rfbproto.h
+@@ -281,7 +281,7 @@
+ #define rfbVncAuth        2
+ 
+ /* Allocated security type for TLS */
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ #define rfbTLS            18
+ #endif
+ 
+--- a/server/libvncserver/sockets.c
++++ b/server/libvncserver/sockets.c
+@@ -363,7 +363,7 @@
+ }
+ 
+ 
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ static int
+ ReadExactOverTLS(rfbClientPtr cl, char* buf, int len, int timeout)
+ {
+@@ -389,7 +389,7 @@
+ 
+     return 1;
+ }
+-#endif /* HAVE_GNUTLS */
++#endif /* VINO_HAVE_GNUTLS */
+ 
+ /*
+  * ReadExact reads an exact number of bytes from a client.  Returns 1 if
+@@ -405,7 +405,7 @@
+     fd_set fds;
+     struct timeval tv;
+ 
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     if (cl->useTLS)
+ 	return ReadExactOverTLS(cl, buf, len, timeout);
+ #endif
+@@ -456,7 +456,7 @@
+   return(ReadExactTimeout(cl,buf,len,rfbMaxClientWait));
+ }
+ 
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+ static int
+ WriteExactOverTLS(rfbClientPtr cl, const char* buf, int len)
+ {
+@@ -486,7 +486,7 @@
+ 
+     return 1;
+ }
+-#endif /* HAVE_GNUTLS */
++#endif /* VINO_HAVE_GNUTLS */
+ 
+ /*
+  * WriteExact writes an exact number of bytes to a client.  Returns 1 if
+@@ -503,7 +503,7 @@
+     struct timeval tv;
+     int totalTimeWaited = 0;
+ 
+-#ifdef HAVE_GNUTLS
++#ifdef VINO_HAVE_GNUTLS
+     if (cl->useTLS)
+ 	return WriteExactOverTLS(cl, buf, len);
+ #endif
+--- a/server/vino-dbus-listener.c
++++ b/server/vino-dbus-listener.c
+@@ -24,7 +24,7 @@
+ #include "vino-dbus-listener.h"
+ #include "vino-dbus.h"
+ 
+-#ifdef HAVE_TELEPATHY_GLIB
++#ifdef VINO_HAVE_TELEPATHY_GLUB
+ #include "vino-tube-servers-manager.h"
+ #endif
+ 
+@@ -45,7 +45,7 @@
+ 
+   VinoServer      *server;
+ 
+-#ifdef HAVE_TELEPATHY_GLIB
++#ifdef VINO_HAVE_TELEPATHY_GLUB
+   VinoTubeServersManager *manager;
+ #endif
+ };
+@@ -67,7 +67,7 @@
+     g_object_unref (listener->server);
+ 
+ 
+-#ifdef HAVE_TELEPATHY_GLIB
++#ifdef VINO_HAVE_TELEPATHY_GLUB
+   if (listener->manager != NULL)
+     {
+       g_object_unref (listener->manager);
+@@ -82,7 +82,7 @@
+ static void
+ vino_dbus_listener_init (VinoDBusListener *listener)
+ {
+-#ifdef HAVE_TELEPATHY_GLIB
++#ifdef VINO_HAVE_TELEPATHY_GLUB
+   listener->manager = vino_tube_servers_manager_new ();
+ #endif
+ }

Modified: desktop/experimental/vino/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/series?rev=27693&op=diff
==============================================================================
--- desktop/experimental/vino/debian/patches/series [utf-8] (original)
+++ desktop/experimental/vino/debian/patches/series [utf-8] Wed Apr 20 15:18:40 2011
@@ -1,3 +1,4 @@
+config_h_defines.patch
 01_ipv6-fix.patch
 02_server_sm-disable.patch
 11_hurd_maxhostnamelen.patch




More information about the pkg-gnome-commits mailing list