Ticket #26122: patch-optout-uuid.diff

configure.ac

@@ -273 +273 @@
 AC_SUBST(NICE_CFLAGS)
 AC_SUBST(NICE_LIBS)
 
-PKG_CHECK_MODULES([UUID], [uuid])
-AC_SUBST([UUID_CFLAGS])
-AC_SUBST([UUID_LIBS])
+dnl Check for libuuid
+PKG_CHECK_MODULES([UUID], [uuid], [HAVE_UUID=yes], [HAVE_UUID=no])
+if test x"$HAVE_UUID" = xyes; then
+  AC_SUBST([UUID_CFLAGS])
+  AC_SUBST([UUID_LIBS])
+  AC_DEFINE([HAVE_UUID], [1], [Define if libuuid is available])
+else
+  AC_MSG_WARN([libuuid not found, falling back to generating random IDs])
+fi
 
 dnl Check for MCE, a Maemo service used by Gabble to determine when the device
 dnl is idle.

src/util.c

@@ -36 +36 @@
 
 #include <extensions/extensions.h>
 
-#include <uuid.h>
+#ifdef HAVE_UUID
+# include <uuid.h>
+#endif
 
 #define DEBUG_FLAG GABBLE_DEBUG_JID
 
@@ -84 +86 @@
 gabble_generate_id (void)
 {
   /* generate random UUIDs */
-  uuid_t uu;
   gchar *str;
 
   str = g_new0 (gchar, 37);
-  uuid_generate_random (uu);
-  uuid_unparse_lower (uu, str);
-  return str;
+
+#ifdef HAVE_UUID
+    {
+      uuid_t uu;
+
+      uuid_generate_random (uu);
+      uuid_unparse_lower (uu, str);
+    }
+#else
+    {
+      const char *hex = "0123456789abcdef";
+      int i;
+
+      for (i = 0; i < 36; i++)
+        str[i] =  hex[g_random_int_range (0, 16)];
+
+      str[8] = str[13] = str[18] = str[23] = '-';
+    }
+#endif
+
+   return str;
 }
 
 static void