vino r1006 - in trunk: . server server/libvncserver tools

[jwendell svn gnome org]

Author: jwendell
Date: Thu Nov 13 16:54:37 2008
New Revision: 1006
URL: http://svn.gnome.org/viewvc/vino?rev=1006&view=rev

Log:
2008-11-13  Jorge Pereira  <jorge jorgepereira com br>
	* server/libvncserver/auth.c:
	* server/libvncserver/main.c:
	* server/libvncserver/rfbserver.c:
	* server/vino-prefs.c:
	* server/vino-util.h:
	* tools/vino-passwd.c:
	Drop some warning messages.
	Closes #558135.



Modified:
   trunk/ChangeLog
   trunk/server/libvncserver/auth.c
   trunk/server/libvncserver/main.c
   trunk/server/libvncserver/rfbserver.c
   trunk/server/vino-prefs.c
   trunk/server/vino-util.h
   trunk/tools/vino-passwd.c

Modified: trunk/server/libvncserver/auth.c
==============================================================================
--- trunk/server/libvncserver/auth.c	(original)
+++ trunk/server/libvncserver/auth.c	Thu Nov 13 16:54:37 2008
@@ -75,7 +75,7 @@
     gnutls_credentials_set(cl->tlsSession,
 			   GNUTLS_CRD_ANON,
 			   cl->screen->anonCredentials);
-    gnutls_transport_set_ptr(cl->tlsSession, (gnutls_transport_ptr) cl->sock);
+    gnutls_transport_set_ptr(cl->tlsSession, (gnutls_transport_ptr_t) cl->sock);
 
     err = gnutls_handshake(cl->tlsSession);
     if (err != GNUTLS_E_SUCCESS && !gnutls_error_is_fatal(err)) {

Modified: trunk/server/libvncserver/main.c
==============================================================================
--- trunk/server/libvncserver/main.c	(original)
+++ trunk/server/libvncserver/main.c	Thu Nov 13 16:54:37 2008
@@ -65,7 +65,7 @@
 
     time(&log_clock);
     strftime(buf, 255, "%d/%m/%Y %X ", localtime(&log_clock));
-    fprintf(stderr,buf);
+    fprintf(stderr, "%s", buf);
 
     vfprintf(stderr, format, args);
     fflush(stderr);

Modified: trunk/server/libvncserver/rfbserver.c
==============================================================================
--- trunk/server/libvncserver/rfbserver.c	(original)
+++ trunk/server/libvncserver/rfbserver.c	Thu Nov 13 16:54:37 2008
@@ -74,7 +74,7 @@
 {
     if(sizeof(rfbBool)!=1) {
         /* a sanity check */
-        fprintf(stderr,"rfbBool's size is not 1 (%d)!\n",sizeof(rfbBool));
+        fprintf(stderr,"rfbBool's size is not 1 (%lu)!\n",(unsigned long)sizeof(rfbBool));
 	/* we cannot continue, because rfbBool is supposed to be char everywhere */
 	exit(1);
     }
@@ -148,7 +148,7 @@
     rfbClientIteratorPtr iterator;
     rfbClientPtr cl,cl_;
     struct sockaddr_storage addr;
-    size_t addrlen = sizeof(addr);
+    socklen_t addrlen = sizeof(addr);
     int i;
     char host[NI_MAXHOST];
 

Modified: trunk/server/vino-prefs.c
==============================================================================
--- trunk/server/vino-prefs.c	(original)
+++ trunk/server/vino-prefs.c	Thu Nov 13 16:54:37 2008
@@ -454,8 +454,8 @@
   if (vino_enabled)
     vino_mdns_start ();
 
-  g_signal_connect (server, "notify::alternative-port", vino_prefs_restart_mdns, NULL);
-  g_signal_connect (server, "notify::use-alternative-port", vino_prefs_restart_mdns, NULL);
+  g_signal_connect (server, "notify::alternative-port", G_CALLBACK (vino_prefs_restart_mdns), NULL);
+  g_signal_connect (server, "notify::use-alternative-port", G_CALLBACK(vino_prefs_restart_mdns), NULL);
 
   icon = vino_server_get_status_icon (server);
   vino_status_icon_set_visibility (icon, vino_icon_visibility);

Modified: trunk/server/vino-util.h
==============================================================================
--- trunk/server/vino-util.h	(original)
+++ trunk/server/vino-util.h	Thu Nov 13 16:54:37 2008
@@ -26,12 +26,10 @@
 #include <config.h>
 #include <libintl.h>
 #include <glib/gmacros.h>
+#include <glib/gi18n.h>
 
 G_BEGIN_DECLS
 
-#define  _(x) dgettext (GETTEXT_PACKAGE, x)
-#define N_(x) (x)
-
 #define VINO_STOCK_ALLOW  "vino-allow"
 #define VINO_STOCK_REFUSE "vino-refuse"
 

Modified: trunk/tools/vino-passwd.c
==============================================================================
--- trunk/tools/vino-passwd.c	(original)
+++ trunk/tools/vino-passwd.c	Thu Nov 13 16:54:37 2008
@@ -105,7 +105,8 @@
     {
       char key;
 
-      read (STDIN_FILENO, &key, 1);
+      if ( read (STDIN_FILENO, &key, 1) < 0 )
+	break;
 
       if (key == 0x03) /* Ctrl + C */
         {