Mercurial > pidgin3 / changeset

--- a/ChangeLog.API	Mon Nov 04 02:36:50 2019 -0500
+++ b/ChangeLog.API	Mon Nov 04 02:41:10 2019 -0500
@@ -417,6 +417,7 @@
 		  event loop yourself. See GLib Main Event Loop docs.
 		* PurpleEventLoopUiOps. Manually drive the GLib event loop
 		  yourself. See GLib Main Event Loop docs.
+		* purple_get_host_name. Use g_get_host_name, instead.
 		* purple_get_tzoff_str(). Use g_date_time_format, instead.
 		* purple_ip_address_is_valid, purple_ipv4_address_is_valid, and
 		  purple_ipv6_address_is_valid. Use g_hostname_is_ip_address()

--- a/libpurple/protocols/bonjour/mdns_dns_sd.c	Mon Nov 04 02:36:50 2019 -0500
+++ b/libpurple/protocols/bonjour/mdns_dns_sd.c	Mon Nov 04 02:41:10 2019 -0500
@@ -460,7 +460,7 @@
 gboolean _mdns_init_session(BonjourDnsSd *data) {
 	data->mdns_impl_data = g_new0(Win32SessionImplData, 1);
 
-	bonjour_dns_sd_set_jid(data->account, purple_get_host_name());
+	bonjour_dns_sd_set_jid(data->account, g_get_host_name());
 
 	return TRUE;
 }

--- a/libpurple/protocols/gg/edisc.c	Mon Nov 04 02:36:50 2019 -0500
+++ b/libpurple/protocols/gg/edisc.c	Mon Nov 04 02:41:10 2019 -0500
@@ -358,15 +358,14 @@
 	msg = soup_message_new("PUT", "https://drive.mpa.gg.pl/signin");
 	ggp_edisc_set_defaults(msg);
 
-	metadata =
-	        g_strdup_printf("{"
-	                        "\"id\": \"%032x\", "
-	                        "\"name\": \"%s\", "
-	                        "\"os_version\": \"" GGP_EDISC_OS "\", "
-	                        "\"client_version\": \"%s\", "
-	                        "\"type\": \"" GGP_EDISC_TYPE "\"}",
-	                        g_random_int_range(1, 1 << 16),
-	                        purple_get_host_name(), ggp_libgaduw_version(gc));
+	metadata = g_strdup_printf("{"
+	                           "\"id\": \"%032x\", "
+	                           "\"name\": \"%s\", "
+	                           "\"os_version\": \"" GGP_EDISC_OS "\", "
+	                           "\"client_version\": \"%s\", "
+	                           "\"type\": \"" GGP_EDISC_TYPE "\"}",
+	                           g_random_int_range(1, 1 << 16),
+	                           g_get_host_name(), ggp_libgaduw_version(gc));
 
 	tmp = g_strdup_printf("IMToken %s", imtoken);
 	soup_message_headers_replace(msg->request_headers, "Authorization", tmp);

--- a/libpurple/util.c	Mon Nov 04 02:36:50 2019 -0500
+++ b/libpurple/util.c	Mon Nov 04 02:41:10 2019 -0500
@@ -3769,12 +3769,6 @@
 	return g_string_free(string, FALSE);
 }
 
-const gchar *
-purple_get_host_name(void)
-{
-	return g_get_host_name();
-}
-
 gchar *
 purple_uuid_random(void)
 {

--- a/libpurple/util.h	Mon Nov 04 02:36:50 2019 -0500
+++ b/libpurple/util.h	Mon Nov 04 02:41:10 2019 -0500
@@ -1320,16 +1320,6 @@
 void purple_restore_default_signal_handlers(void);
 
 /**
- * purple_get_host_name:
- *
- * Gets the host name of the machine. If it not possible to determine the
- * host name, "localhost" is returned
- *
- * Returns: The hostname
- */
-const gchar *purple_get_host_name(void);
-
-/**
  * purple_uuid_random:
  *
  * Returns a type 4 (random) UUID