diff -up file-roller-2.28.1/src/fr-window.c.property-get file-roller-2.28.1/src/fr-window.c --- file-roller-2.28.1/src/fr-window.c.property-get 2009-12-14 00:59:59.792797354 -0500 +++ file-roller-2.28.1/src/fr-window.c 2009-12-14 01:01:49.141546600 -0500 @@ -4138,13 +4138,14 @@ get_xds_atom_value (GdkDragContext *cont g_return_val_if_fail (context != NULL, NULL); g_return_val_if_fail (context->source_window != NULL, NULL); - gdk_property_get (context->source_window, - XDS_ATOM, TEXT_ATOM, - 0, MAX_XDS_ATOM_VAL_LEN, - FALSE, NULL, NULL, NULL, - (unsigned char **) &ret); + if (gdk_property_get (context->source_window, + XDS_ATOM, TEXT_ATOM, + 0, MAX_XDS_ATOM_VAL_LEN, + FALSE, NULL, NULL, NULL, + (unsigned char **) &ret)) + return ret; - return ret; + return NULL; }