Merge with default.

Drop startup-notification option from Meson build also.

3 files changed, 14 insertions, 14 deletions

diff --git a/pidgin/libpurple/http.c b/pidgin/libpurple/http.c
index cd51980..7e18661 100644
--- a/pidgin/libpurple/http.c
+++ b/pidgin/libpurple/http.c
@@ -1782,7 +1782,7 @@ PurpleHttpConnection * purple_http_request(PurpleConnection *gc,
 
 	_purple_http_reconnect(hc);
 
-	hc->timeout_handle = purple_timeout_add_seconds(request->timeout,
+	hc->timeout_handle = g_timeout_add_seconds(request->timeout,
 		purple_http_request_timeout, hc);
 
 	return hc;
@@ -1822,9 +1822,9 @@ static PurpleHttpConnection * purple_http_connection_new(
 static void purple_http_connection_free(PurpleHttpConnection *hc)
 {
 	if (hc->timeout_handle)
-		purple_timeout_remove(hc->timeout_handle);
+		g_source_remove(hc->timeout_handle);
 	if (hc->watcher_delayed_handle)
-		purple_timeout_remove(hc->watcher_delayed_handle);
+		g_source_remove(hc->watcher_delayed_handle);
 
 	if (hc->connection_set != NULL)
 		purple_http_connection_set_remove(hc->connection_set, hc);
@@ -2011,14 +2011,14 @@ static void purple_http_conn_notify_progress_watcher(
 	{
 		if (hc->watcher_delayed_handle)
 			return;
-		hc->watcher_delayed_handle = purple_timeout_add_seconds(
+		hc->watcher_delayed_handle = g_timeout_add_seconds(
 			1 + hc->watcher_interval_threshold / 1000000,
 			purple_http_conn_notify_progress_watcher_timeout, hc);
 		return;
 	}
 
 	if (hc->watcher_delayed_handle)
-		purple_timeout_remove(hc->watcher_delayed_handle);
+		g_source_remove(hc->watcher_delayed_handle);
 	hc->watcher_delayed_handle = 0;
 
 	hc->watcher_last_call = now;
@@ -2275,7 +2275,7 @@ purple_http_keepalive_host_free(gpointer _host)
 		(GDestroyNotify)purple_http_socket_close_free);
 
 	if (host->process_queue_timeout > 0) {
-		purple_timeout_remove(host->process_queue_timeout);
+		g_source_remove(host->process_queue_timeout);
 		host->process_queue_timeout = 0;
 	}
 
@@ -2475,7 +2475,7 @@ purple_http_keepalive_host_process_queue(PurpleHttpKeepaliveHost *host)
 	if (host->process_queue_timeout > 0)
 		return;
 
-	host->process_queue_timeout = purple_timeout_add(0,
+	host->process_queue_timeout = g_timeout_add(0,
 		_purple_http_keepalive_host_process_queue_cb, host);
 }
 
diff --git a/pidgin/libpurple/protocols/facebook/data.c b/pidgin/libpurple/protocols/facebook/data.c
index bf722a8..fe32404 100644
--- a/pidgin/libpurple/protocols/facebook/data.c
+++ b/pidgin/libpurple/protocols/facebook/data.c
@@ -73,7 +73,7 @@ fb_data_dispose(GObject *obj)
 	g_hash_table_iter_init(&iter, priv->evs);
 
 	while (g_hash_table_iter_next(&iter, NULL, &ptr)) {
-		purple_timeout_remove(GPOINTER_TO_UINT(ptr));
+		g_source_remove(GPOINTER_TO_UINT(ptr));
 	}
 
 	if (G_LIKELY(priv->api != NULL)) {
@@ -284,7 +284,7 @@ fb_data_add_timeout(FbData *fata, const gchar *name, guint interval,
 	fb_data_clear_timeout(fata, name, TRUE);
 
 	key = g_strdup(name);
-	id = purple_timeout_add(interval, func, data);
+	id = g_timeout_add(interval, func, data);
 	g_hash_table_replace(priv->evs, key, GUINT_TO_POINTER(id));
 }
 
@@ -302,7 +302,7 @@ fb_data_clear_timeout(FbData *fata, const gchar *name, gboolean remove)
 	id = GPOINTER_TO_UINT(ptr);
 
 	if ((id > 0) && remove) {
-		purple_timeout_remove(id);
+		g_source_remove(id);
 	}
 
 	g_hash_table_remove(priv->evs, name);
diff --git a/pidgin/libpurple/protocols/facebook/mqtt.c b/pidgin/libpurple/protocols/facebook/mqtt.c
index caa007f..da279cb 100644
--- a/pidgin/libpurple/protocols/facebook/mqtt.c
+++ b/pidgin/libpurple/protocols/facebook/mqtt.c
@@ -225,7 +225,7 @@ fb_mqtt_close(FbMqtt *mqtt)
 	priv = mqtt->priv;
 
 	if (priv->tev > 0) {
-		purple_timeout_remove(priv->tev);
+		g_source_remove(priv->tev);
 		priv->tev = 0;
 	}
 
@@ -300,7 +300,7 @@ fb_mqtt_timeout_clear(FbMqtt *mqtt)
 	FbMqttPrivate *priv = mqtt->priv;
 
 	if (priv->tev > 0) {
-		purple_timeout_remove(priv->tev);
+		g_source_remove(priv->tev);
 		priv->tev = 0;
 	}
 }
@@ -311,7 +311,7 @@ fb_mqtt_timeout(FbMqtt *mqtt)
 	FbMqttPrivate *priv = mqtt->priv;
 
 	fb_mqtt_timeout_clear(mqtt);
-	priv->tev = purple_timeout_add(FB_MQTT_TIMEOUT_CONN,
+	priv->tev = g_timeout_add(FB_MQTT_TIMEOUT_CONN,
 	                               fb_mqtt_cb_timeout, mqtt);
 }
 
@@ -337,7 +337,7 @@ fb_mqtt_ping(FbMqtt *mqtt)
 	FbMqttPrivate *priv = mqtt->priv;
 
 	fb_mqtt_timeout_clear(mqtt);
-	priv->tev = purple_timeout_add(FB_MQTT_TIMEOUT_PING,
+	priv->tev = g_timeout_add(FB_MQTT_TIMEOUT_PING,
 	                               fb_mqtt_cb_ping, mqtt);
 }