From 852c5eda9f54623b4de6dc9d96e0d98e7e946eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erick=20P=C3=A9rez=20Castellanos?= Date: Thu, 23 Oct 2014 01:00:56 -0400 Subject: [PATCH] style: remove duplicated '_subscriber' prefix --- src/gcal-subscriber.c | 64 ++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/src/gcal-subscriber.c b/src/gcal-subscriber.c index 2b41078c..e4caa0af 100644 --- a/src/gcal-subscriber.c +++ b/src/gcal-subscriber.c @@ -25,22 +25,22 @@ static void gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface); -static void gcal_subscriber_subscriber_component_added (ECalDataModelSubscriber *subscriber, - ECalClient *client, - ECalComponent *comp); +static void gcal_subscriber_component_added (ECalDataModelSubscriber *subscriber, + ECalClient *client, + ECalComponent *comp); -static void gcal_subscriber_subscriber_component_modified (ECalDataModelSubscriber *subscriber, - ECalClient *client, - ECalComponent *comp); +static void gcal_subscriber_component_modified (ECalDataModelSubscriber *subscriber, + ECalClient *client, + ECalComponent *comp); -static void gcal_subscriber_subscriber_component_removed (ECalDataModelSubscriber *subscriber, - ECalClient *client, - const gchar *uid, - const gchar *rid); +static void gcal_subscriber_component_removed (ECalDataModelSubscriber *subscriber, + ECalClient *client, + const gchar *uid, + const gchar *rid); -static void gcal_subscriber_subscriber_freeze (ECalDataModelSubscriber *subscriber); +static void gcal_subscriber_freeze (ECalDataModelSubscriber *subscriber); -static void gcal_subscriber_subscriber_thaw (ECalDataModelSubscriber *subscriber); +static void gcal_subscriber_thaw (ECalDataModelSubscriber *subscriber); G_DEFINE_TYPE_WITH_CODE (GcalSubscriber, gcal_subscriber, @@ -64,18 +64,18 @@ gcal_subscriber_init (GcalSubscriber *self) static void gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface) { - iface->component_added = gcal_subscriber_subscriber_component_added; - iface->component_modified = gcal_subscriber_subscriber_component_modified; - iface->component_removed = gcal_subscriber_subscriber_component_removed; - iface->freeze = gcal_subscriber_subscriber_freeze; - iface->thaw = gcal_subscriber_subscriber_thaw; + iface->component_added = gcal_subscriber_component_added; + iface->component_modified = gcal_subscriber_component_modified; + iface->component_removed = gcal_subscriber_component_removed; + iface->freeze = gcal_subscriber_freeze; + iface->thaw = gcal_subscriber_thaw; } /* ECalDataModelSubscriber interface API */ static void -gcal_subscriber_subscriber_component_added (ECalDataModelSubscriber *subscriber, - ECalClient *client, - ECalComponent *comp) +gcal_subscriber_component_added (ECalDataModelSubscriber *subscriber, + ECalClient *client, + ECalComponent *comp) { GtkWidget *event; GcalEventData *data; @@ -92,9 +92,9 @@ gcal_subscriber_subscriber_component_added (ECalDataModelSubscriber *subscriber, } static void -gcal_subscriber_subscriber_component_modified (ECalDataModelSubscriber *subscriber, - ECalClient *client, - ECalComponent *comp) +gcal_subscriber_component_modified (ECalDataModelSubscriber *subscriber, + ECalClient *client, + ECalComponent *comp) { GtkWidget *event; GtkWidget *widget; @@ -108,8 +108,10 @@ gcal_subscriber_subscriber_component_modified (ECalDataModelSubscriber *subscrib g_free (data); widget = - gcal_view_get_by_uuid (GCAL_VIEW (subscriber), - gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (event))); + gcal_view_get_by_uuid ( + GCAL_VIEW (subscriber), + gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (event))); + if (widget != NULL) { gtk_widget_destroy (widget); @@ -120,10 +122,10 @@ gcal_subscriber_subscriber_component_modified (ECalDataModelSubscriber *subscrib } static void -gcal_subscriber_subscriber_component_removed (ECalDataModelSubscriber *subscriber, - ECalClient *client, - const gchar *uid, - const gchar *rid) +gcal_subscriber_component_removed (ECalDataModelSubscriber *subscriber, + ECalClient *client, + const gchar *uid, + const gchar *rid) { GtkWidget *widget; const gchar *sid; @@ -147,11 +149,11 @@ gcal_subscriber_subscriber_component_removed (ECalDataModelSubscriber *subscribe } static void -gcal_subscriber_subscriber_freeze (ECalDataModelSubscriber *subscriber) +gcal_subscriber_freeze (ECalDataModelSubscriber *subscriber) { } static void -gcal_subscriber_subscriber_thaw (ECalDataModelSubscriber *subscriber) +gcal_subscriber_thaw (ECalDataModelSubscriber *subscriber) { }