kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make CallsContacts a singleton

Browse Source 
Since passing a CallsContacts pointer down to every class it needs, started to
become laborous - especially since the intermediates classes don't need
the reference themselves - it was made a singleton

* src/calls-contacts.c: Added calls_contacts_get_default () function and
  removed calls_contacts_new ()
* src/calls-contacts.h: Added _get_default () prototype and removed the
  _new () prototype
* src/calls-application.c: Use calls_contacts_get_default () now
* src/calls-history-box.c: Removed self->contacts completely
* src/calls-history-box.h: Got rid of CallsContacts argument in _new()
* src/calls-main-window.c: Removed self->contacts completely
* src/calls-main-window.h: Got rid of CallsContacts argument in _new()
* src/calls-call-record-row.c: Use calls_contacts_get_default () now
* src/calls-call-record-row.h: Got rid of CallsContacts argument in
  _new()
* src/calls-call-holder.c: Use calls_contacts_get_default () now
* src/calls-call-holder.h: Got rid of CallsContacts argument in _new()
* src/calls-call-window.c: Removed self->contacts completely
* src/calls-call-window.h: Got rid of CallsContacts argument in _new()
* src/calls-notifier.c: Use calls_contacts_get_default () now
* src/calls-notifier.h: Got rid of CallsContacts argument in _new()
This commit is contained in:
Evangelos Ribeiro Tzaras
2020-06-17 13:44:11 +02:00
parent 17e8e4bd24
commit 0f0d10e3f2
11 changed files with 28 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/calls-notifier.c
View File

@@ -24,26 +24,18 @@
#include "calls-notifier.h"
#include "calls-manager.h"
#include "calls-contacts.h"
#include "config.h"
#include <glib/gi18n.h>
#include <glib-object.h>
enum {
PROP_0,
PROP_CONTACTS,
PROP_LAST_PROP,
};
static GParamSpec *props[PROP_LAST_PROP];
struct _CallsNotifier
{
GObject parent_instance;
GListStore *unanswered;
GList *notifications;
CallsContacts *contacts;
};
G_DEFINE_TYPE (CallsNotifier, calls_notifier, G_TYPE_OBJECT);
@@ -75,7 +67,7 @@ notify (CallsNotifier *self, CallsCall *call)
goto done;
}
match = calls_contacts_lookup_phone_number (self->contacts, phone_number);
match = calls_contacts_lookup_phone_number (calls_contacts_get_default (), phone_number);
if (!match)
goto done;
@@ -172,31 +164,10 @@ calls_notifier_dispose (GObject *object)
g_list_store_remove_all (self->unanswered);
g_clear_object (&self->unanswered);
g_clear_object (&self->contacts);
G_OBJECT_CLASS (calls_notifier_parent_class)->dispose (object);
}
static void
calls_notifier_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
CallsNotifier *self = CALLS_NOTIFIER (object);
switch (property_id)
{
case PROP_CONTACTS:
g_set_object (&self->contacts,
CALLS_CONTACTS (g_value_get_object (value)));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void
calls_notifier_class_init (CallsNotifierClass *klass)
@@ -205,20 +176,10 @@ calls_notifier_class_init (CallsNotifierClass *klass)
object_class->constructed = calls_notifier_constructed;
object_class->dispose = calls_notifier_dispose;
object_class->set_property = calls_notifier_set_property;
props[PROP_CONTACTS] =
g_param_spec_object ("contacts",
"Contacts",
"Interface for libfolks",
CALLS_TYPE_CONTACTS,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_properties (object_class, PROP_LAST_PROP, props);
}
CallsNotifier *
calls_notifier_new (CallsContacts *contacts)
calls_notifier_new ()
{
return g_object_new (CALLS_TYPE_NOTIFIER, "contacts", contacts, NULL);
return g_object_new (CALLS_TYPE_NOTIFIER, NULL);
}