gnome-terminal r2441 - in trunk: . src src/skey

[kmaraas svn gnome org]

Author: kmaraas
Date: Sun Mar 16 12:41:17 2008
New Revision: 2441
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2441&view=rev

Log:
2008-03-16  Kjartan Maraas  <kmaraas gnome org>

	* src/skey/btoe.c: (extract):
	* src/skey/md5.c:
	* src/skey/sha1.c:
	* src/terminal-widget-vte.c: (terminal_widget_set_pango_font):
	* src/terminal.c: (slowly_and_stupidly_obtain_timestamp):
	Fix compiler warnings. Closes bug #521417.

Modified:
   trunk/ChangeLog
   trunk/src/gnome-terminal.schemas.in
   trunk/src/skey/btoe.c
   trunk/src/skey/md5.c
   trunk/src/skey/sha1.c
   trunk/src/terminal-widget-vte.c
   trunk/src/terminal.c

Modified: trunk/src/gnome-terminal.schemas.in
==============================================================================
--- trunk/src/gnome-terminal.schemas.in	(original)
+++ trunk/src/gnome-terminal.schemas.in	Sun Mar 16 12:41:17 2008
@@ -426,7 +426,7 @@
           Terminals have a 16-color palette that applications inside 
           the terminal can use. This is that palette, in the form 
           of a colon-separated list of color names. Color names 
-          should be in hex format e.g. "#FF00FF"
+          should be in hex format e.g. "#FF00FF".
          </long>
       </locale>
     </schema>

Modified: trunk/src/skey/btoe.c
==============================================================================
--- trunk/src/skey/btoe.c	(original)
+++ trunk/src/skey/btoe.c	Sun Mar 16 12:41:17 2008
@@ -279,7 +279,7 @@
  * starting with bit 'start'
  */
 
-guint32 extract(char *s, int start, int length)
+static guint32 extract(char *s, int start, int length)
 {
         guint8 cl;
         guint8 cc;

Modified: trunk/src/skey/md5.c
==============================================================================
--- trunk/src/skey/md5.c	(original)
+++ trunk/src/skey/md5.c	Sun Mar 16 12:41:17 2008
@@ -16,6 +16,7 @@
  */
 
 #include <config.h>
+#include <stdlib.h>
 
 #include <glib/gchecksum.h>
 

Modified: trunk/src/skey/sha1.c
==============================================================================
--- trunk/src/skey/sha1.c	(original)
+++ trunk/src/skey/sha1.c	Sun Mar 16 12:41:17 2008
@@ -14,6 +14,9 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+#include <arpa/inet.h>
+
 #include <glib/gchecksum.h>
 
 #include "skey.h"

Modified: trunk/src/terminal-widget-vte.c
==============================================================================
--- trunk/src/terminal-widget-vte.c	(original)
+++ trunk/src/terminal-widget-vte.c	Sun Mar 16 12:41:17 2008
@@ -23,6 +23,8 @@
 #include "terminal-widget.h"
 
 #include <string.h>
+#include <X11/extensions/Xrender.h>
+
 #include <vte/vte.h>
 #include <gdk/gdkx.h>
 
@@ -631,7 +633,7 @@
 
       dpy = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
       has_render = (XRenderQueryExtension (dpy, &event_base, &error_base) &&
-		    (XRenderFindVisualFormat (dpy, DefaultVisual (dpy, DefaultScreen (dpy))) != 0));
+		    (XRenderFindVisualFormat (dpy, DefaultVisual (dpy, DefaultScreen (dpy))) != NULL));
 
       if (has_render)
 	vte_terminal_set_font (VTE_TERMINAL (widget), font_desc);

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Sun Mar 16 12:41:17 2008
@@ -1125,7 +1125,7 @@
                      0,
                      CopyFromParent,
                      CopyFromParent,
-                     CopyFromParent,
+                     (Visual *)CopyFromParent,
                      CWOverrideRedirect | CWEventMask,
                      &attrs);