Fix libravatar depending on auto_configure_service in a synchronous manner.

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index e2c0a71554ca6eb416e130899307c7640f8f3ecb..4b227e70709d16b9f81547ab3d2d6e8ab4b043fd 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1984,4 +1984,44 @@ void auto_configure_service(AutoConfigureData *data)
                                        data->cancel, resolve_done, data);
        }
 }
                                        data->cancel, resolve_done, data);
        }
 }

+
+gboolean auto_configure_service_sync(const gchar *service, const gchar *domain, gchar **srvhost, guint16 *srvport)
+{
+       GResolver *resolver;
+       GList *answers, *cur;
+       GError *error = NULL;
+       gboolean result = FALSE;
+
+       cm_return_val_if_fail(service != NULL, FALSE);
+       cm_return_val_if_fail(domain != NULL, FALSE);
+
+       resolver = g_resolver_get_default();
+       if (resolver == NULL)
+               return FALSE;
+
+       answers = g_resolver_lookup_service(resolver, service, "tcp", domain, NULL, &error);
+
+       *srvhost = NULL;
+       *srvport = 0;
+
+       if (answers) {
+               for (cur = g_srv_target_list_sort(answers); cur; cur = cur->next) {
+                       GSrvTarget *target = (GSrvTarget *)cur->data;
+                       const gchar *hostname = g_srv_target_get_hostname(target);
+                       guint16 port = g_srv_target_get_port(target);
+                       if (hostname && strcmp(hostname,"") && port > 0) {
+                               result = TRUE;
+                               *srvhost = g_strdup(hostname);
+                               *srvport = port;
+                               break;
+                       }
+               }
+               g_resolver_free_targets(answers);
+       } else if (error) {
+               g_error_free(error);
+       }
+
+       g_object_unref(resolver);
+       return result;
+}

 #endif
\ No newline at end of file
 #endif
\ No newline at end of file

diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 8c3849ff3d2e5451c3a8852b14fd1f226a8d7546..39a8a32fafba5d5101f7ccdb7a0afe1f2600c0bc 100644 (file)
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -231,6 +231,7 @@ typedef struct _AutoConfigureData {
 } AutoConfigureData;
 
 void auto_configure_service(AutoConfigureData *data);
 } AutoConfigureData;
 
 void auto_configure_service(AutoConfigureData *data);

+gboolean auto_configure_service_sync(const gchar *service, const gchar *domain, gchar **srvhost, guint16 *srvport);

 #endif
 
 
 #endif
 
 

diff --git a/src/plugins/libravatar/libravatar_federation.c b/src/plugins/libravatar/libravatar_federation.c
index 106fdfbad830c0c5b204bfa19b3f43d71fd4a791..aee618e82329bac2e0b72270aef3f6e1b762aace 100644 (file)
--- a/src/plugins/libravatar/libravatar_federation.c
+++ b/src/plugins/libravatar/libravatar_federation.c
@@ -111,14 +111,14 @@ gchar *federated_url_for_address(const gchar *address)
        }
 
        /* not cached, try secure service first */
        }
 
        /* not cached, try secure service first */

-       if (auto_configure_service("avatars-sec", domain, &host, &port)) {
+       if (auto_configure_service_sync("avatars-sec", domain, &host, &port)) {

                if (port != 443) {
                        url = g_strdup_printf("https://%s:%d/avatar", host, port);
                } else {
                        url = g_strdup_printf("https://%s/avatar", host);
                }
        } else { /* try standard one if no secure service available */
                if (port != 443) {
                        url = g_strdup_printf("https://%s:%d/avatar", host, port);
                } else {
                        url = g_strdup_printf("https://%s/avatar", host);
                }
        } else { /* try standard one if no secure service available */

-               if (auto_configure_service("avatars", domain, &host, &port)) {
+               if (auto_configure_service_sync("avatars", domain, &host, &port)) {

                        if (port != 80) {
                                url = g_strdup_printf("http://%s:%d/avatar", host, port);
                        } else {
                        if (port != 80) {
                                url = g_strdup_printf("http://%s:%d/avatar", host, port);
                        } else {