Warning fixes.

diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c
index 886782687268501278c2775df5eb97aee2abe104..3384ad49bd7933971ea6284524af51b76c72388f 100644 (file)
--- a/gdk/linux-fb/gdkdrawable-fb2.c
+++ b/gdk/linux-fb/gdkdrawable-fb2.c
@@ -306,6 +306,10 @@ gdk_fb_fill_span(GdkDrawable *drawable, GdkGC *gc, GdkSegment *cur, GdkColor *co
       GdkFunction func = GDK_GC_FBDATA(gc)->values.function;
 
       cmask = GDK_GC_FBDATA(gc)->values.clip_mask;
+      clipxoff = clipyoff = tsxoff = tsyoff = 0;
+      mask_rowstride = 0;
+      solid_stipple = FALSE;
+      clipmem = NULL;
       if(cmask)
        {
          clipmem = GDK_DRAWABLE_IMPL_FBDATA(cmask)->mem;

diff --git a/gdk/linux-fb/gdkfont-fb.c b/gdk/linux-fb/gdkfont-fb.c
index 0bc0e4d86647631d9475a2c48fb6f6969b4f07fd..e55f477905d6a8b38ff34d0850e4b6edbcac4e32 100644 (file)
--- a/gdk/linux-fb/gdkfont-fb.c
+++ b/gdk/linux-fb/gdkfont-fb.c
@@ -26,6 +26,7 @@
 
 #include <math.h>
 #include <stdlib.h>
+#include <string.h>
 #include "gdkfont.h"
 #include "gdkprivate-fb.h"
 #include "gdkpango.h"

diff --git a/gdk/linux-fb/gdkgc-fb.c b/gdk/linux-fb/gdkgc-fb.c
index 5c751825214bbc3d8efc3a7c13bf3ed7fa6b3793..3e166cf81f0c70df7ccc1ea1ca35c82e921a529d 100644 (file)
--- a/gdk/linux-fb/gdkgc-fb.c
+++ b/gdk/linux-fb/gdkgc-fb.c
@@ -1,3 +1,6 @@
+#include <string.h>
+#include <stdlib.h>
+
 #include "gdkprivate-fb.h"
 #include "gdkgc.h"
 #include "gdkfb.h"

diff --git a/gdk/linux-fb/gdkimage-fb.c b/gdk/linux-fb/gdkimage-fb.c
index 3eb994fc58cf86e2f685495df1cdd0a176fd5878..717e1896f0d3e57f1e93f17093b3c892150fd746 100644 (file)
--- a/gdk/linux-fb/gdkimage-fb.c
+++ b/gdk/linux-fb/gdkimage-fb.c
@@ -33,6 +33,7 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
+#include <string.h>
 
 #include "gdk.h"
 #include "gdkimage.h"

diff --git a/gdk/linux-fb/gdkinput-ps2.c b/gdk/linux-fb/gdkinput-ps2.c
index 35f088fb9c36ea18b224f4cbc09cf9e1cbad06ef..cc4ddb2828d2708f1fa9924f7aa877f44ba00224 100644 (file)
--- a/gdk/linux-fb/gdkinput-ps2.c
+++ b/gdk/linux-fb/gdkinput-ps2.c
@@ -32,6 +32,7 @@
 #include <sys/kd.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <string.h>
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
@@ -483,10 +484,14 @@ handle_input(GIOChannel *gioc, GIOCondition cond, gpointer data)
   int n, left, dx=0, dy=0;
   PS2Mouse *mouse = data;
   gboolean new_button1, new_button2, new_button3;
-  time_t the_time = g_latest_time.tv_sec;
+  time_t the_time;
+  GTimeVal curtime;
   GdkWindow *mousewin;
   gboolean got_motion = FALSE;
 
+  g_get_current_time(&curtime);
+  the_time = curtime.tv_usec;
+
   while(1) /* Go through as many mouse events as we can */
     {
       for(left = sizeof(buf); left > 0; )
@@ -1036,13 +1041,15 @@ handle_keyboard_input(GIOChannel *gioc, GIOCondition cond, gpointer data)
   int i, n;
   Keyboard *k = data;
   time_t now;
+  GTimeVal curtime;
 
   n = read(k->fd, buf, sizeof(buf));
   if(n <= 0)
     g_error("Nothing from keyboard!");
 
   /* Now turn this into a keyboard event */
-  now = g_latest_time.tv_sec;
+  g_get_current_time(&curtime);
+  now = curtime.tv_sec;
 
   for(i = 0; i < n; i++)
     {

diff --git a/gdk/linux-fb/gdkmain-fb.c b/gdk/linux-fb/gdkmain-fb.c
index e2b48c473dbedf8b84974111000f7a8f66a974f4..f506537c377e9c02e22e9a413f52eaf97cb27b50 100644 (file)
--- a/gdk/linux-fb/gdkmain-fb.c
+++ b/gdk/linux-fb/gdkmain-fb.c
@@ -571,7 +571,15 @@ gdk_event_make(GdkWindow *window, GdkEventType type, gboolean append_to_queue)
   if(evmask & type_masks[type])
     {
       GdkEvent *event = gdk_event_new();
+#if 0
       guint32 the_time = g_latest_time.tv_sec * 1000 + g_latest_time.tv_usec / 1000;
+#else
+      guint32 the_time;
+      GTimeVal gcurtime;
+
+       g_get_current_time(&gcurtime);
+       the_time = gcurtime.tv_sec * 1000 + gcurtime.tv_usec / 1000;
+#endif
 
       event->any.type = type;
       event->any.window = gdk_window_ref(window);

diff --git a/gdk/linux-fb/gdkpango-fb.c b/gdk/linux-fb/gdkpango-fb.c
index 785b53c1c2a72f6d73655c911cbf8a9d78252391..08c005dd6dd7b685a61e9bbdd28f70effa0fcaa5 100644 (file)
--- a/gdk/linux-fb/gdkpango-fb.c
+++ b/gdk/linux-fb/gdkpango-fb.c
@@ -111,7 +111,7 @@ pango_fb_font_map_load_font(PangoFontMap *fontmap,
 {
   PangoFBFontMap *fbfm = (PangoFBFontMap *)fontmap;
   PangoFBFont *retval;
-  PangoFBFontListing *fl;
+  PangoFBFontListing *fl = NULL;
   int i;
   PangoFontDescription d2;
 

diff --git a/gdk/linux-fb/gdkproperty-fb.c b/gdk/linux-fb/gdkproperty-fb.c
index 12cdec9eeaf11b20a442f10480b3ec90aff64951..f32f78a93b9232d17a7961ecec11eb47a49365c4 100644 (file)
--- a/gdk/linux-fb/gdkproperty-fb.c
+++ b/gdk/linux-fb/gdkproperty-fb.c
@@ -145,7 +145,7 @@ gdk_property_change (GdkWindow   *window,
 {
   GdkWindowFBData *fbd = GDK_WINDOW_FBDATA(window);
   GdkWindowProperty *prop, *new_prop;
-  int new_size;
+  int new_size = 0;
   GdkEvent *event;
 
   g_return_if_fail (window != NULL);

diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c
index 8f7f544db3c5ad9d7ecba97226582e5a547165ee..5b0e9c69200d57aa3ef2d9a04f3901d23c38fceb 100644 (file)
--- a/gdk/linux-fb/gdkwindow-fb.c
+++ b/gdk/linux-fb/gdkwindow-fb.c
@@ -784,7 +784,7 @@ gdk_fb_window_move_resize (GdkWindow *window,
 
   if (!private->destroyed)
     {
-      GdkRegion *old_region;
+      GdkRegion *old_region = NULL;
       GdkRectangle old_rect;
 
       if(private->input_only)