Silence compiler warnings.

2006-04-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkscale.c (gtk_scale_get_layout_offsets): Silence
	compiler warnings.

	* gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
	dereference info before checking it for NULL.  (Coverity)
This commit is contained in:
Matthias Clasen
2006-04-11 18:06:33 +00:00
committed by Matthias Clasen
parent 7c2b1de418
commit a2c37df9ee
4 changed files with 21 additions and 2 deletions

View File

@@ -1,3 +1,11 @@
2006-04-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkscale.c (gtk_scale_get_layout_offsets): Silence
compiler warnings.
* gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
dereference info before checking it for NULL. (Coverity)
2006-04-07 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

View File

@@ -1,3 +1,11 @@
2006-04-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkscale.c (gtk_scale_get_layout_offsets): Silence
compiler warnings.
* gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
dereference info before checking it for NULL. (Coverity)
2006-04-07 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

View File

@@ -463,12 +463,14 @@ gtk_input_dialog_set_mapping_mode (GtkWidget *w,
{
GtkInputDialog *inputd = input_dialog_from_widget (w);
GdkDevice *info = inputd->current_device;
GdkInputMode old_mode = info->mode;
GdkInputMode old_mode;
GdkInputMode mode = GPOINTER_TO_INT (data);
if (!info)
return;
old_mode = info->mode;
if (mode != old_mode)
{
if (gdk_device_set_mode (info, mode))

View File

@@ -722,7 +722,8 @@ gtk_scale_get_layout_offsets (GtkScale *scale,
gint *x,
gint *y)
{
gint local_x, local_y;
gint local_x = 0;
gint local_y = 0;
g_return_if_fail (GTK_IS_SCALE (scale));