subscriber-view: remove is_child_multicell() vfunc
After we added GcalEvent::is_multiday(), there is no need to wrap it in a vfunc anymore. To fix it, simply use is_multiday() function and get rid of the vfunc.
This commit is contained in:
@@ -161,9 +161,6 @@ static gboolean gcal_month_view_button_release (GtkWidget *wid
|
|||||||
static void gcal_month_view_direction_changed (GtkWidget *widget,
|
static void gcal_month_view_direction_changed (GtkWidget *widget,
|
||||||
GtkTextDirection previous_direction);
|
GtkTextDirection previous_direction);
|
||||||
|
|
||||||
static gboolean gcal_month_view_is_child_multiday (GcalSubscriberView *subscriber,
|
|
||||||
GcalEventWidget *child);
|
|
||||||
|
|
||||||
static guint gcal_month_view_get_child_cell (GcalSubscriberView *subscriber,
|
static guint gcal_month_view_get_child_cell (GcalSubscriberView *subscriber,
|
||||||
GcalEventWidget *child);
|
GcalEventWidget *child);
|
||||||
|
|
||||||
@@ -781,7 +778,6 @@ gcal_month_view_class_init (GcalMonthViewClass *klass)
|
|||||||
widget_class->key_press_event = gcal_month_view_key_press;
|
widget_class->key_press_event = gcal_month_view_key_press;
|
||||||
|
|
||||||
subscriber_view_class = GCAL_SUBSCRIBER_VIEW_CLASS (klass);
|
subscriber_view_class = GCAL_SUBSCRIBER_VIEW_CLASS (klass);
|
||||||
subscriber_view_class->is_child_multicell = gcal_month_view_is_child_multiday;
|
|
||||||
subscriber_view_class->get_child_cell = gcal_month_view_get_child_cell;
|
subscriber_view_class->get_child_cell = gcal_month_view_get_child_cell;
|
||||||
subscriber_view_class->clear_state = gcal_month_view_clear_state;
|
subscriber_view_class->clear_state = gcal_month_view_clear_state;
|
||||||
|
|
||||||
@@ -1839,13 +1835,6 @@ gcal_month_view_direction_changed (GtkWidget *widget,
|
|||||||
priv->k = 1;
|
priv->k = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
|
||||||
gcal_month_view_is_child_multiday (GcalSubscriberView *subscriber,
|
|
||||||
GcalEventWidget *child)
|
|
||||||
{
|
|
||||||
return gcal_event_is_multiday (gcal_event_widget_get_event (child));
|
|
||||||
}
|
|
||||||
|
|
||||||
static guint
|
static guint
|
||||||
gcal_month_view_get_child_cell (GcalSubscriberView *subscriber,
|
gcal_month_view_get_child_cell (GcalSubscriberView *subscriber,
|
||||||
GcalEventWidget *child)
|
GcalEventWidget *child)
|
||||||
|
|||||||
@@ -54,9 +54,6 @@ static void gcal_subscriber_view_forall (GtkContain
|
|||||||
GtkCallback callback,
|
GtkCallback callback,
|
||||||
gpointer callback_data);
|
gpointer callback_data);
|
||||||
|
|
||||||
static gboolean gcal_subscriber_view_is_child_multicell (GcalSubscriberView *subscriber,
|
|
||||||
GcalEventWidget *child);
|
|
||||||
|
|
||||||
static guint gcal_subscriber_view_get_child_cell (GcalSubscriberView *subscriber,
|
static guint gcal_subscriber_view_get_child_cell (GcalSubscriberView *subscriber,
|
||||||
GcalEventWidget *child);
|
GcalEventWidget *child);
|
||||||
|
|
||||||
@@ -106,7 +103,6 @@ gcal_subscriber_view_class_init (GcalSubscriberViewClass *klass)
|
|||||||
{
|
{
|
||||||
GtkContainerClass *container_class;
|
GtkContainerClass *container_class;
|
||||||
|
|
||||||
klass->is_child_multicell = gcal_subscriber_view_is_child_multicell;
|
|
||||||
klass->get_child_cell = gcal_subscriber_view_get_child_cell;
|
klass->get_child_cell = gcal_subscriber_view_get_child_cell;
|
||||||
|
|
||||||
G_OBJECT_CLASS (klass)->finalize = gcal_subscriber_view_finalize;
|
G_OBJECT_CLASS (klass)->finalize = gcal_subscriber_view_finalize;
|
||||||
@@ -192,7 +188,7 @@ gcal_subscriber_view_add (GtkContainer *container,
|
|||||||
l = g_list_append (l, widget);
|
l = g_list_append (l, widget);
|
||||||
g_hash_table_insert (priv->children, g_strdup (uuid), l);
|
g_hash_table_insert (priv->children, g_strdup (uuid), l);
|
||||||
|
|
||||||
if (gcal_subscriber_view_is_child_multicell (GCAL_SUBSCRIBER_VIEW (container), GCAL_EVENT_WIDGET (widget)))
|
if (gcal_event_is_multiday (event))
|
||||||
{
|
{
|
||||||
priv->multi_cell_children = g_list_insert_sorted (priv->multi_cell_children, widget,
|
priv->multi_cell_children = g_list_insert_sorted (priv->multi_cell_children, widget,
|
||||||
(GCompareFunc) gcal_event_widget_compare_by_length);
|
(GCompareFunc) gcal_event_widget_compare_by_length);
|
||||||
@@ -304,23 +300,6 @@ gcal_subscriber_view_forall (GtkContainer *container,
|
|||||||
g_list_free (l);
|
g_list_free (l);
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
|
||||||
gcal_subscriber_view_is_child_multicell (GcalSubscriberView *subscriber,
|
|
||||||
GcalEventWidget *child)
|
|
||||||
{
|
|
||||||
GcalSubscriberViewClass *klass;
|
|
||||||
|
|
||||||
g_return_val_if_fail (GCAL_IS_SUBSCRIBER_VIEW (subscriber), FALSE);
|
|
||||||
g_return_val_if_fail (GCAL_IS_EVENT_WIDGET (child), FALSE);
|
|
||||||
|
|
||||||
klass = GCAL_SUBSCRIBER_VIEW_GET_CLASS (subscriber);
|
|
||||||
|
|
||||||
if (klass->is_child_multicell)
|
|
||||||
return klass->is_child_multicell (subscriber, child);
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static guint
|
static guint
|
||||||
gcal_subscriber_view_get_child_cell (GcalSubscriberView *subscriber,
|
gcal_subscriber_view_get_child_cell (GcalSubscriberView *subscriber,
|
||||||
GcalEventWidget *child)
|
GcalEventWidget *child)
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ struct _GcalSubscriberViewClass
|
|||||||
void (*event_activated) (GcalSubscriberView *subscriber_view, GcalEventWidget *event_widget);
|
void (*event_activated) (GcalSubscriberView *subscriber_view, GcalEventWidget *event_widget);
|
||||||
|
|
||||||
/*< public >*/
|
/*< public >*/
|
||||||
gboolean (*is_child_multicell) (GcalSubscriberView *subscriber_view, GcalEventWidget *child);
|
|
||||||
guint (*get_child_cell) (GcalSubscriberView *subscriber_view, GcalEventWidget *child);
|
guint (*get_child_cell) (GcalSubscriberView *subscriber_view, GcalEventWidget *child);
|
||||||
void (*clear_state) (GcalSubscriberView *subscriber_view);
|
void (*clear_state) (GcalSubscriberView *subscriber_view);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user