diff options
| author | Tim Janik <timj@gtk.org> | 1998-07-04 15:31:30 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-07-04 15:31:30 +0000 |
| commit | 90408c4641e6493913eb859a67b3965bca259558 (patch) | |
| tree | acdf9e671a8ca1307bb24099ce90ad59d1ac3185 /gdk/gdkproperty.c | |
| parent | c2eb7c28fe37ac83facf071451c4c2699e76cf1d (diff) | |
| download | gtk+-90408c4641e6493913eb859a67b3965bca259558.tar.gz | |
changed reversed_[12] to reserved_[12] in gtk_*_get_type functions.
Sat Jul 4 13:16:24 1998 Tim Janik <timj@gtk.org>
* gtk/*.c: changed reversed_[12] to reserved_[12] in gtk_*_get_type
functions.
* gdk/gdkwindow.c:
* gdk/gdkvisual.c: check for some pointer values to be != NULL, prior
to XFree() calls.
Diffstat (limited to 'gdk/gdkproperty.c')
| -rw-r--r-- | gdk/gdkproperty.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gdk/gdkproperty.c b/gdk/gdkproperty.c index 36e3c22024..38665ca0c4 100644 --- a/gdk/gdkproperty.c +++ b/gdk/gdkproperty.c @@ -46,12 +46,16 @@ gdk_atom_name (GdkAtom atom) if (gdk_error_code == -1) { + if (t) + XFree (t); + return NULL; } else { name = g_strdup (t); - XFree (t); + if (t) + XFree (t); return name; } @@ -95,6 +99,7 @@ gdk_property_get (GdkWindow *window, xwindow = gdk_root_window; } + ret_data = NULL; XGetWindowProperty (xdisplay, xwindow, property, offset, (length + 3) / 4, pdelete, type, &ret_prop_type, &ret_format, @@ -113,6 +118,7 @@ gdk_property_get (GdkWindow *window, if (ret_prop_type != type) { gchar *rn, *pn; + XFree (ret_data); rn = gdk_atom_name(ret_prop_type); pn = gdk_atom_name(type); |