Sync up to upstream 2.25.144

Conflicts:

	configure.in
	src/core/main.c
	src/core/prefs.c
	src/core/window.c
	src/include/prefs.h

src/ui/ui.c

@@ -672,10 +672,12 @@ meta_text_property_to_utf8 (Display             *xdisplay,
                                           &list);
 
   if (count == 0)
-    return NULL;
-
+    retval = NULL;
+  else
+    {
   retval = list[0];
   list[0] = g_strdup (""); /* something to free */
+    }
   
   g_strfreev (list);