call: Move name property to base class
This let's us avoid some duplication in the derived classes.
This commit is contained in:
@@ -11,18 +11,9 @@
|
||||
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
PROP_NAME,
|
||||
PROP_LAST_PROP,
|
||||
};
|
||||
static GParamSpec *props[PROP_LAST_PROP];
|
||||
|
||||
struct _CallsMockCall
|
||||
{
|
||||
CallsCall parent_instance;
|
||||
|
||||
char *display_name;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (CallsMockCall, calls_mock_call, CALLS_TYPE_CALL)
|
||||
@@ -48,58 +39,19 @@ calls_mock_call_hang_up (CallsCall *call)
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
calls_mock_call_get_property (GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
CallsMockCall *self = CALLS_MOCK_CALL (object);
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_NAME:
|
||||
g_value_set_string (value, self->display_name);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
calls_mock_call_finalize (GObject *object)
|
||||
{
|
||||
CallsMockCall *self = CALLS_MOCK_CALL (object);
|
||||
|
||||
g_free (self->display_name);
|
||||
|
||||
G_OBJECT_CLASS (calls_mock_call_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
calls_mock_call_class_init (CallsMockCallClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
CallsCallClass *call_class = CALLS_CALL_CLASS (klass);
|
||||
|
||||
call_class->answer = calls_mock_call_answer;
|
||||
call_class->hang_up = calls_mock_call_hang_up;
|
||||
|
||||
object_class->get_property = calls_mock_call_get_property;
|
||||
object_class->finalize = calls_mock_call_finalize;
|
||||
|
||||
g_object_class_override_property (object_class,
|
||||
PROP_NAME,
|
||||
"name");
|
||||
props[PROP_NAME] = g_object_class_find_property (object_class, "name");
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
calls_mock_call_init (CallsMockCall *self)
|
||||
{
|
||||
self->display_name = g_strdup ("John Doe");
|
||||
}
|
||||
|
||||
|
||||
@@ -109,18 +61,7 @@ calls_mock_call_new (void)
|
||||
return g_object_new (CALLS_TYPE_MOCK_CALL,
|
||||
"inbound", TRUE,
|
||||
"id", "0800 1234",
|
||||
"name", "John Doe",
|
||||
NULL);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
calls_mock_call_set_name (CallsMockCall *self,
|
||||
const char *name)
|
||||
{
|
||||
g_return_if_fail (CALLS_IS_MOCK_CALL (self));
|
||||
|
||||
g_free (self->display_name);
|
||||
self->display_name = g_strdup (name);
|
||||
|
||||
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_NAME]);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,5 @@ G_DECLARE_FINAL_TYPE (CallsMockCall, calls_mock_call, CALLS, MOCK_CALL, CallsCal
|
||||
CallsMockCall *calls_mock_call_new (void);
|
||||
void calls_mock_call_set_id (CallsMockCall *self,
|
||||
const char *id);
|
||||
void calls_mock_call_set_name (CallsMockCall *self,
|
||||
const char *name);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
Reference in New Issue
Block a user