Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

subscriber: renamed to GcalSubscriberView

Browse Source 
This is more of a semantic change than anything else. GcalSubscriber
will gradually take on GcalView interface and that's why I'm adding the
View suffix.
This commit is contained in:
Erick Pérez Castellanos
2015-01-05 10:33:26 -05:00
parent 0aba9c55d2
commit 0e5c197c2f
9 changed files with 141 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-month-view.c
+2 -5
View File
@@ -210,12 +210,9 @@ static gchar* gcal_month_view_get_right_header (GcalView *vie
static GtkWidget* gcal_month_view_get_by_uuid (GcalView *view, static GtkWidget* gcal_month_view_get_by_uuid (GcalView *view,
const gchar *uuid); const gchar *uuid);
G_DEFINE_TYPE_WITH_CODE (GcalMonthView, G_DEFINE_TYPE_WITH_CODE (GcalMonthView, gcal_month_view,GCAL_TYPE_SUBSCRIBER_VIEW,
gcal_month_view,
GCAL_TYPE_SUBSCRIBER,
G_ADD_PRIVATE (GcalMonthView) G_ADD_PRIVATE (GcalMonthView)
G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, gcal_view_interface_init));
gcal_view_interface_init));
static void static void
src/gcal-month-view.h
+2 -2
View File
@@ -37,12 +37,12 @@ typedef struct _GcalMonthViewClass GcalMonthViewClass;
struct _GcalMonthView struct _GcalMonthView
{ {
GcalSubscriber parent; GcalSubscriberView parent;
}; };
struct _GcalMonthViewClass struct _GcalMonthViewClass
{ {
GcalSubscriberClass parent_class; GcalSubscriberViewClass parent_class;
/* signals */ /* signals */
void (*new_event) (gint new_day); void (*new_event) (gint new_day);
src/gcal-subscriber-view-private.h
+4 -4
View File
@@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __GCAL_SUBSCRIBER_PRIVATE_H__ #ifndef __GCAL_SUBSCRIBER_VIEW_PRIVATE_H__
#define __GCAL_SUBSCRIBER_PRIVATE_H____ #define __GCAL_SUBSCRIBER_VIEW_PRIVATE_H____
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS G_BEGIN_DECLS
struct _GcalSubscriberPrivate struct _GcalSubscriberViewPrivate
{ {
/** /**
* Hash to keep children widgets (all of them, parent widgets and its parts if there's any), * Hash to keep children widgets (all of them, parent widgets and its parts if there's any),
@@ -56,4 +56,4 @@ struct _GcalSubscriberPrivate
G_END_DECLS G_END_DECLS
#endif /* __GCAL_SUBSCRIBER_H__ */ #endif /* __GCAL_SUBSCRIBER_VIEW_PRIVATE_H____ */
src/gcal-subscriber-view.c
+91 -91
View File
@@ -24,72 +24,72 @@
#include "gcal-view.h" #include "gcal-view.h"
#include "gcal-event-widget.h" #include "gcal-event-widget.h"
static void gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface); static void gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface);
static void gcal_subscriber_finalize (GObject *object); static void gcal_subscriber_view_finalize (GObject *object);
static void gcal_subscriber_add (GtkContainer *container, static void gcal_subscriber_view_add (GtkContainer *container,
GtkWidget *widget); GtkWidget *widget);
static void gcal_subscriber_remove (GtkContainer *container, static void gcal_subscriber_view_remove (GtkContainer *container,
GtkWidget *widget); GtkWidget *widget);
static void gcal_subscriber_forall (GtkContainer *container, static void gcal_subscriber_view_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
GtkCallback callback, GtkCallback callback,
gpointer callback_data); gpointer callback_data);
static gboolean gcal_subscriber_is_child_multicell (GcalSubscriber *subscriber, static gboolean gcal_subscriber_view_is_child_multicell (GcalSubscriberView *subscriber,
GcalEventWidget *child); GcalEventWidget *child);
static guint gcal_subscriber_get_child_cell (GcalSubscriber *subscriber, static guint gcal_subscriber_view_get_child_cell (GcalSubscriberView *subscriber,
GcalEventWidget *child); GcalEventWidget *child);
static void gcal_subscriber_component_added (ECalDataModelSubscriber *subscriber, static void gcal_subscriber_view_component_added (ECalDataModelSubscriber *subscriber,
ECalClient *client, ECalClient *client,
ECalComponent *comp); ECalComponent *comp);
static void gcal_subscriber_component_modified (ECalDataModelSubscriber *subscriber, static void gcal_subscriber_view_component_modified (ECalDataModelSubscriber *subscriber,
ECalClient *client, ECalClient *client,
ECalComponent *comp); ECalComponent *comp);
static void gcal_subscriber_component_removed (ECalDataModelSubscriber *subscriber, static void gcal_subscriber_view_component_removed (ECalDataModelSubscriber *subscriber,
ECalClient *client, ECalClient *client,
const gchar *uid, const gchar *uid,
const gchar *rid); const gchar *rid);
static void gcal_subscriber_freeze (ECalDataModelSubscriber *subscriber); static void gcal_subscriber_view_freeze (ECalDataModelSubscriber *subscriber);
static void gcal_subscriber_thaw (ECalDataModelSubscriber *subscriber); static void gcal_subscriber_view_thaw (ECalDataModelSubscriber *subscriber);
G_DEFINE_TYPE_WITH_CODE (GcalSubscriber, gcal_subscriber, GTK_TYPE_CONTAINER, G_DEFINE_TYPE_WITH_CODE (GcalSubscriberView, gcal_subscriber_view, GTK_TYPE_CONTAINER,
G_ADD_PRIVATE (GcalSubscriber) G_ADD_PRIVATE (GcalSubscriberView)
G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER, G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER,
gcal_data_model_subscriber_interface_init)); gcal_data_model_subscriber_interface_init));
static void static void
gcal_subscriber_class_init (GcalSubscriberClass *klass) gcal_subscriber_view_class_init (GcalSubscriberViewClass *klass)
{ {
GtkContainerClass *container_class; GtkContainerClass *container_class;
klass->is_child_multicell = gcal_subscriber_is_child_multicell; klass->is_child_multicell = gcal_subscriber_view_is_child_multicell;
klass->get_child_cell = gcal_subscriber_get_child_cell; klass->get_child_cell = gcal_subscriber_view_get_child_cell;
G_OBJECT_CLASS (klass)->finalize = gcal_subscriber_finalize; G_OBJECT_CLASS (klass)->finalize = gcal_subscriber_view_finalize;
container_class = GTK_CONTAINER_CLASS (klass); container_class = GTK_CONTAINER_CLASS (klass);
container_class->add = gcal_subscriber_add; container_class->add = gcal_subscriber_view_add;
container_class->remove = gcal_subscriber_remove; container_class->remove = gcal_subscriber_view_remove;
container_class->forall = gcal_subscriber_forall; container_class->forall = gcal_subscriber_view_forall;
} }
static void static void
gcal_subscriber_init (GcalSubscriber *self) gcal_subscriber_view_init (GcalSubscriberView *self)
{ {
GcalSubscriberPrivate *priv; GcalSubscriberViewPrivate *priv;
priv = gcal_subscriber_get_instance_private (self); priv = gcal_subscriber_view_get_instance_private (self);
self->priv = priv; self->priv = priv;
priv->children = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_list_free); priv->children = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_list_free);
@@ -101,19 +101,19 @@ gcal_subscriber_init (GcalSubscriber *self)
static void static void
gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface) gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface)
{ {
iface->component_added = gcal_subscriber_component_added; iface->component_added = gcal_subscriber_view_component_added;
iface->component_modified = gcal_subscriber_component_modified; iface->component_modified = gcal_subscriber_view_component_modified;
iface->component_removed = gcal_subscriber_component_removed; iface->component_removed = gcal_subscriber_view_component_removed;
iface->freeze = gcal_subscriber_freeze; iface->freeze = gcal_subscriber_view_freeze;
iface->thaw = gcal_subscriber_thaw; iface->thaw = gcal_subscriber_view_thaw;
} }
static void static void
gcal_subscriber_finalize (GObject *object) gcal_subscriber_view_finalize (GObject *object)
{ {
GcalSubscriberPrivate *priv; GcalSubscriberViewPrivate *priv;
priv = gcal_subscriber_get_instance_private (GCAL_SUBSCRIBER (object)); priv = gcal_subscriber_view_get_instance_private (GCAL_SUBSCRIBER_VIEW (object));
g_hash_table_destroy (priv->children); g_hash_table_destroy (priv->children);
g_hash_table_destroy (priv->single_cell_children); g_hash_table_destroy (priv->single_cell_children);
@@ -124,20 +124,20 @@ gcal_subscriber_finalize (GObject *object)
g_list_free (priv->multi_cell_children); g_list_free (priv->multi_cell_children);
/* Chain up to parent's finalize() method. */ /* Chain up to parent's finalize() method. */
G_OBJECT_CLASS (gcal_subscriber_parent_class)->finalize (object); G_OBJECT_CLASS (gcal_subscriber_view_parent_class)->finalize (object);
} }
static void static void
gcal_subscriber_add (GtkContainer *container, gcal_subscriber_view_add (GtkContainer *container,
GtkWidget *widget) GtkWidget *widget)
{ {
GcalSubscriberPrivate *priv; GcalSubscriberViewPrivate *priv;
const gchar *uuid; const gchar *uuid;
GList *l = NULL; GList *l = NULL;
g_return_if_fail (GCAL_IS_EVENT_WIDGET (widget)); g_return_if_fail (GCAL_IS_EVENT_WIDGET (widget));
g_return_if_fail (gtk_widget_get_parent (widget) == NULL); g_return_if_fail (gtk_widget_get_parent (widget) == NULL);
priv = gcal_subscriber_get_instance_private (GCAL_SUBSCRIBER (container)); priv = gcal_subscriber_view_get_instance_private (GCAL_SUBSCRIBER_VIEW (container));
uuid = gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (widget)); uuid = gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (widget));
/* inserting in all children hash */ /* inserting in all children hash */
@@ -150,14 +150,14 @@ gcal_subscriber_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_is_child_multicell (GCAL_SUBSCRIBER (container), GCAL_EVENT_WIDGET (widget))) if (gcal_subscriber_view_is_child_multicell (GCAL_SUBSCRIBER_VIEW (container), GCAL_EVENT_WIDGET (widget)))
{ {
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);
} }
else else
{ {
guint cell_idx = gcal_subscriber_get_child_cell (GCAL_SUBSCRIBER (container), GCAL_EVENT_WIDGET (widget)); guint cell_idx = gcal_subscriber_view_get_child_cell (GCAL_SUBSCRIBER_VIEW (container), GCAL_EVENT_WIDGET (widget));
l = g_hash_table_lookup (priv->single_cell_children, GINT_TO_POINTER (cell_idx)); l = g_hash_table_lookup (priv->single_cell_children, GINT_TO_POINTER (cell_idx));
l = g_list_insert_sorted (l, widget, (GCompareFunc) gcal_event_widget_compare_by_start_date); l = g_list_insert_sorted (l, widget, (GCompareFunc) gcal_event_widget_compare_by_start_date);
@@ -174,10 +174,10 @@ gcal_subscriber_add (GtkContainer *container,
} }
static void static void
gcal_subscriber_remove (GtkContainer *container, gcal_subscriber_view_remove (GtkContainer *container,
GtkWidget *widget) GtkWidget *widget)
{ {
GcalSubscriberPrivate *priv; GcalSubscriberViewPrivate *priv;
const gchar *uuid; const gchar *uuid;
GList *l, *aux; GList *l, *aux;
@@ -185,7 +185,7 @@ gcal_subscriber_remove (GtkContainer *container,
GtkWidget *master_widget; GtkWidget *master_widget;
g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (container)); g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (container));
priv = gcal_subscriber_get_instance_private (GCAL_SUBSCRIBER (container)); priv = gcal_subscriber_view_get_instance_private (GCAL_SUBSCRIBER_VIEW (container));
uuid = gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (widget)); uuid = gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (widget));
@@ -199,7 +199,7 @@ gcal_subscriber_remove (GtkContainer *container,
if (widget == master_widget) if (widget == master_widget)
{ {
if (gcal_subscriber_is_child_multicell (GCAL_SUBSCRIBER (container), GCAL_EVENT_WIDGET (widget))) if (gcal_subscriber_view_is_child_multicell (GCAL_SUBSCRIBER_VIEW (container), GCAL_EVENT_WIDGET (widget)))
{ {
priv->multi_cell_children = g_list_remove (priv->multi_cell_children, widget); priv->multi_cell_children = g_list_remove (priv->multi_cell_children, widget);
@@ -214,7 +214,7 @@ gcal_subscriber_remove (GtkContainer *container,
} }
else else
{ {
guint cell_idx = gcal_subscriber_get_child_cell (GCAL_SUBSCRIBER (container), GCAL_EVENT_WIDGET (widget)); guint cell_idx = gcal_subscriber_view_get_child_cell (GCAL_SUBSCRIBER_VIEW (container), GCAL_EVENT_WIDGET (widget));
aux = g_hash_table_lookup (priv->single_cell_children, GINT_TO_POINTER (cell_idx)); aux = g_hash_table_lookup (priv->single_cell_children, GINT_TO_POINTER (cell_idx));
aux = g_list_remove (g_list_copy (aux), widget); aux = g_list_remove (g_list_copy (aux), widget);
@@ -239,15 +239,15 @@ gcal_subscriber_remove (GtkContainer *container,
} }
static void static void
gcal_subscriber_forall (GtkContainer *container, gcal_subscriber_view_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
GtkCallback callback, GtkCallback callback,
gpointer callback_data) gpointer callback_data)
{ {
GcalSubscriberPrivate *priv; GcalSubscriberViewPrivate *priv;
GList *l, *l2, *aux = NULL; GList *l, *l2, *aux = NULL;
priv = gcal_subscriber_get_instance_private (GCAL_SUBSCRIBER (container)); priv = gcal_subscriber_view_get_instance_private (GCAL_SUBSCRIBER_VIEW (container));
l2 = g_hash_table_get_values (priv->children); l2 = g_hash_table_get_values (priv->children);
for (l = l2; l != NULL; l = g_list_next (l)) for (l = l2; l != NULL; l = g_list_next (l))
@@ -266,15 +266,15 @@ gcal_subscriber_forall (GtkContainer *container,
} }
static gboolean static gboolean
gcal_subscriber_is_child_multicell (GcalSubscriber *subscriber, gcal_subscriber_view_is_child_multicell (GcalSubscriberView *subscriber,
GcalEventWidget *child) GcalEventWidget *child)
{ {
GcalSubscriberClass *klass; GcalSubscriberViewClass *klass;
g_return_val_if_fail (GCAL_IS_SUBSCRIBER (subscriber), FALSE); g_return_val_if_fail (GCAL_IS_SUBSCRIBER_VIEW (subscriber), FALSE);
g_return_val_if_fail (GCAL_IS_EVENT_WIDGET (child), FALSE); g_return_val_if_fail (GCAL_IS_EVENT_WIDGET (child), FALSE);
klass = GCAL_SUBSCRIBER_GET_CLASS (subscriber); klass = GCAL_SUBSCRIBER_VIEW_GET_CLASS (subscriber);
if (klass->is_child_multicell) if (klass->is_child_multicell)
return klass->is_child_multicell (subscriber, child); return klass->is_child_multicell (subscriber, child);
@@ -283,15 +283,15 @@ gcal_subscriber_is_child_multicell (GcalSubscriber *subscriber,
} }
static guint static guint
gcal_subscriber_get_child_cell (GcalSubscriber *subscriber, gcal_subscriber_view_get_child_cell (GcalSubscriberView *subscriber,
GcalEventWidget *child) GcalEventWidget *child)
{ {
GcalSubscriberClass *klass; GcalSubscriberViewClass *klass;
g_return_val_if_fail (GCAL_IS_SUBSCRIBER (subscriber), 0); g_return_val_if_fail (GCAL_IS_SUBSCRIBER_VIEW (subscriber), 0);
g_return_val_if_fail (GCAL_IS_EVENT_WIDGET (child), 0); g_return_val_if_fail (GCAL_IS_EVENT_WIDGET (child), 0);
klass = GCAL_SUBSCRIBER_GET_CLASS (subscriber); klass = GCAL_SUBSCRIBER_VIEW_GET_CLASS (subscriber);
if (klass->get_child_cell) if (klass->get_child_cell)
return klass->get_child_cell (subscriber, child); return klass->get_child_cell (subscriber, child);
@@ -301,9 +301,9 @@ gcal_subscriber_get_child_cell (GcalSubscriber *subscriber,
/* ECalDataModelSubscriber interface API */ /* ECalDataModelSubscriber interface API */
static void static void
gcal_subscriber_component_added (ECalDataModelSubscriber *subscriber, gcal_subscriber_view_component_added (ECalDataModelSubscriber *subscriber,
ECalClient *client, ECalClient *client,
ECalComponent *comp) ECalComponent *comp)
{ {
GtkWidget *event; GtkWidget *event;
GcalEventData *data; GcalEventData *data;
@@ -322,16 +322,16 @@ gcal_subscriber_component_added (ECalDataModelSubscriber *subscriber,
} }
static void static void
gcal_subscriber_component_modified (ECalDataModelSubscriber *subscriber, gcal_subscriber_view_component_modified (ECalDataModelSubscriber *subscriber,
ECalClient *client, ECalClient *client,
ECalComponent *comp) ECalComponent *comp)
{ {
GcalSubscriberPrivate *priv; GcalSubscriberViewPrivate *priv;
GList *l; GList *l;
GtkWidget *new_widget; GtkWidget *new_widget;
GcalEventData *data; GcalEventData *data;
priv = gcal_subscriber_get_instance_private (GCAL_SUBSCRIBER (subscriber)); priv = gcal_subscriber_view_get_instance_private (GCAL_SUBSCRIBER_VIEW (subscriber));
data = g_new0 (GcalEventData, 1); data = g_new0 (GcalEventData, 1);
data->source = e_client_get_source (E_CLIENT (client)); data->source = e_client_get_source (E_CLIENT (client));
data->event_component = e_cal_component_clone (comp); data->event_component = e_cal_component_clone (comp);
@@ -356,17 +356,17 @@ gcal_subscriber_component_modified (ECalDataModelSubscriber *subscriber,
} }
static void static void
gcal_subscriber_component_removed (ECalDataModelSubscriber *subscriber, gcal_subscriber_view_component_removed (ECalDataModelSubscriber *subscriber,
ECalClient *client, ECalClient *client,
const gchar *uid, const gchar *uid,
const gchar *rid) const gchar *rid)
{ {
GcalSubscriberPrivate *priv; GcalSubscriberViewPrivate *priv;
const gchar *sid; const gchar *sid;
gchar *uuid; gchar *uuid;
GList *l; GList *l;
priv = gcal_subscriber_get_instance_private (GCAL_SUBSCRIBER (subscriber)); priv = gcal_subscriber_view_get_instance_private (GCAL_SUBSCRIBER_VIEW (subscriber));
sid = e_source_get_uid (e_client_get_source (E_CLIENT (client))); sid = e_source_get_uid (e_client_get_source (E_CLIENT (client)));
if (rid != NULL) if (rid != NULL)
@@ -384,11 +384,11 @@ gcal_subscriber_component_removed (ECalDataModelSubscriber *subscriber,
} }
static void static void
gcal_subscriber_freeze (ECalDataModelSubscriber *subscriber) gcal_subscriber_view_freeze (ECalDataModelSubscriber *subscriber)
{ {
} }
static void static void
gcal_subscriber_thaw (ECalDataModelSubscriber *subscriber) gcal_subscriber_view_thaw (ECalDataModelSubscriber *subscriber)
{ {
} }
src/gcal-subscriber-view.h
+18 -18
View File
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __GCAL_SUBSCRIBER_H__ #ifndef __GCAL_SUBSCRIBER_VIEW_H__
#define __GCAL_SUBSCRIBER_H__ #define __GCAL_SUBSCRIBER_VIEW_H__
#include "gcal-manager.h" #include "gcal-manager.h"
#include "gcal-event-widget.h" #include "gcal-event-widget.h"
@@ -27,35 +27,35 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GCAL_TYPE_SUBSCRIBER (gcal_subscriber_get_type ()) #define GCAL_TYPE_SUBSCRIBER_VIEW (gcal_subscriber_view_get_type ())
#define GCAL_SUBSCRIBER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GCAL_TYPE_SUBSCRIBER, GcalSubscriber)) #define GCAL_SUBSCRIBER_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GCAL_TYPE_SUBSCRIBER_VIEW, GcalSubscriberView))
#define GCAL_SUBSCRIBER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GCAL_TYPE_SUBSCRIBER, GcalSubscriberClass)) #define GCAL_SUBSCRIBER_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GCAL_TYPE_SUBSCRIBER_VIEW, GcalSubscriberViewClass))
#define GCAL_IS_SUBSCRIBER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GCAL_TYPE_SUBSCRIBER)) #define GCAL_IS_SUBSCRIBER_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GCAL_TYPE_SUBSCRIBER_VIEW))
#define GCAL_IS_SUBSCRIBER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GCAL_TYPE_SUBSCRIBER)) #define GCAL_IS_SUBSCRIBER_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GCAL_TYPE_SUBSCRIBER_VIEW))
#define GCAL_SUBSCRIBER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GCAL_TYPE_SUBSCRIBER, GcalSubscriberClass)) #define GCAL_SUBSCRIBER_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GCAL_TYPE_SUBSCRIBER_VIEW, GcalSubscriberViewClass))
typedef struct _GcalSubscriber GcalSubscriber; typedef struct _GcalSubscriberView GcalSubscriberView;
typedef struct _GcalSubscriberClass GcalSubscriberClass; typedef struct _GcalSubscriberViewClass GcalSubscriberViewClass;
typedef struct _GcalSubscriberPrivate GcalSubscriberPrivate; typedef struct _GcalSubscriberViewPrivate GcalSubscriberViewPrivate;
struct _GcalSubscriber struct _GcalSubscriberView
{ {
GtkContainer parent; GtkContainer parent;
GcalSubscriberPrivate *priv; GcalSubscriberViewPrivate *priv;
}; };
struct _GcalSubscriberClass struct _GcalSubscriberViewClass
{ {
GtkContainerClass parent_class; GtkContainerClass parent_class;
/*< public >*/ /*< public >*/
gboolean (*is_child_multicell) (GcalSubscriber *subscriber, GcalEventWidget *child); gboolean (*is_child_multicell) (GcalSubscriberView *subscriber, GcalEventWidget *child);
guint (*get_child_cell) (GcalSubscriber *subscriber, GcalEventWidget *child); guint (*get_child_cell) (GcalSubscriberView *subscriber, GcalEventWidget *child);
}; };
GType gcal_subscriber_get_type (void); GType gcal_subscriber_view_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GCAL_SUBSCRIBER_H__ */ #endif /* __GCAL_SUBSCRIBER_VIEW_H__ */
src/gcal-week-view.c
+2 -5
View File
@@ -163,12 +163,9 @@ static gchar* gcal_week_view_get_right_header (GcalView *view
static GtkWidget* gcal_week_view_get_by_uuid (GcalView *view, static GtkWidget* gcal_week_view_get_by_uuid (GcalView *view,
const gchar *uuid); const gchar *uuid);
G_DEFINE_TYPE_WITH_CODE (GcalWeekView, G_DEFINE_TYPE_WITH_CODE (GcalWeekView, gcal_week_view, GCAL_TYPE_SUBSCRIBER_VIEW,
gcal_week_view,
GCAL_TYPE_SUBSCRIBER,
G_ADD_PRIVATE (GcalWeekView) G_ADD_PRIVATE (GcalWeekView)
G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, gcal_view_interface_init));
gcal_view_interface_init));
/** /**
* get_start_grid_y: * get_start_grid_y:
src/gcal-week-view.h
+2 -2
View File
@@ -38,12 +38,12 @@ typedef struct _GcalWeekViewClass GcalWeekViewClass;
struct _GcalWeekView struct _GcalWeekView
{ {
GcalSubscriber parent; GcalSubscriberView parent;
}; };
struct _GcalWeekViewClass struct _GcalWeekViewClass
{ {
GcalSubscriberClass parent_class; GcalSubscriberViewClass parent_class;
}; };
GType gcal_week_view_get_type (void); GType gcal_week_view_get_type (void);
src/gcal-year-view.c
+18 -21
View File
@@ -104,11 +104,11 @@ static gboolean gcal_year_view_button_release (GtkWidget
static void gcal_year_view_direction_changed (GtkWidget *widget, static void gcal_year_view_direction_changed (GtkWidget *widget,
GtkTextDirection previous_direction); GtkTextDirection previous_direction);
static gboolean gcal_year_view_is_child_multimonth (GcalSubscriber *subscriber, static gboolean gcal_year_view_is_child_multimonth (GcalSubscriberView *subscriber,
GcalEventWidget *child); GcalEventWidget *child);
static guint gcal_year_view_get_child_cell (GcalSubscriber *subscriber, static guint gcal_year_view_get_child_cell (GcalSubscriberView *subscriber,
GcalEventWidget *child); GcalEventWidget *child);
static icaltimetype* gcal_year_view_get_initial_date (GcalView *view); static icaltimetype* gcal_year_view_get_initial_date (GcalView *view);
@@ -123,12 +123,9 @@ static gchar* gcal_year_view_get_right_header (GcalView
static GtkWidget* gcal_year_view_get_by_uuid (GcalView *view, static GtkWidget* gcal_year_view_get_by_uuid (GcalView *view,
const gchar *uuid); const gchar *uuid);
G_DEFINE_TYPE_WITH_CODE (GcalYearView, G_DEFINE_TYPE_WITH_CODE (GcalYearView, gcal_year_view, GCAL_TYPE_SUBSCRIBER_VIEW,
gcal_year_view,
GCAL_TYPE_SUBSCRIBER,
G_ADD_PRIVATE (GcalYearView) G_ADD_PRIVATE (GcalYearView)
G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW,gcal_view_interface_init));
gcal_view_interface_init));
static void static void
@@ -190,13 +187,13 @@ get_widget_parts (gint first_cell,
static void static void
gcal_year_view_class_init (GcalYearViewClass *klass) gcal_year_view_class_init (GcalYearViewClass *klass)
{ {
GcalSubscriberClass *subscriber_class; GcalSubscriberViewClass *subscriber_view_class;
GtkWidgetClass *widget_class; GtkWidgetClass *widget_class;
GObjectClass *object_class; GObjectClass *object_class;
subscriber_class = GCAL_SUBSCRIBER_CLASS (klass); subscriber_view_class = GCAL_SUBSCRIBER_VIEW_CLASS (klass);
subscriber_class->is_child_multicell = gcal_year_view_is_child_multimonth; subscriber_view_class->is_child_multicell = gcal_year_view_is_child_multimonth;
subscriber_class->get_child_cell = gcal_year_view_get_child_cell; subscriber_view_class->get_child_cell = gcal_year_view_get_child_cell;
widget_class = GTK_WIDGET_CLASS (klass); widget_class = GTK_WIDGET_CLASS (klass);
widget_class->realize = gcal_year_view_realize; widget_class->realize = gcal_year_view_realize;
@@ -425,7 +422,7 @@ gcal_year_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
{ {
GcalYearViewPrivate *priv; GcalYearViewPrivate *priv;
GcalSubscriberPrivate *ppriv; GcalSubscriberViewPrivate *ppriv;
gint i, j, sw; gint i, j, sw;
gint padding_bottom; gint padding_bottom;
@@ -447,7 +444,7 @@ gcal_year_view_size_allocate (GtkWidget *widget,
gpointer key, value; gpointer key, value;
priv = gcal_year_view_get_instance_private (GCAL_YEAR_VIEW (widget)); priv = gcal_year_view_get_instance_private (GCAL_YEAR_VIEW (widget));
ppriv = GCAL_SUBSCRIBER (widget)->priv; ppriv = GCAL_SUBSCRIBER_VIEW (widget)->priv;
/* remove every widget' parts, but the master widget */ /* remove every widget' parts, but the master widget */
widgets = g_hash_table_get_values (ppriv->children); widgets = g_hash_table_get_values (ppriv->children);
@@ -895,8 +892,8 @@ gcal_year_view_direction_changed (GtkWidget *widget,
} }
static gboolean static gboolean
gcal_year_view_is_child_multimonth (GcalSubscriber *subscriber, gcal_year_view_is_child_multimonth (GcalSubscriberView *subscriber,
GcalEventWidget *child) GcalEventWidget *child)
{ {
const icaltimetype *dt_start, *dt_end; const icaltimetype *dt_start, *dt_end;
@@ -909,8 +906,8 @@ gcal_year_view_is_child_multimonth (GcalSubscriber *subscriber,
} }
static guint static guint
gcal_year_view_get_child_cell (GcalSubscriber *subscriber, gcal_year_view_get_child_cell (GcalSubscriberView *subscriber,
GcalEventWidget *child) GcalEventWidget *child)
{ {
const icaltimetype *dt_start = gcal_event_widget_peek_start_date (child); const icaltimetype *dt_start = gcal_event_widget_peek_start_date (child);
return dt_start->month; return dt_start->month;
@@ -1003,10 +1000,10 @@ static GtkWidget*
gcal_year_view_get_by_uuid (GcalView *view, gcal_year_view_get_by_uuid (GcalView *view,
const gchar *uuid) const gchar *uuid)
{ {
GcalSubscriberPrivate *priv; GcalSubscriberViewPrivate *priv;
GList *l; GList *l;
priv = GCAL_SUBSCRIBER (view)->priv; priv = GCAL_SUBSCRIBER_VIEW (view)->priv;
l = g_hash_table_lookup (priv->children, uuid); l = g_hash_table_lookup (priv->children, uuid);
if (l != NULL) if (l != NULL)
return (GtkWidget*) l->data; return (GtkWidget*) l->data;
src/gcal-year-view.h
+2 -2
View File
@@ -38,12 +38,12 @@ typedef struct _GcalYearViewClass GcalYearViewClass;
struct _GcalYearView struct _GcalYearView
{ {
GcalSubscriber parent; GcalSubscriberView parent;
}; };
struct _GcalYearViewClass struct _GcalYearViewClass
{ {
GcalSubscriberClass parent_class; GcalSubscriberViewClass parent_class;
/* signals */ /* signals */
void (*new_event) (gint new_day); void (*new_event) (gint new_day);