From 79155d665c767e5b90e0a2c1df6cb3bf95cd8ade Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 22 Feb 2013 10:36:13 +0100 Subject: [PATCH] Bump reqired GLib version to 2.32. And use more GHashTable-as-a-set functions. --- configure.ac | 6 +++--- libgssdp/gssdp-resource-browser.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index d92f8c3..81527f5 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,9 @@ AC_HEADER_STDC LT_PREREQ([2.2]) LT_INIT -PKG_CHECK_MODULES(LIBGSSDP, glib-2.0 >= 2.22 \ - gobject-2.0 >= 2.22 \ - gio-2.0 >= 2.22 \ +PKG_CHECK_MODULES(LIBGSSDP, glib-2.0 >= 2.32 \ + gobject-2.0 >= 2.32 \ + gio-2.0 >= 2.32 \ libsoup-2.4 >= 2.26.1) LIBGTK_REQUIRED=2.12.0 diff --git a/libgssdp/gssdp-resource-browser.c b/libgssdp/gssdp-resource-browser.c index b0cf76c..b4ca354 100644 --- a/libgssdp/gssdp-resource-browser.c +++ b/libgssdp/gssdp-resource-browser.c @@ -685,10 +685,8 @@ resource_available (GSSDPResourceBrowser *resource_browser, /* Put usn into fresh resources, so this resource will not be * removed on cache refreshing. */ if (resource_browser->priv->fresh_resources != NULL) { - char *usn_copy = g_strdup (canonical_usn); - g_hash_table_add (resource_browser->priv->fresh_resources, - usn_copy); + g_strdup (canonical_usn)); } if (resource) { @@ -1144,7 +1142,7 @@ refresh_cache_helper (gpointer key, gpointer value, gpointer data) resource = value; fresh_resources = data; - if (g_hash_table_lookup_extended (fresh_resources, key, NULL, NULL)) + if (g_hash_table_contains (fresh_resources, key)) return FALSE; else { g_signal_emit (resource->resource_browser, -- 2.7.4