--- a/libpurple/buddy.c Thu Apr 11 20:55:27 2024 -0500
+++ b/libpurple/buddy.c Thu Apr 11 20:58:14 2024 -0500
@@ -23,7 +23,6 @@
-#include "purplebuddypresence.h" #include "purplecontactmanager.h"
#include "purpleconversationmanager.h"
#include "purpleprotocolclient.h"
@@ -191,7 +190,7 @@
- priv->presence = PURPLE_PRESENCE(purple_buddy_presence_new(buddy));+ priv->presence = purple_presence_new(); purple_presence_set_status_active(priv->presence, "offline", TRUE);
purple_blist_new_node(purple_blist_get_default(),
--- a/libpurple/contact.c Thu Apr 11 20:55:27 2024 -0500
+++ b/libpurple/contact.c Thu Apr 11 20:58:14 2024 -0500
@@ -22,7 +22,6 @@
-#include "purplebuddypresence.h" #include "purpleconversationmanager.h"
#include "purpleprivate.h"
@@ -82,9 +81,9 @@
if (purple_account_is_connected(purple_buddy_get_account(new_priority)))
- cmp = purple_buddy_presence_compare(- PURPLE_BUDDY_PRESENCE(purple_buddy_get_presence(new_priority)),- PURPLE_BUDDY_PRESENCE(purple_buddy_get_presence(buddy)));+ cmp = purple_presence_compare( + purple_buddy_get_presence(new_priority), + purple_buddy_get_presence(buddy)); if (cmp > 0 || (cmp == 0 &&
purple_prefs_get_bool("/purple/contact/last_match")))
--- a/libpurple/meson.build Thu Apr 11 20:55:27 2024 -0500
+++ b/libpurple/meson.build Thu Apr 11 20:58:14 2024 -0500
@@ -41,7 +41,6 @@
'purpleauthorizationrequest.c',
'purpleauthorizationrequestnotification.c',
- 'purplebuddypresence.c', 'purplechanneljoindetails.c',
'purplechatconversation.c',
@@ -166,7 +165,6 @@
'purpleauthorizationrequest.h',
'purpleauthorizationrequestnotification.h',
- 'purplebuddypresence.h', 'purplechanneljoindetails.h',
'purplechatconversation.h',
--- a/libpurple/purplebuddypresence.c Thu Apr 11 20:55:27 2024 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,287 +0,0 @@
- * Purple - Internet Messaging Library- * Copyright (C) Pidgin Developers <devel@pidgin.im>- * Purple is the legal property of its developers, whose names are too numerous- * to list here. Please refer to the COPYRIGHT file distributed with this- * This library is free software; you can redistribute it and/or modify it- * under the terms of the GNU General Public License as published by the Free- * Software Foundation; either version 2 of the License, or (at your option)- * This library is distributed in the hope that it will be useful, but WITHOUT- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for- * You should have received a copy of the GNU General Public License along with- * this library; if not, see <https://www.gnu.org/licenses/>.-#include <glib/gi18n-lib.h>-#include "purplebuddypresence.h"-#include "purpleprivate.h"-struct _PurpleBuddyPresence {-static GParamSpec *properties[N_PROPERTIES] = {NULL, };-/******************************************************************************- *****************************************************************************/-purple_buddy_presence_set_buddy(PurpleBuddyPresence *presence,- if(g_set_object(&presence->buddy, buddy)) {- g_object_notify_by_pspec(G_OBJECT(presence), properties[PROP_BUDDY]);-purple_buddy_presence_compute_score(PurpleBuddyPresence *buddy_presence)- PurplePresence *presence = PURPLE_PRESENCE(buddy_presence);- PurpleBuddy *b = purple_buddy_presence_get_buddy(buddy_presence);- int *primitive_scores = _purple_statuses_get_primitive_scores();- int offline_score = purple_prefs_get_int("/purple/status/scores/offline_msg");- int idle_score = purple_prefs_get_int("/purple/status/scores/idle");- for (l = purple_presence_get_statuses(presence); l != NULL; l = l->next) {- PurpleStatus *status = (PurpleStatus *)l->data;- PurpleStatusType *type = purple_status_get_status_type(status);- if (purple_status_is_active(status)) {- score += primitive_scores[purple_status_type_get_primitive(type)];- if (!purple_status_is_online(status)) {- if (b && purple_account_supports_offline_message(purple_buddy_get_account(b), b))- score += offline_score;- score += purple_account_get_int(purple_buddy_get_account(b), "score", 0);- if (purple_presence_is_idle(presence))-purple_buddy_presence_compare(PurpleBuddyPresence *buddy_presence1,- PurpleBuddyPresence *buddy_presence2)- PurplePresence *presence1 = PURPLE_PRESENCE(buddy_presence1);- PurplePresence *presence2 = PURPLE_PRESENCE(buddy_presence2);- GTimeSpan idle1, idle2;- int score1 = 0, score2 = 0;- int idle_time_score = purple_prefs_get_int("/purple/status/scores/idle_time");- if (presence1 == presence2)- else if (presence1 == NULL)- else if (presence2 == NULL)- if (purple_presence_is_online(presence1) &&- !purple_presence_is_online(presence2))- else if (purple_presence_is_online(presence2) &&- !purple_presence_is_online(presence1))- /* Compute the score of the first set of statuses. */- score1 = purple_buddy_presence_compute_score(buddy_presence1);- /* Compute the score of the second set of statuses. */- score2 = purple_buddy_presence_compute_score(buddy_presence2);- now = g_date_time_new_now_local();- idle1 = g_date_time_difference(now,- purple_presence_get_idle_time(presence1));- idle2 = g_date_time_difference(now,- purple_presence_get_idle_time(presence2));- g_date_time_unref(now);- score1 += idle_time_score;- } else if (idle1 < idle2) {- score2 += idle_time_score;- else if (score1 > score2)-/******************************************************************************- * PurplePresence Implementation- *****************************************************************************/-purple_buddy_presence_update_idle(PurplePresence *presence, gboolean old_idle)- PurpleBuddy *buddy = purple_buddy_presence_get_buddy(PURPLE_BUDDY_PRESENCE(presence));- GDateTime *current_time = g_date_time_new_now_utc();- gboolean idle = purple_presence_is_idle(presence);- purple_signal_emit(purple_blist_get_handle(), "buddy-idle-changed", buddy,- purple_meta_contact_invalidate_priority_buddy(purple_buddy_get_contact(buddy));- /* Should this be done here? It'd perhaps make more sense to- * connect to buddy-[un]idle signals and update from there- purple_blist_update_node(purple_blist_get_default(),- PURPLE_BLIST_NODE(buddy));- g_date_time_unref(current_time);-purple_buddy_presence_get_statuses(PurplePresence *presence) {- PurpleBuddyPresence *buddy_presence = NULL;- buddy_presence = PURPLE_BUDDY_PRESENCE(presence);- /* We cache purple_protocol_get_statuses because it creates all new- * statuses which loses at least the active attribute, which breaks all- if(buddy_presence->statuses == NULL) {- PurpleAccount *account = NULL;- account = purple_buddy_get_account(buddy_presence->buddy);- buddy_presence->statuses = purple_protocol_get_statuses(account,- return buddy_presence->statuses;-/******************************************************************************- * GObject Implementation- *****************************************************************************/-G_DEFINE_FINAL_TYPE(PurpleBuddyPresence, purple_buddy_presence,-purple_buddy_presence_set_property(GObject *obj, guint param_id,- const GValue *value, GParamSpec *pspec)- PurpleBuddyPresence *presence = PURPLE_BUDDY_PRESENCE(obj);- purple_buddy_presence_set_buddy(presence,- g_value_get_object(value));- G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);-purple_buddy_presence_get_property(GObject *obj, guint param_id, GValue *value,- PurpleBuddyPresence *presence = PURPLE_BUDDY_PRESENCE(obj);- g_value_set_object(value,- purple_buddy_presence_get_buddy(presence));- G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);-purple_buddy_presence_finalize(GObject *obj) {- PurpleBuddyPresence *presence = PURPLE_BUDDY_PRESENCE(obj);- g_clear_object(&presence->buddy);- g_list_free_full(presence->statuses, g_object_unref);- G_OBJECT_CLASS(purple_buddy_presence_parent_class)->finalize(obj);-purple_buddy_presence_init(G_GNUC_UNUSED PurpleBuddyPresence *presence) {-purple_buddy_presence_class_init(PurpleBuddyPresenceClass *klass) {- GObjectClass *obj_class = G_OBJECT_CLASS(klass);- PurplePresenceClass *presence_class = PURPLE_PRESENCE_CLASS(klass);- obj_class->get_property = purple_buddy_presence_get_property;- obj_class->set_property = purple_buddy_presence_set_property;- obj_class->finalize = purple_buddy_presence_finalize;- presence_class->update_idle = purple_buddy_presence_update_idle;- presence_class->get_statuses = purple_buddy_presence_get_statuses;- * PurpleBuddyPresence:buddy:- * The buddy for this presence.- properties[PROP_BUDDY] = g_param_spec_object(- "The buddy for this presence.",- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);- g_object_class_install_properties(obj_class, N_PROPERTIES, properties);-/******************************************************************************- *****************************************************************************/-purple_buddy_presence_new(PurpleBuddy *buddy) {- g_return_val_if_fail(PURPLE_IS_BUDDY(buddy), NULL);- PURPLE_TYPE_BUDDY_PRESENCE,-purple_buddy_presence_get_buddy(PurpleBuddyPresence *presence) {- g_return_val_if_fail(PURPLE_IS_BUDDY_PRESENCE(presence), NULL);- return presence->buddy;--- a/libpurple/purplebuddypresence.h Thu Apr 11 20:55:27 2024 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
- * Purple - Internet Messaging Library- * Copyright (C) Pidgin Developers <devel@pidgin.im>- * Purple is the legal property of its developers, whose names are too numerous- * to list here. Please refer to the COPYRIGHT file distributed with this- * This library is free software; you can redistribute it and/or modify it- * under the terms of the GNU General Public License as published by the Free- * Software Foundation; either version 2 of the License, or (at your option)- * This library is distributed in the hope that it will be useful, but WITHOUT- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for- * You should have received a copy of the GNU General Public License along with- * this library; if not, see <https://www.gnu.org/licenses/>.-#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)-# error "only <purple.h> may be included directly"-#ifndef PURPLE_BUDDY_PRESENCE_H-#define PURPLE_BUDDY_PRESENCE_H-#include "purplepresence.h"-#include "purpleversion.h"- * A #PurpleBuddyPresence represent the #PurplePresence for a specific-#define PURPLE_TYPE_BUDDY_PRESENCE (purple_buddy_presence_get_type())-G_DECLARE_FINAL_TYPE(PurpleBuddyPresence, purple_buddy_presence, PURPLE,- BUDDY_PRESENCE, PurplePresence)- * purple_buddy_presence_new:- * @buddy: The buddy to associate with the presence.- * Creates a presence for a buddy.- * Returns: The new presence.-PurpleBuddyPresence *purple_buddy_presence_new(PurpleBuddy *buddy);- * purple_buddy_presence_get_buddy:- * @presence: The presence.- * Returns the buddy presence's buddy.- * Returns: (transfer none): The presence's buddy.-PurpleBuddy *purple_buddy_presence_get_buddy(PurpleBuddyPresence *presence);- * purple_buddy_presence_compare:- * @buddy_presence1: The first presence.- * @buddy_presence2: The second presence.- * Compares two buddy presences for availability.- * Returns: -1 if @buddy_presence1 is more available than @buddy_presence2.- * 0 if @buddy_presence1 is equal to @buddy_presence2.- * 1 if @buddy_presence1 is less available than @buddy_presence2.-gint purple_buddy_presence_compare(PurpleBuddyPresence *buddy_presence1,- PurpleBuddyPresence *buddy_presence2);-#endif /* PURPLE_BUDDY_PRESENCE_H */--- a/libpurple/status.c Thu Apr 11 20:55:27 2024 -0500
+++ b/libpurple/status.c Thu Apr 11 20:58:14 2024 -0500
@@ -31,7 +31,6 @@
#include "purpleaccountpresence.h"
-#include "purplebuddypresence.h"--- a/po/POTFILES.in Thu Apr 11 20:55:27 2024 -0500
+++ b/po/POTFILES.in Thu Apr 11 20:58:14 2024 -0500
@@ -48,7 +48,6 @@
libpurple/purpleaddcontactrequest.c
libpurple/purpleattachment.c
-libpurple/purplebuddypresence.c libpurple/purplechatconversation.c
libpurple/purplechatuser.c
libpurple/purplecontact.c
