GNOME.org
 

[vino/gnome-3-0] Fix defines to match configure script output

commit 5d13c3ead121862f4938d3129c42e6a6f559ecc1
Author: Jordi Mallach <jordi sindominio net>
Date:   Wed Apr 20 19:24:54 2011 +0200

    Fix defines to match configure script output
    
    In 99d0f293b7ed2527c127a45bb6bc5b34b61bbcdb, configure was changed to
    prefix all AC_DEFINE macros with VINO_, and features were changed to use
    AC_ARG_WITH.
    
    Some of the guarded features didn't have their defines updated in the
    code, resulting in any build having NetworkManager, GCrypt/GnuTLS,
    libnotify or Telepathy support.
    
    Fixes bug 648322.

 server/libvncserver/auth.c         |   26 +++++++++++++-------------
 server/libvncserver/main.c         |    4 ++--
 server/libvncserver/rfb/rfb.h      |    8 ++++----
 server/libvncserver/rfb/rfbproto.h |    2 +-
 server/libvncserver/rfbserver.c    |    2 +-
 server/libvncserver/sockets.c      |   12 ++++++------
 server/vino-dbus-listener.c        |    8 ++++----
 server/vino-main.c                 |    8 ++++----
 server/vino-server.c               |   10 +++++-----
 server/vino-status-icon.c          |   16 ++++++++--------
 server/vino-status-tube-icon.c     |   16 ++++++++--------
 server/vino-upnp.c                 |   14 +++++++-------
 tools/vino-passwd.c                |    4 ++--
 13 files changed, 65 insertions(+), 65 deletions(-)
---
diff --git a/server/libvncserver/auth.c b/server/libvncserver/auth.c
index 19d1de5..6489f4c 100644
--- 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 @@ rfbAuthInitScreen(rfbScreenInfoPtr rfbScreen)
 				     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 @@ rfbAuthTLSHandshake(rfbClientPtr cl)
 
     return TRUE;
 }
-#endif /* HAVE_GNUTLS */
+#endif /* VINO_HAVE_GNUTLS */
 
 static rfbBool
 rfbAuthClientAuthenticated(rfbClientPtr cl)
@@ -206,7 +206,7 @@ rfbAuthNewClient(rfbClientPtr cl)
 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 @@ rfbAuthCleanupClient(rfbClientPtr cl)
 	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 @@ rfbAuthListAuthTypes(rfbClientPtr cl)
         return;
     }
 }
-#endif /* HAVE_GNUTLS */
+#endif /* VINO_HAVE_GNUTLS */
 
 void
 rfbAuthProcessSecurityTypeMessage(rfbClientPtr cl)
@@ -267,7 +267,7 @@ rfbAuthProcessSecurityTypeMessage(rfbClientPtr cl)
     }
 
     switch (securityType) {
-#ifdef HAVE_GNUTLS
+#ifdef VINO_HAVE_GNUTLS
     case rfbTLS:
 	if (!rfbAuthTLSHandshake(cl))
 	    return;
@@ -299,7 +299,7 @@ rfbAuthProcessSecurityTypeMessage(rfbClientPtr cl)
     }
 }
 
-#ifdef HAVE_GNUTLS
+#ifdef VINO_HAVE_GNUTLS
 void
 rfbAuthProcessTLSHandshake(rfbClientPtr cl)
 {
@@ -321,7 +321,7 @@ rfbAuthProcessTLSHandshake(rfbClientPtr cl)
 
     rfbAuthListAuthTypes(cl);
 }
-#endif /* HAVE_GNUTLS */
+#endif /* VINO_HAVE_GNUTLS */
 
 void
 rfbAuthProcessAuthTypeMessage(rfbClientPtr cl)
diff --git a/server/libvncserver/main.c b/server/libvncserver/main.c
index 9ce9bff..bb47388 100644
--- a/server/libvncserver/main.c
+++ b/server/libvncserver/main.c
@@ -560,7 +560,7 @@ securityTypeToName(int securityType)
 	return "No Authentication";
     case rfbVncAuth:
 	return "VNC Authentication";
-#ifdef HAVE_GNUTLS
+#ifdef VINO_HAVE_GNUTLS
     case rfbTLS:
 	return "TLS";
 #endif
@@ -580,7 +580,7 @@ void rfbAddSecurityType(rfbScreenInfoPtr rfbScreen, int securityType)
     switch (securityType) {
     case rfbNoAuth:
     case rfbVncAuth:
-#ifdef HAVE_GNUTLS
+#ifdef VINO_HAVE_GNUTLS
     case rfbTLS:
 #endif
 	rfbScreen->securityTypes[rfbScreen->nSecurityTypes] = securityType;
diff --git a/server/libvncserver/rfb/rfb.h b/server/libvncserver/rfb/rfb.h
index 96d6fb6..368a4cf 100644
--- a/server/libvncserver/rfb/rfb.h
+++ b/server/libvncserver/rfb/rfb.h
@@ -134,7 +134,7 @@ typedef struct _rfbScreenInfo
     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 @@ typedef struct _rfbClientRec {
     ClientGoneHookPtr clientGoneHook;
 
     SOCKET sock;
-#ifdef HAVE_GNUTLS
+#ifdef VINO_HAVE_GNUTLS
     gnutls_session tlsSession;
     rfbBool useTLS;
 #endif
@@ -220,7 +220,7 @@ typedef struct _rfbClientRec {
     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 rfbAuthCleanupClient(rfbClientPtr cl);
 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);
diff --git a/server/libvncserver/rfb/rfbproto.h b/server/libvncserver/rfb/rfbproto.h
index fe9157a..ba98a4f 100644
--- a/server/libvncserver/rfb/rfbproto.h
+++ b/server/libvncserver/rfb/rfbproto.h
@@ -281,7 +281,7 @@ typedef struct {
 #define rfbVncAuth        2
 
 /* Allocated security type for TLS */
-#ifdef HAVE_GNUTLS
+#ifdef VINO_HAVE_GNUTLS
 #define rfbTLS            18
 #endif
 
diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
index 7930cfd..8c35853 100644
--- a/server/libvncserver/rfbserver.c
+++ b/server/libvncserver/rfbserver.c
@@ -375,7 +375,7 @@ rfbProcessClientMessage(rfbClientPtr cl)
     case RFB_SECURITY_TYPE:
 	rfbAuthProcessSecurityTypeMessage(cl);
 	return;
-#ifdef HAVE_GNUTLS
+#ifdef VINO_HAVE_GNUTLS
     case RFB_TLS_HANDSHAKE:
 	rfbAuthProcessTLSHandshake(cl);
 	return;
diff --git a/server/libvncserver/sockets.c b/server/libvncserver/sockets.c
index ebc5095..bbdaf3d 100644
--- a/server/libvncserver/sockets.c
+++ b/server/libvncserver/sockets.c
@@ -363,7 +363,7 @@ rfbCloseClient(cl)
 }
 
 
-#ifdef HAVE_GNUTLS
+#ifdef VINO_HAVE_GNUTLS
 static int
 ReadExactOverTLS(rfbClientPtr cl, char* buf, int len, int timeout)
 {
@@ -389,7 +389,7 @@ ReadExactOverTLS(rfbClientPtr cl, char* buf, int len, int timeout)
 
     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 @@ ReadExactTimeout(rfbClientPtr cl, char* buf, int len, int timeout)
     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 @@ int ReadExact(rfbClientPtr cl,char* buf,int len)
   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 @@ WriteExactOverTLS(rfbClientPtr cl, const char* buf, int len)
 
     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 @@ WriteExact(rfbClientPtr cl, const char* buf, int len)
     struct timeval tv;
     int totalTimeWaited = 0;
 
-#ifdef HAVE_GNUTLS
+#ifdef VINO_HAVE_GNUTLS
     if (cl->useTLS)
 	return WriteExactOverTLS(cl, buf, len);
 #endif
diff --git a/server/vino-dbus-listener.c b/server/vino-dbus-listener.c
index 3a1b4f4..624bfe1 100644
--- 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 @@ struct _VinoDBusListener
 
   VinoServer      *server;
 
-#ifdef HAVE_TELEPATHY_GLIB
+#ifdef VINO_HAVE_TELEPATHY_GLUB
   VinoTubeServersManager *manager;
 #endif
 };
@@ -67,7 +67,7 @@ vino_dbus_listener_finalize (GObject *object)
     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 @@ vino_dbus_listener_finalize (GObject *object)
 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
 }
diff --git a/server/vino-main.c b/server/vino-main.c
index fda0f83..1fba117 100644
--- 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 @@ vino_debug_gnutls (int         level,
   fputs (str, stderr);
 }
 # endif
-#endif /* HAVE_GNUTLS */
+#endif /* VINO_HAVE_GNUTLS */
 
 typedef struct
 {
@@ -228,13 +228,13 @@ main (int argc, char **argv)
 
 #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 */
diff --git a/server/vino-server.c b/server/vino-server.c
index ba26daa..0a5ff97 100644
--- 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_GNOME_KEYRING
 #include <gnome-keyring.h>
 #endif
 
@@ -674,7 +674,7 @@ vino_server_defer_client_auth (VinoServer *server,
 static char *
 vino_server_get_password_from_keyring (VinoServer *server)
 {
-#ifdef VINO_ENABLE_KEYRING
+#ifdef VINO_HAVE_GNOME_KEYRING
   GnomeKeyringNetworkPasswordData *found_item;
   GnomeKeyringResult               result;
   GList                           *matches;
@@ -1718,14 +1718,14 @@ vino_server_update_security_types (VinoServer *server)
   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 @@ vino_server_update_security_types (VinoServer *server)
   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);
diff --git a/server/vino-status-icon.c b/server/vino-status-icon.c
index b44154d..67a03da 100644
--- 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 @@ struct _VinoStatusIconPrivate
   GtkWidget  *disconnect_dialog;
   VinoStatusIconVisibility visibility;
 
-#ifdef VINO_ENABLE_LIBNOTIFY
+#ifdef VINO_HAVE_LIBNOTIFY
   NotifyNotification *new_client_notification;
 #endif
 };
@@ -69,7 +69,7 @@ vino_status_icon_finalize (GObject *object)
 {
   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;
@@ -571,19 +571,19 @@ vino_status_icon_class_init (VinoStatusIconClass *klass)
   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;
@@ -638,7 +638,7 @@ vino_status_icon_show_new_client_notification (gpointer user_data)
     }
 
   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");
@@ -669,7 +669,7 @@ vino_status_icon_show_new_client_notification (gpointer user_data)
   g_free (user_data);
 
 #undef NOTIFICATION_TIMEOUT
-#endif /* VINO_ENABLE_LIBNOTIFY */
+#endif /* VINO_HAVE_LIBNOTIFY */
 
   return FALSE;
 }
diff --git a/server/vino-status-tube-icon.c b/server/vino-status-tube-icon.c
index db1bb1d..b7135a1 100644
--- 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 @@ struct _VinoStatusTubeIconPrivate
   GtkWidget *disconnect_dialog;
   VinoStatusTubeIconVisibility visibility;
 
-#ifdef VINO_ENABLE_LIBNOTIFY
+#ifdef VINO_HAVE_LIBNOTIFY
   NotifyNotification *new_client_notification;
 #endif
 };
@@ -59,7 +59,7 @@ vino_status_tube_icon_finalize (GObject *object)
 {
   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 @@ static void
 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 @@ vino_status_tube_icon_set_visibility (VinoStatusTubeIcon *icon,
     }
 }
 
-#ifdef VINO_ENABLE_LIBNOTIFY
+#ifdef VINO_HAVE_LIBNOTIFY
 static void
 vino_status_tube_icon_show_invalidated_notif_closed
     (VinoStatusTubeIcon *icon)
@@ -389,7 +389,7 @@ void
 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 @@ vino_status_tube_icon_show_notif (VinoStatusTubeIcon *icon,
       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 @@ vino_status_tube_icon_show_notif (VinoStatusTubeIcon *icon,
 #else
   if (invalidated)
     vino_tube_server_fire_closed (icon->priv->server);
-#endif /* VINO_ENABLE_LIBNOTIFY */
+#endif /* VINO_HAVE_LIBNOTIFY */
 }
 
diff --git a/server/vino-upnp.c b/server/vino-upnp.c
index 3f085e2..fcccfc7 100644
--- 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 @@ struct _VinoUpnpPrivate
   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_dispose (GObject *object)
 
   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 @@ vino_upnp_class_init (VinoUpnpClass *klass)
   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 @@ vino_upnp_init (VinoUpnp *upnp)
   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 @@ vino_upnp_get_external_port (VinoUpnp *upnp)
   return upnp->priv->port;
 }
 
-#ifdef VINO_ENABLE_NETWORKMANAGER
+#ifdef VINO_HAVE_NETWORKMANAGER
 static gboolean
 redo_forward (gpointer data)
 {
@@ -403,4 +403,4 @@ setup_network_monitor (VinoUpnp *upnp)
                             NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE,
                             NULL, proxy_created, g_object_ref (upnp));
 }
-#endif /* HAVE_NETWORKMANAGER */
+#endif /* VINO_HAVE_NETWORKMANAGER */
diff --git a/tools/vino-passwd.c b/tools/vino-passwd.c
index 78d07e5..765aa9a 100644
--- 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_GNOME_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_GNOME_KEYRING
   GnomeKeyringResult result;
   guint32            item_id;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]