[gupnp] Service: Switch to g_uuid_string_random()
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp] Service: Switch to g_uuid_string_random()
- Date: Tue, 14 Jun 2022 06:14:11 +0000 (UTC)
commit 3b1fe5d0f36d13b3cd8980a1d5671aa43ede88f9
Author: Jens Georg <mail jensge org>
Date: Mon Jun 13 13:07:54 2022 +0200
Service: Switch to g_uuid_string_random()
libgupnp/gupnp-service.c | 9 ++---
libgupnp/meson.build | 2 +-
meson.build | 1 -
subprojects/guul/guul.c | 86 --------------------------------------------
subprojects/guul/guul.h | 34 ------------------
subprojects/guul/meson.build | 34 ------------------
6 files changed, 4 insertions(+), 162 deletions(-)
---
diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c
index d515a87..a24770a 100644
--- a/libgupnp/gupnp-service.c
+++ b/libgupnp/gupnp-service.c
@@ -26,11 +26,8 @@
#include "xml-util.h"
#include "gvalue-util.h"
-#include "guul.h"
-
#define SUBSCRIPTION_TIMEOUT 300 /* DLNA (7.2.22.1) enforced */
-
struct _GUPnPServicePrivate {
GUPnPRootDevice *root_device;
@@ -548,11 +545,12 @@ subscription_response (GUPnPService *service,
* Generate and return a new UUID.
*
* Returns: (transfer full): A newly generated UUID in string representation.
+ * Deprecated: 1.6. Use [func@GLib.uuid_string_random] instead.
*/
char *
gupnp_get_uuid (void)
{
- return guul_get_uuid ();
+ return g_uuid_string_random();
}
/* Generates a new SID */
@@ -562,8 +560,7 @@ generate_sid (void)
char *ret = NULL;
char *uuid;
-
- uuid = guul_get_uuid ();
+ uuid = g_uuid_string_random ();
ret = g_strconcat ("uuid:", uuid, NULL);
g_free (uuid);
diff --git a/libgupnp/meson.build b/libgupnp/meson.build
index 0582832..0d2f544 100644
--- a/libgupnp/meson.build
+++ b/libgupnp/meson.build
@@ -1,6 +1,6 @@
context_manager_impl = []
context_manager_args = []
-system_deps = [guul.get_variable('guul')]
+system_deps = []
if host_machine.system() == 'windows'
context_manager_impl += 'gupnp-windows-context-manager.c'
diff --git a/meson.build b/meson.build
index 6c70138..1195361 100644
--- a/meson.build
+++ b/meson.build
@@ -28,7 +28,6 @@ conf.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_2_70'.format(glib_version.un
conf.set('GLIB_VERSION_MAX_ALLOWED', 'GLIB_VERSION_2_70'.format(glib_version.underscorify()))
subdir('internal')
-guul = subproject('guul', default_options : ['default_library=static'])
gssdp_dep = dependency('gssdp-1.6', version : '>= 1.5.0', default_options: ['sniffer=false'], fallback:
'gssdp-1.6')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]