diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-08-27 04:23:04 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-27 04:23:04 +0000 |
| commit | a37a5febe87c5518e840e5194440df6e87dad421 (patch) | |
| tree | 50408fcb79858838062ae23134b5c4ee3f281ea0 | |
| parent | 50221cc0ea51e8764c9cd7c2528fae1a68451702 (diff) | |
| download | gdk-pixbuf-a37a5febe87c5518e840e5194440df6e87dad421.tar.gz | |
Don't warn when G_MAXLONG is passed as length.
2005-08-27 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn
when G_MAXLONG is passed as length.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gdk/x11/gdkproperty-x11.c | 7 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2005-08-27 Matthias Clasen <mclasen@redhat.com> + + * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn + when G_MAXLONG is passed as length. + 2005-08-26 Matthias Clasen <mclasen@redhat.com> * gtk/updateiconcache.c: Add a separate --ignore-theme-index option diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 64011f505..fc90fd3bf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-27 Matthias Clasen <mclasen@redhat.com> + + * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn + when G_MAXLONG is passed as length. + 2005-08-26 Matthias Clasen <mclasen@redhat.com> * gtk/updateiconcache.c: Add a separate --ignore-theme-index option diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index e1f5d77f0..8edafaa57 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -530,11 +530,8 @@ gdk_property_get (GdkWindow *window, */ get_length = length + 3; if (get_length > G_MAXLONG) - { - g_warning ("gdk_property_get(): length value has wrapped in calculation " - "(did you pass G_MAXLONG?)"); - get_length = G_MAXLONG; - } + get_length = G_MAXLONG; + /* To fail, either the user passed 0 or G_MAXULONG */ get_length = get_length / 4; if (get_length == 0) |