[gnome-contacts] Cleanup: remove more dead code in Contacts.Contact
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts] Cleanup: remove more dead code in Contacts.Contact
- Date: Sat, 26 Aug 2017 09:58:20 +0000 (UTC)
commit f8ba9dcef353adb46563c602f3c30b179bc3ab61
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sat Aug 26 11:53:24 2017 +0200
Cleanup: remove more dead code in Contacts.Contact
For the record, showing the presence of a contact was removed 4 (!)
years ago (in commit 69ca87b01420e3cebda76d767e7b84953687ff2d)
src/contacts-contact.vala | 141 ---------------------------------------------
1 files changed, 0 insertions(+), 141 deletions(-)
---
diff --git a/src/contacts-contact.vala b/src/contacts-contact.vala
index 1f5c7a1..138f463 100644
--- a/src/contacts-contact.vala
+++ b/src/contacts-contact.vala
@@ -424,97 +424,6 @@ public class Contacts.Contact : GLib.Object {
return true;
}
- public static string presence_to_icon_symbolic (PresenceType presence) {
- string? iconname = null;
- switch (presence) {
- default:
- case PresenceType.OFFLINE:
- case PresenceType.UNSET:
- case PresenceType.ERROR:
- case PresenceType.UNKNOWN:
- break;
- case PresenceType.AVAILABLE:
- iconname = "user-available-symbolic";
- break;
- case PresenceType.AWAY:
- case PresenceType.EXTENDED_AWAY:
- iconname = "user-away-symbolic";
- break;
- case PresenceType.BUSY:
- iconname = "user-busy-symbolic";
- break;
- case PresenceType.HIDDEN:
- iconname = "user-invisible-symbolic";
- break;
- }
- return iconname;
- }
-
- public static string presence_to_icon_symbolic_full (PresenceType presence) {
- string? iconname = presence_to_icon_symbolic (presence);
- if (iconname != null)
- return iconname;
- return "user-offline-symbolic";
- }
-
- public static string presence_to_icon (PresenceType presence) {
- string? iconname = null;
- switch (presence) {
- default:
- case PresenceType.OFFLINE:
- case PresenceType.UNSET:
- case PresenceType.ERROR:
- case PresenceType.UNKNOWN:
- break;
- case PresenceType.AVAILABLE:
- iconname = "user-available";
- break;
- case PresenceType.AWAY:
- case PresenceType.EXTENDED_AWAY:
- iconname = "user-away";
- break;
- case PresenceType.BUSY:
- iconname = "user-busy";
- break;
- case PresenceType.HIDDEN:
- iconname = "user-invisible";
- break;
- }
- return iconname;
- }
-
- public static string presence_to_icon_full (PresenceType presence) {
- string? iconname = presence_to_icon (presence);
- if (iconname != null)
- return iconname;
- return "user-offline";
- }
-
- public static string presence_to_class (PresenceType presence) {
- string? classname = null;
- switch (presence) {
- default:
- case PresenceType.HIDDEN:
- case PresenceType.OFFLINE:
- case PresenceType.UNSET:
- case PresenceType.ERROR:
- classname = "presence-icon-offline";
- break;
- case PresenceType.AVAILABLE:
- case PresenceType.UNKNOWN:
- classname = "presence-icon-available";
- break;
- case PresenceType.AWAY:
- case PresenceType.EXTENDED_AWAY:
- classname = "presence-icon-away";
- break;
- case PresenceType.BUSY:
- classname = "presence-icon-busy";
- break;
- }
- return classname;
- }
-
static string? get_first_string (Collection<string>? collection) {
if (collection != null) {
var i = collection.iterator();
@@ -691,55 +600,6 @@ public class Contacts.Contact : GLib.Object {
return service;
}
- public static string format_im_name (Tpf.Persona? persona,
- string protocol, string id) {
- string? service = null;
- if (persona != null) {
- var account = (persona.store as Tpf.PersonaStore).account;
- service = account.service;
- }
- if (service == null || service == "")
- service = protocol;
-
- ImDisplay display;
- var display_name = format_im_service (service, out display);
-
- switch (display) {
- default:
- case ImDisplay.DEFAULT:
- return id + " (" + display_name + ")";
- case ImDisplay.ALIAS_SERVICE:
- return persona.alias + " (" + display_name + ")";
- }
- }
-
- public Widget? create_presence_widget (string protocol, string im_address) {
- var tp = find_im_persona (protocol, im_address);
- if (tp == null)
- return null;
-
- var i = new Image ();
- i.set_from_icon_name (presence_to_icon_full (tp.presence_type), IconSize.MENU);
- string last_class = Contact.presence_to_class (tp.presence_type);
- i.get_style_context ().add_class (last_class);
- i.set_tooltip_text (tp.presence_message);
-
- var id1 = tp.notify["presence-type"].connect ((pspec) => {
- i.set_from_icon_name (presence_to_icon_full (tp.presence_type), IconSize.MENU);
- i.get_style_context ().remove_class (last_class);
- last_class = Contact.presence_to_class (tp.presence_type);
- i.get_style_context ().add_class (last_class);
- });
- var id2 = tp.notify["presence-message"].connect ( (pspec) => {
- i.set_tooltip_text (tp.presence_message);
- });
- i.destroy.connect (() => {
- tp.disconnect(id1);
- tp.disconnect(id2);
- });
- return i;
- }
-
private bool changed_cb () {
changed_id = 0;
var changed_personas = this.changed_personas;
@@ -983,7 +843,6 @@ public class Contacts.Contact : GLib.Object {
return p;
}
-
public Persona? find_persona_from_store (PersonaStore store) {
foreach (var p in individual.personas) {
if (p.store == store)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]