diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2010-04-12 19:28:17 +0100 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2010-04-12 19:28:17 +0100 |
| commit | 043bbfaf99f6cd4e186d458a1fbfae537d6e1a78 (patch) | |
| tree | 5478974bdae34867dffdf766743dc6d70d1ffb66 /gdata/services | |
| parent | 886a47e9cdbd964fb8808af59ccf7f670b865edf (diff) | |
| download | libgdata-043bbfaf99f6cd4e186d458a1fbfae537d6e1a78.tar.gz | |
[core] Whitespace fixes
Make indentation and whitespacing consistent throughout the entire project.
I am so sad.
Diffstat (limited to 'gdata/services')
44 files changed, 1008 insertions, 1024 deletions
diff --git a/gdata/services/calendar/gdata-calendar-calendar.c b/gdata/services/calendar/gdata-calendar-calendar.c index a469fe6f..2e1df861 100644 --- a/gdata/services/calendar/gdata-calendar-calendar.c +++ b/gdata/services/calendar/gdata-calendar-calendar.c @@ -76,7 +76,7 @@ enum { }; G_DEFINE_TYPE_WITH_CODE (GDataCalendarCalendar, gdata_calendar_calendar, GDATA_TYPE_ENTRY, - G_IMPLEMENT_INTERFACE (GDATA_TYPE_ACCESS_HANDLER, gdata_calendar_calendar_access_handler_init)) + G_IMPLEMENT_INTERFACE (GDATA_TYPE_ACCESS_HANDLER, gdata_calendar_calendar_access_handler_init)) static void gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass) @@ -101,21 +101,21 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass) * url="http://en.wikipedia.org/wiki/Tz_database#Names_of_time_zones">reference</ulink>. **/ g_object_class_install_property (gobject_class, PROP_TIMEZONE, - g_param_spec_string ("timezone", - "Timezone", "The timezone in which the calendar's times are given.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("timezone", + "Timezone", "The timezone in which the calendar's times are given.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarCalendar:times-cleaned: * - * The number of times the calendar has been completely cleared of events. + * The number of times the calendar has been cleared of events. **/ g_object_class_install_property (gobject_class, PROP_TIMES_CLEANED, - g_param_spec_uint ("times-cleaned", - "Times cleaned", "The number of times the calendar has been completely cleared of events.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("times-cleaned", + "Times cleaned", "The number of times the calendar has been cleared of events.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarCalendar:is-hidden: @@ -125,10 +125,10 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass) * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_IS_HIDDEN, - g_param_spec_boolean ("is-hidden", - "Hidden?", "Indicates whether the calendar is visible.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("is-hidden", + "Hidden?", "Indicates whether the calendar is visible.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarCalendar:color: @@ -136,10 +136,10 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass) * The color used to highlight the calendar in the user's browser. **/ g_object_class_install_property (gobject_class, PROP_COLOR, - g_param_spec_boxed ("color", - "Color", "The color used to highlight the calendar in the user's browser.", - GDATA_TYPE_COLOR, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("color", + "Color", "The color used to highlight the calendar in the user's browser.", + GDATA_TYPE_COLOR, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarCalendar:is-selected: @@ -149,22 +149,22 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass) * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_IS_SELECTED, - g_param_spec_boolean ("is-selected", - "Selected?", "Indicates whether the calendar is selected.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("is-selected", + "Selected?", "Indicates whether the calendar is selected.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarCalendar:access-level: * - * Indicates what level of access the authenticated user has to the calendar. For example: %GDATA_CALENDAR_ACCESS_ROLE_READ or - * %GDATA_CALENDAR_ACCESS_ROLE_FREE_BUSY. + * Indicates the access level the current user has to the calendar. For example: %GDATA_CALENDAR_ACCESS_ROLE_READ or + * %GDATA_CALENDAR_ACCESS_ROLE_FREE_BUSY. The "current user" is the one logged in with gdata_service_authenticate() or the guest user. **/ g_object_class_install_property (gobject_class, PROP_ACCESS_LEVEL, - g_param_spec_string ("access-level", - "Access level", "Indicates what level of access the authenticated user has to the calendar.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("access-level", + "Access level", "Indicates the access level the current user has to the calendar.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarCalendar:edited: @@ -175,10 +175,10 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass) * Atom Publishing Protocol specification</ulink>. **/ g_object_class_install_property (gobject_class, PROP_EDITED, - g_param_spec_boxed ("edited", - "Edited", "The last time the calendar was edited.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("edited", + "Edited", "The last time the calendar was edited.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static gboolean @@ -308,13 +308,14 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da if (gdata_color_from_hexadecimal ((gchar*) value, &colour) == FALSE) { /* Error */ g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - /* Translators: the first parameter is the name of an XML element (including the angle brackets - * ("<" and ">"), and the second parameter is the erroneous value (which was not in hexadecimal - * RGB format). - * - * For example: - * The content of a <entry/gCal:color> element ("00FG56") was not in hexadecimal RGB format. */ - _("The content of a %s element (\"%s\") was not in hexadecimal RGB format."), "<entry/gCal:color>", value); + /* Translators: the first parameter is the name of an XML element (including the angle brackets + * ("<" and ">"), and the second parameter is the erroneous value (which was not in hexadecimal + * RGB format). + * + * For example: + * The content of a <entry/gCal:color> element ("00FG56") was not in hexadecimal RGB format. */ + _("The content of a %s element (\"%s\") was not in hexadecimal RGB format."), + "<entry/gCal:color>", value); xmlFree (value); return FALSE; diff --git a/gdata/services/calendar/gdata-calendar-event.c b/gdata/services/calendar/gdata-calendar-event.c index 38842f10..7d7fbbfd 100644 --- a/gdata/services/calendar/gdata-calendar-event.c +++ b/gdata/services/calendar/gdata-calendar-event.c @@ -113,10 +113,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass) * Atom Publishing Protocol specification</ulink>. **/ g_object_class_install_property (gobject_class, PROP_EDITED, - g_param_spec_boxed ("edited", - "Edited", "The last time the event was edited.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("edited", + "Edited", "The last time the event was edited.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:status: @@ -129,10 +129,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass) * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_STATUS, - g_param_spec_string ("status", - "Status", "The scheduling status of the event.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("status", + "Status", "The scheduling status of the event.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:visibility: @@ -143,10 +143,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass) * GData specification</ulink>. **/ g_object_class_install_property (gobject_class, PROP_VISIBILITY, - g_param_spec_string ("visibility", - "Visibility", "The event's visibility to calendar users.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("visibility", + "Visibility", "The event's visibility to calendar users.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:transparency: @@ -158,10 +158,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass) * GData specification</ulink>. **/ g_object_class_install_property (gobject_class, PROP_TRANSPARENCY, - g_param_spec_string ("transparency", - "Transparency", "How the event is marked as consuming time on a calendar.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("transparency", + "Transparency", "How the event is marked as consuming time on a calendar.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:uid: @@ -170,10 +170,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass) * url="http://www.ietf.org/rfc/rfc2445.txt">RFC 2445</ulink>. **/ g_object_class_install_property (gobject_class, PROP_UID, - g_param_spec_string ("uid", - "UID", "The globally unique identifier (UID) of the event.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("uid", + "UID", "The globally unique identifier (UID) of the event.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:sequence: @@ -182,64 +182,64 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass) * url="http://www.ietf.org/rfc/rfc2445.txt">RFC 2445</ulink>. **/ g_object_class_install_property (gobject_class, PROP_SEQUENCE, - g_param_spec_uint ("sequence", - "Sequence", "The revision sequence number of the event.", - 0, G_MAXUINT, 0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("sequence", + "Sequence", "The revision sequence number of the event.", + 0, G_MAXUINT, 0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:guests-can-modify: * - * Indicates whether event attendees may modify the original event, so that changes are visible to organizer and other attendees. + * Indicates whether attendees may modify the original event, so that changes are visible to organizers and other attendees. * Otherwise, any changes made by attendees will be restricted to that attendee's calendar. * * For more information, see the <ulink type="http" url="http://code.google.com/apis/calendar/docs/2.0/reference.html#gCalguestsCanModify"> * GData specification</ulink>. **/ g_object_class_install_property (gobject_class, PROP_GUESTS_CAN_MODIFY, - g_param_spec_boolean ("guests-can-modify", - "Guests can modify", "Indicates whether event attendees may modify the original event.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("guests-can-modify", + "Guests can modify", "Indicates whether attendees may modify the original event.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:guests-can-invite-others: * - * Indicates whether event attendees may invite other people to the event. + * Indicates whether attendees may invite others to the event. * * For more information, see the <ulink type="http" * url="http://code.google.com/apis/calendar/docs/2.0/reference.html#gCalguestsCanInviteOthers">GData specification</ulink>. **/ g_object_class_install_property (gobject_class, PROP_GUESTS_CAN_INVITE_OTHERS, - g_param_spec_boolean ("guests-can-invite-others", - "Guests can invite others", "Indicates whether event attendees may invite other people to the event.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("guests-can-invite-others", + "Guests can invite others", "Indicates whether attendees may invite others.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:guests-can-see-guests: * - * Indicates whether event attendees can see other people invited to the event. + * Indicates whether attendees can see other people invited to the event. * * For more information, see the <ulink type="http" url="http://code.google.com/apis/calendar/docs/2.0/reference.html#gCalguestsCanSeeGuests"> * GData specification</ulink>. **/ g_object_class_install_property (gobject_class, PROP_GUESTS_CAN_SEE_GUESTS, - g_param_spec_boolean ("guests-can-see-guests", - "Guests can see guests", "Indicates whether event attendees can see other people invited to the event.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("guests-can-see-guests", + "Guests can see guests", "Indicates whether attendees can see other people invited.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:anyone-can-add-self: * - * Indicates whether anyone can add themselves to the attendee list of the event. + * Indicates whether anyone can invite themselves to the event, by adding themselves to the attendee list. **/ g_object_class_install_property (gobject_class, PROP_ANYONE_CAN_ADD_SELF, - g_param_spec_boolean ("anyone-can-add-self", - "Anyone can add self", "Indicates whether anyone can add themselves to the attendee list of the event.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("anyone-can-add-self", + "Anyone can add self", "Indicates whether anyone can invite themselves to the event.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:recurrence: @@ -252,10 +252,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_RECURRENCE, - g_param_spec_string ("recurrence", - "Recurrence", "Represents the dates and times when a recurring event takes place.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("recurrence", + "Recurrence", "Represents the dates and times when a recurring event takes place.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:original-event-id: @@ -265,10 +265,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_ORIGINAL_EVENT_ID, - g_param_spec_string ("original-event-id", - "Original event ID", "The event ID for the original event, if this event is an exception to a recurring event.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("original-event-id", + "Original event ID", "The event ID for the original event.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarEvent:original-event-uri: @@ -278,11 +278,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_ORIGINAL_EVENT_URI, - g_param_spec_string ("original-event-uri", - "Original event URI", "The event URI for the original event, if this event is an exception" - " to a recurring event.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("original-event-uri", + "Original event URI", "The event URI for the original event.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/gdata/services/calendar/gdata-calendar-feed.c b/gdata/services/calendar/gdata-calendar-feed.c index 634f848f..a54cf0c3 100644 --- a/gdata/services/calendar/gdata-calendar-feed.c +++ b/gdata/services/calendar/gdata-calendar-feed.c @@ -72,10 +72,10 @@ gdata_calendar_feed_class_init (GDataCalendarFeedClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_TIMEZONE, - g_param_spec_string ("timezone", - "Timezone", "The timezone in which the feed's times are given.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("timezone", + "Timezone", "The timezone in which the feed's times are given.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarFeed:times-cleaned: @@ -85,10 +85,10 @@ gdata_calendar_feed_class_init (GDataCalendarFeedClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_TIMES_CLEANED, - g_param_spec_uint ("times-cleaned", - "Times cleaned", "The number of times the feed has been completely cleared of entries.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("times-cleaned", + "Times cleaned", "The number of times the feed has been completely cleared of entries.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/gdata/services/calendar/gdata-calendar-query.c b/gdata/services/calendar/gdata-calendar-query.c index adf0f815..a576a3a8 100644 --- a/gdata/services/calendar/gdata-calendar-query.c +++ b/gdata/services/calendar/gdata-calendar-query.c @@ -86,15 +86,15 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass) /** * GDataCalendarQuery:future-events: * - * A shortcut to request all events that are scheduled for future times. Overrides the + * A shortcut to request all events scheduled for the future. Overrides the * #GDataCalendarQuery:recurrence-expansion-start, #GDataCalendarQuery:recurrence-expansion-end, * #GDataCalendarQuery:start-min and #GDataCalendarQuery:start-max properties. **/ g_object_class_install_property (gobject_class, PROP_FUTURE_EVENTS, - g_param_spec_boolean ("future-events", - "Future events?", "A shortcut to request all events that are scheduled for future times.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("future-events", + "Future events?", "A shortcut to request all events scheduled for the future.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarQuery:order-by: @@ -103,32 +103,32 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass) * <literal>starttime</literal>. **/ g_object_class_install_property (gobject_class, PROP_ORDER_BY, - g_param_spec_string ("order-by", - "Order by", "Specifies order of entries in a feed.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("order-by", + "Order by", "Specifies order of entries in a feed.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarQuery:recurrence-expansion-start: * - * Specifies beginning of time period for which to expand recurring events, inclusive. + * Specifies the beginning of the time period to expand recurring events for, inclusive. **/ g_object_class_install_property (gobject_class, PROP_RECURRENCE_EXPANSION_START, - g_param_spec_boxed ("recurrence-expansion-start", - "Recurrence expansion start", "Specifies beginning of time period for which to expand recurring events.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("recurrence-expansion-start", + "Recurrence expansion start", "Specifies start of period to expand recurrences for.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarQuery:recurrence-expansion-end: * - * Specifies end of time period for which to expand recurring events, exclusive. + * Specifies the end of the time period to expand recurring events for, exclusive. **/ g_object_class_install_property (gobject_class, PROP_RECURRENCE_EXPANSION_END, - g_param_spec_boxed ("recurrence-expansion-end", - "Recurrence expansion end", "Specifies end of time period for which to expand recurring events.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("recurrence-expansion-end", + "Recurrence expansion end", "Specifies end of period to expand recurrences for.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarQuery:single-events: @@ -136,10 +136,10 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass) * Indicates whether recurring events should be expanded or represented as a single event. **/ g_object_class_install_property (gobject_class, PROP_SINGLE_EVENTS, - g_param_spec_boolean ("single-events", - "Single events?", "Indicates whether recurring events should be expanded or represented as a single event.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("single-events", + "Single events?", "Indicates whether recurring events should be expanded.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarQuery:sort-order: @@ -148,15 +148,15 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass) * <literal>descending</literal>. **/ g_object_class_install_property (gobject_class, PROP_SORT_ORDER, - g_param_spec_string ("sort-order", - "Sort order", "Specifies direction of sorting.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("sort-order", + "Sort order", "Specifies direction of sorting.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarQuery:start-min: * - * Together with #GDataCalendarQuery:start-max creates a timespan such that only events that are within the timespan are returned. + * Together with #GDataCalendarQuery:start-max, creates a timespan such that only events within the timespan are returned. * * #GDataCalendarQuery:start-min is inclusive, while #GDataCalendarQuery:start-max is exclusive. Events that overlap the range are * included. @@ -164,15 +164,15 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass) * If not specified, the default #GDataCalendarQuery:start-min is <literal>1970-01-01</literal>. **/ g_object_class_install_property (gobject_class, PROP_START_MIN, - g_param_spec_boxed ("start-min", - "Start min", "A timespan such that only events that are within the timespan are returned.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("start-min", + "Start min", "A timespan such that only events within the timespan are returned.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarQuery:start-max: * - * Together with #GDataCalendarQuery:start-min creates a timespan such that only events that are within the timespan are returned + * Together with #GDataCalendarQuery:start-min, creates a timespan such that only events within the timespan are returned * * #GDataCalendarQuery:start-min is inclusive, while #GDataCalendarQuery:start-max is exclusive. Events that overlap the range are * included. @@ -180,23 +180,23 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass) * If not specified, the default #GDataCalendarQuery:start-max is <literal>2031-01-01</literal>. **/ g_object_class_install_property (gobject_class, PROP_START_MAX, - g_param_spec_boxed ("start-max", - "Start max", "A timespan such that only events that are within the timespan are returned.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("start-max", + "Start max", "A timespan such that only events within the timespan are returned.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataCalendarQuery:timezone: * - * The current timezone. If not specified, times are returned in UTC. + * The current timezone. If this is not specified, all times are returned in UTC. * * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_TIMEZONE, - g_param_spec_string ("timezone", - "Timezone", "The current timezone. If not specified, times are returned in UTC.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("timezone", + "Timezone", "The current timezone.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -408,10 +408,10 @@ GDataCalendarQuery * gdata_calendar_query_new_with_limits (const gchar *q, const GTimeVal *start_min, const GTimeVal *start_max) { return g_object_new (GDATA_TYPE_CALENDAR_QUERY, - "q", q, - "start-min", start_min, - "start-max", start_max, - NULL); + "q", q, + "start-min", start_min, + "start-max", start_max, + NULL); } /** diff --git a/gdata/services/calendar/gdata-calendar-query.h b/gdata/services/calendar/gdata-calendar-query.h index b1b226cc..649d1655 100644 --- a/gdata/services/calendar/gdata-calendar-query.h +++ b/gdata/services/calendar/gdata-calendar-query.h @@ -60,8 +60,8 @@ typedef struct { GType gdata_calendar_query_get_type (void) G_GNUC_CONST; GDataCalendarQuery *gdata_calendar_query_new (const gchar *q) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; -GDataCalendarQuery *gdata_calendar_query_new_with_limits (const gchar *q, - const GTimeVal *start_min, const GTimeVal *start_max) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; +GDataCalendarQuery *gdata_calendar_query_new_with_limits (const gchar *q, const GTimeVal *start_min, + const GTimeVal *start_max) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; gboolean gdata_calendar_query_get_future_events (GDataCalendarQuery *self); void gdata_calendar_query_set_future_events (GDataCalendarQuery *self, gboolean future_events); diff --git a/gdata/services/calendar/gdata-calendar-service.c b/gdata/services/calendar/gdata-calendar-service.c index ab6d2f5b..5e466c8f 100644 --- a/gdata/services/calendar/gdata-calendar-service.c +++ b/gdata/services/calendar/gdata-calendar-service.c @@ -72,10 +72,7 @@ GDataCalendarService * gdata_calendar_service_new (const gchar *client_id) { g_return_val_if_fail (client_id != NULL, NULL); - - return g_object_new (GDATA_TYPE_CALENDAR_SERVICE, - "client-id", client_id, - NULL); + return g_object_new (GDATA_TYPE_CALENDAR_SERVICE, "client-id", client_id, NULL); } /** @@ -97,7 +94,7 @@ gdata_calendar_service_new (const gchar *client_id) **/ GDataFeed * gdata_calendar_service_query_all_calendars (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) { GDataFeed *feed; gchar *request_uri; @@ -110,7 +107,7 @@ gdata_calendar_service_query_all_calendars (GDataCalendarService *self, GDataQue /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to query all calendars.")); + _("You must be authenticated to query all calendars.")); return NULL; } @@ -141,8 +138,8 @@ gdata_calendar_service_query_all_calendars (GDataCalendarService *self, GDataQue **/ void gdata_calendar_service_query_all_calendars_async (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data) { gchar *request_uri; @@ -154,8 +151,8 @@ gdata_calendar_service_query_all_calendars_async (GDataCalendarService *self, GD /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, - GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to query all calendars.")); + GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, + _("You must be authenticated to query all calendars.")); return; } @@ -184,7 +181,7 @@ gdata_calendar_service_query_all_calendars_async (GDataCalendarService *self, GD **/ GDataFeed * gdata_calendar_service_query_own_calendars (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) { GDataFeed *feed; gchar *request_uri; @@ -197,7 +194,7 @@ gdata_calendar_service_query_own_calendars (GDataCalendarService *self, GDataQue /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to query your own calendars.")); + _("You must be authenticated to query your own calendars.")); return NULL; } @@ -228,8 +225,8 @@ gdata_calendar_service_query_own_calendars (GDataCalendarService *self, GDataQue **/ void gdata_calendar_service_query_own_calendars_async (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data) { gchar *request_uri; @@ -241,8 +238,8 @@ gdata_calendar_service_query_own_calendars_async (GDataCalendarService *self, GD /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, - GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to query your own calendars.")); + GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, + _("You must be authenticated to query your own calendars.")); return; } @@ -270,7 +267,7 @@ gdata_calendar_service_query_own_calendars_async (GDataCalendarService *self, GD **/ GDataFeed * gdata_calendar_service_query_events (GDataCalendarService *self, GDataCalendarCalendar *calendar, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) { /* TODO: Async variant */ const gchar *uri; @@ -284,7 +281,7 @@ gdata_calendar_service_query_events (GDataCalendarService *self, GDataCalendarCa /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to query your own calendars.")); + _("You must be authenticated to query your own calendars.")); return NULL; } @@ -293,13 +290,13 @@ gdata_calendar_service_query_events (GDataCalendarService *self, GDataCalendarCa if (uri == NULL) { /* Erroring out is probably the safest thing to do */ g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - _("The calendar did not have a content source.")); + _("The calendar did not have a content source.")); return NULL; } /* Execute the query */ return gdata_service_query (GDATA_SERVICE (self), uri, query, GDATA_TYPE_CALENDAR_EVENT, cancellable, - progress_callback, progress_user_data, error); + progress_callback, progress_user_data, error); } /** diff --git a/gdata/services/calendar/gdata-calendar-service.h b/gdata/services/calendar/gdata-calendar-service.h index 84941926..099211c0 100644 --- a/gdata/services/calendar/gdata-calendar-service.h +++ b/gdata/services/calendar/gdata-calendar-service.h @@ -62,27 +62,27 @@ GType gdata_calendar_service_get_type (void) G_GNUC_CONST; GDataCalendarService *gdata_calendar_service_new (const gchar *client_id) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataFeed *gdata_calendar_service_query_all_calendars (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; void gdata_calendar_service_query_all_calendars_async (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data); + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data); GDataFeed *gdata_calendar_service_query_own_calendars (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; void gdata_calendar_service_query_own_calendars_async (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data); + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data); GDataFeed *gdata_calendar_service_query_events (GDataCalendarService *self, GDataCalendarCalendar *calendar, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; #include <gdata/services/calendar/gdata-calendar-event.h> GDataCalendarEvent *gdata_calendar_service_insert_event (GDataCalendarService *self, GDataCalendarEvent *event, - GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; G_END_DECLS diff --git a/gdata/services/contacts/gdata-contacts-contact.c b/gdata/services/contacts/gdata-contacts-contact.c index 8e007f2f..b47781d6 100644 --- a/gdata/services/contacts/gdata-contacts-contact.c +++ b/gdata/services/contacts/gdata-contacts-contact.c @@ -155,10 +155,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_EDITED, - g_param_spec_boxed ("edited", - "Edited", "The last time the contact was edited.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("edited", + "Edited", "The last time the contact was edited.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:deleted: @@ -168,10 +168,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_DELETED, - g_param_spec_boolean ("deleted", - "Deleted", "Whether the entry has been deleted.", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("deleted", + "Deleted", "Whether the entry has been deleted.", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:has-photo: @@ -181,10 +181,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_HAS_PHOTO, - g_param_spec_boolean ("has-photo", - "Has photo?", "Whether the contact has a photo.", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("has-photo", + "Has photo?", "Whether the contact has a photo.", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:name: @@ -194,10 +194,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_NAME, - g_param_spec_object ("name", - "Name", "The contact's name in a structured representation.", - GDATA_TYPE_GD_NAME, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_object ("name", + "Name", "The contact's name in a structured representation.", + GDATA_TYPE_GD_NAME, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:nickname: @@ -207,10 +207,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_NICKNAME, - g_param_spec_string ("nickname", - "Nickname", "The contact's chosen nickname.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("nickname", + "Nickname", "The contact's chosen nickname.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:birthday: @@ -220,23 +220,23 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_BIRTHDAY, - g_param_spec_boxed ("birthday", - "Birthday", "The contact's birthday.", - G_TYPE_DATE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("birthday", + "Birthday", "The contact's birthday.", + G_TYPE_DATE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:birthday-has-year: * - * Whether the contact's birthday includes the year of their birth. + * Whether the contact's birthday includes their year of birth. * * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_BIRTHDAY_HAS_YEAR, - g_param_spec_boolean ("birthday-has-year", - "Birthday has year?", "Whether the contact's birthday includes the year of their birth.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("birthday-has-year", + "Birthday has year?", "Whether the contact's birthday includes their year of birth.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:billing-information: @@ -246,10 +246,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_BILLING_INFORMATION, - g_param_spec_string ("billing-information", - "Billing information", "Billing information for the contact.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("billing-information", + "Billing information", "Billing information for the contact.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:directory-server: @@ -259,10 +259,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_DIRECTORY_SERVER, - g_param_spec_string ("directory-server", - "Directory server", "The name or address of a directory server associated with the contact.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("directory-server", + "Directory server", "The name or address of an associated directory server.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:gender: @@ -272,10 +272,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_GENDER, - g_param_spec_string ("gender", - "Gender", "The gender of the contact.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("gender", + "Gender", "The gender of the contact.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:initials: @@ -285,10 +285,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_INITIALS, - g_param_spec_string ("initials", - "Initials", "The initials of the contact.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("initials", + "Initials", "The initials of the contact.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:maiden-name: @@ -298,10 +298,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_MAIDEN_NAME, - g_param_spec_string ("maiden-name", - "Maiden name", "The maiden name of the contact.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("maiden-name", + "Maiden name", "The maiden name of the contact.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:mileage: @@ -311,10 +311,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_MILEAGE, - g_param_spec_string ("mileage", - "Mileage", "A mileage associated with the contact, such as one for reimbursement purposes.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("mileage", + "Mileage", "A mileage associated with the contact.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:occupation: @@ -324,10 +324,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_OCCUPATION, - g_param_spec_string ("occupation", - "Occupation", "The contact's occupation.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("occupation", + "Occupation", "The contact's occupation.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:priority: @@ -337,10 +337,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_PRIORITY, - g_param_spec_string ("priority", - "Priority", "The contact's importance.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("priority", + "Priority", "The contact's importance.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:sensitivity: @@ -350,10 +350,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_SENSITIVITY, - g_param_spec_string ("sensitivity", - "Sensitivity", "The sensitivity of the contact's data.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("sensitivity", + "Sensitivity", "The sensitivity of the contact's data.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:short-name: @@ -364,10 +364,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_SHORT_NAME, - g_param_spec_string ("short-name", - "Short name", "A short name for the contact.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("short-name", + "Short name", "A short name for the contact.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsContact:subject: @@ -377,10 +377,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_SUBJECT, - g_param_spec_string ("subject", - "Subject", "The subject of the contact.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("subject", + "Subject", "The subject of the contact.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void notify_full_name_cb (GObject *gobject, GParamSpec *pspec, GDataContactsContact *self); @@ -2873,7 +2873,7 @@ gdata_contacts_contact_has_photo (GDataContactsContact *self) **/ gchar * gdata_contacts_contact_get_photo (GDataContactsContact *self, GDataContactsService *service, gsize *length, gchar **content_type, - GCancellable *cancellable, GError **error) + GCancellable *cancellable, GError **error) { GDataLink *link; SoupMessage *message; @@ -2952,7 +2952,7 @@ gdata_contacts_contact_get_photo (GDataContactsContact *self, GDataContactsServi **/ gboolean gdata_contacts_contact_set_photo (GDataContactsContact *self, GDataService *service, const gchar *data, gsize length, - GCancellable *cancellable, GError **error) + GCancellable *cancellable, GError **error) { GDataLink *link; SoupMessage *message; diff --git a/gdata/services/contacts/gdata-contacts-query.c b/gdata/services/contacts/gdata-contacts-query.c index 1e269cc5..f034c783 100644 --- a/gdata/services/contacts/gdata-contacts-query.c +++ b/gdata/services/contacts/gdata-contacts-query.c @@ -83,10 +83,10 @@ gdata_contacts_query_class_init (GDataContactsQueryClass *klass) * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_ORDER_BY, - g_param_spec_string ("order-by", - "Order by", "Sorting criterion.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("order-by", + "Order by", "Sorting criterion.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsQuery:show-deleted: @@ -98,10 +98,10 @@ gdata_contacts_query_class_init (GDataContactsQueryClass *klass) * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_SHOW_DELETED, - g_param_spec_boolean ("show-deleted", - "Show deleted?", "Whether to include deleted contacts in the query feed.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("show-deleted", + "Show deleted?", "Whether to include deleted contacts in the query feed.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsQuery:sort-order: @@ -111,24 +111,24 @@ gdata_contacts_query_class_init (GDataContactsQueryClass *klass) * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_SORT_ORDER, - g_param_spec_string ("sort-order", - "Sort order", "Sorting order direction.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("sort-order", + "Sort order", "Sorting order direction.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataContactsQuery:group: * - * Constrains the results to only the contacts belonging to the group specified. The value of this parameter + * Constrains the results to only those belonging to the group specified. The value of this parameter * should be a group ID URI. * * Since: 0.2.0 **/ g_object_class_install_property (gobject_class, PROP_GROUP, - g_param_spec_string ("group", - "Group", "Constrains the results to only the contacts belonging to the group specified.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("group", + "Group", "Constrains the results to only those belonging to the group specified.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -268,10 +268,10 @@ GDataContactsQuery * gdata_contacts_query_new_with_limits (const gchar *q, guint start_index, guint max_results) { return g_object_new (GDATA_TYPE_CONTACTS_QUERY, - "q", q, - "start-index", start_index, - "max-results", max_results, - NULL); + "q", q, + "start-index", start_index, + "max-results", max_results, + NULL); } /** diff --git a/gdata/services/contacts/gdata-contacts-query.h b/gdata/services/contacts/gdata-contacts-query.h index 2805901d..a00a6c5f 100644 --- a/gdata/services/contacts/gdata-contacts-query.h +++ b/gdata/services/contacts/gdata-contacts-query.h @@ -63,7 +63,8 @@ typedef struct { GType gdata_contacts_query_get_type (void) G_GNUC_CONST; GDataContactsQuery *gdata_contacts_query_new (const gchar *q) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; -GDataContactsQuery *gdata_contacts_query_new_with_limits (const gchar *q, guint start_index, guint max_results) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; +GDataContactsQuery *gdata_contacts_query_new_with_limits (const gchar *q, guint start_index, + guint max_results) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; const gchar *gdata_contacts_query_get_order_by (GDataContactsQuery *self); void gdata_contacts_query_set_order_by (GDataContactsQuery *self, const gchar *order_by); diff --git a/gdata/services/contacts/gdata-contacts-service.c b/gdata/services/contacts/gdata-contacts-service.c index 5a20c46b..442fa678 100644 --- a/gdata/services/contacts/gdata-contacts-service.c +++ b/gdata/services/contacts/gdata-contacts-service.c @@ -75,8 +75,8 @@ gdata_contacts_service_new (const gchar *client_id) g_return_val_if_fail (client_id != NULL, NULL); return g_object_new (GDATA_TYPE_CONTACTS_SERVICE, - "client-id", client_id, - NULL); + "client-id", client_id, + NULL); } /** @@ -98,7 +98,7 @@ gdata_contacts_service_new (const gchar *client_id) **/ GDataFeed * gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) { GDataFeed *feed; gchar *request_uri; @@ -111,7 +111,7 @@ gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *q /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to query contacts.")); + _("You must be authenticated to query contacts.")); return NULL; } @@ -143,8 +143,8 @@ gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *q **/ void gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data) { gchar *request_uri; @@ -156,8 +156,8 @@ gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataQu /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, - GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to query contacts.")); + GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, + _("You must be authenticated to query contacts.")); return; } diff --git a/gdata/services/contacts/gdata-contacts-service.h b/gdata/services/contacts/gdata-contacts-service.h index 5206f13b..2dbfc00d 100644 --- a/gdata/services/contacts/gdata-contacts-service.h +++ b/gdata/services/contacts/gdata-contacts-service.h @@ -65,18 +65,18 @@ GType gdata_contacts_service_get_type (void) G_GNUC_CONST; GDataContactsService *gdata_contacts_service_new (const gchar *client_id) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataFeed *gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; void gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data); + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data); #include <gdata/services/contacts/gdata-contacts-contact.h> GDataContactsContact *gdata_contacts_service_insert_contact (GDataContactsService *self, GDataContactsContact *contact, - GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataContactsContact *gdata_contacts_service_update_contact (GDataContactsService *self, GDataContactsContact *contact, - GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; G_END_DECLS diff --git a/gdata/services/documents/gdata-documents-entry.c b/gdata/services/documents/gdata-documents-entry.c index c4728866..d371ee49 100644 --- a/gdata/services/documents/gdata-documents-entry.c +++ b/gdata/services/documents/gdata-documents-entry.c @@ -30,8 +30,8 @@ * access roles defined for the base #GDataAccessRule (e.g. %GDATA_ACCESS_ROLE_NONE), #GDataDocumentsEntry has its own, such as * %GDATA_DOCUMENTS_ACCESS_ROLE_OWNER and %GDATA_DOCUMENTS_ACCESS_ROLE_READER. * - * For more details of Google Documents' GData API, see the <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html"> - * online documentation</ulink>. + * For more details of Google Documents' GData API, see the + * <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html">online documentation</ulink>. * * Since: 0.4.0 **/ @@ -77,7 +77,7 @@ enum { }; G_DEFINE_TYPE_WITH_CODE (GDataDocumentsEntry, gdata_documents_entry, GDATA_TYPE_ENTRY, - G_IMPLEMENT_INTERFACE (GDATA_TYPE_ACCESS_HANDLER, gdata_documents_entry_access_handler_init)) + G_IMPLEMENT_INTERFACE (GDATA_TYPE_ACCESS_HANDLER, gdata_documents_entry_access_handler_init)) static void gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass) @@ -107,10 +107,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_EDITED, - g_param_spec_boxed ("edited", - "Edited", "The last time the document was edited.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("edited", + "Edited", "The last time the document was edited.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataDocumentsEntry:last-viewed @@ -120,10 +120,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_LAST_VIEWED, - g_param_spec_boxed ("last-viewed", - "Last viewed", "The last time the document was viewed.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("last-viewed", + "Last viewed", "The last time the document was viewed.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataDocumentsEntry:writers-can-invite: @@ -133,10 +133,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_WRITERS_CAN_INVITE, - g_param_spec_boolean ("writers-can-invite", - "Writers can invite?", "Indicates whether writers can invite others to edit.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("writers-can-invite", + "Writers can invite?", "Indicates whether writers can invite others to edit.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataDocumentsEntry:is-deleted: @@ -147,10 +147,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_IS_DELETED, - g_param_spec_boolean ("is-deleted", - "Deleted?", "Indicates whether the document entry has been deleted.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("is-deleted", + "Deleted?", "Indicates whether the document entry has been deleted.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataDocumentsEntry:document-id @@ -160,10 +160,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_DOCUMENT_ID, - g_param_spec_string ("document-id", - "Document ID", "The document ID of the document.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("document-id", + "Document ID", "The document ID of the document.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataDocumentsEntry:last-modified-by @@ -173,10 +173,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_LAST_MODIFIED_BY, - g_param_spec_object ("last-modified-by", - "Last modified by", "Indicates the author of the last modification.", - GDATA_TYPE_AUTHOR, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_object ("last-modified-by", + "Last modified by", "Indicates the author of the last modification.", + GDATA_TYPE_AUTHOR, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } @@ -409,10 +409,10 @@ gdata_documents_entry_get_last_viewed (GDataDocumentsEntry *self, GTimeVal *last * gdata_documents_entry_get_path: * @self: a #GDataDocumentsEntry * - * Builds a path for the #GDataDocumentsEntry, starting from a root node and traversing the folders containing the document, then - * ending with the document's ID. + * Builds a path for the #GDataDocumentsEntry, starting from a root node and traversing the folders containing the document, then ending with the + * document's ID. * - * An example path would be: "/folder_id1/folder_id2/document_id". + * An example path would be: <literal>/folder_id1/folder_id2/document_id</literal>. * * Note: the path is based on the entry/document IDs of the folders (#GDataEntry:id) and document (#GDataDocumentsEntry:document-id), * and not the entries' human-readable names (#GDataEntry:title). @@ -597,8 +597,8 @@ notify_content_type_cb (GDataDownloadStream *download_stream, GParamSpec *pspec, */ GFile * _gdata_documents_entry_download_document (GDataDocumentsEntry *self, GDataService *service, gchar **content_type, const gchar *src_uri, - GFile *destination_file, const gchar *file_extension, gboolean replace_file_if_exists, - GCancellable *cancellable, GError **error) + GFile *destination_file, const gchar *file_extension, gboolean replace_file_if_exists, + GCancellable *cancellable, GError **error) { const gchar *document_title; gchar *default_filename; @@ -619,7 +619,7 @@ _gdata_documents_entry_download_document (GDataDocumentsEntry *self, GDataServic /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (service)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to download documents.")); + _("You must be authenticated to download documents.")); return NULL; } @@ -627,7 +627,8 @@ _gdata_documents_entry_download_document (GDataDocumentsEntry *self, GDataServic document_title = gdata_entry_get_title (GDATA_ENTRY (self)); default_filename = g_strdup_printf ("%s.%s", document_title, file_extension); - dest_stream = _gdata_download_stream_find_destination (default_filename, destination_file, &actual_file, replace_file_if_exists, cancellable, error); + dest_stream = _gdata_download_stream_find_destination (default_filename, destination_file, &actual_file, replace_file_if_exists, + cancellable, error); g_free (default_filename); if (dest_stream == NULL) @@ -637,7 +638,7 @@ _gdata_documents_entry_download_document (GDataDocumentsEntry *self, GDataServic src_stream = gdata_download_stream_new (GDATA_SERVICE (service), src_uri); g_signal_connect (src_stream, "notify::content-type", (GCallback) notify_content_type_cb, content_type); g_output_stream_splice (G_OUTPUT_STREAM (dest_stream), src_stream, - G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, cancellable, &child_error); + G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, cancellable, &child_error); g_object_unref (src_stream); g_object_unref (dest_stream); if (child_error != NULL) { diff --git a/gdata/services/documents/gdata-documents-feed.c b/gdata/services/documents/gdata-documents-feed.c index 5969c238..89e7f4e2 100644 --- a/gdata/services/documents/gdata-documents-feed.c +++ b/gdata/services/documents/gdata-documents-feed.c @@ -98,15 +98,15 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da GDataEntry *entry = NULL; gchar *kind = get_kind (doc, node); - if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#spreadsheet") == 0) + if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#spreadsheet") == 0) { entry = GDATA_ENTRY (_gdata_parsable_new_from_xml_node (GDATA_TYPE_DOCUMENTS_SPREADSHEET, doc, node, NULL, error)); - else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#document") == 0) + } else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#document") == 0) { entry = GDATA_ENTRY (_gdata_parsable_new_from_xml_node (GDATA_TYPE_DOCUMENTS_TEXT, doc, node, NULL, error)); - else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#presentation") == 0) + } else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#presentation") == 0) { entry = GDATA_ENTRY (_gdata_parsable_new_from_xml_node (GDATA_TYPE_DOCUMENTS_PRESENTATION, doc, node, NULL, error)); - else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#folder") == 0) + } else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#folder") == 0) { entry = GDATA_ENTRY (_gdata_parsable_new_from_xml_node (GDATA_TYPE_DOCUMENTS_FOLDER, doc, node, NULL, error)); - else { + } else { g_message ("%s documents are not handled yet", kind); g_free (kind); return TRUE; diff --git a/gdata/services/documents/gdata-documents-presentation.c b/gdata/services/documents/gdata-documents-presentation.c index bf5a9b82..8a8c7462 100644 --- a/gdata/services/documents/gdata-documents-presentation.c +++ b/gdata/services/documents/gdata-documents-presentation.c @@ -132,8 +132,8 @@ gdata_documents_presentation_new (const gchar *id) **/ GFile * gdata_documents_presentation_download_document (GDataDocumentsPresentation *self, GDataDocumentsService *service, gchar **content_type, - GDataDocumentsPresentationFormat export_format, GFile *destination_file, - gboolean replace_file_if_exists, GCancellable *cancellable, GError **error) + GDataDocumentsPresentationFormat export_format, GFile *destination_file, + gboolean replace_file_if_exists, GCancellable *cancellable, GError **error) { gchar *link_href; @@ -147,7 +147,8 @@ gdata_documents_presentation_download_document (GDataDocumentsPresentation *self /* Call the common download method on the parent class */ link_href = gdata_documents_presentation_get_download_uri (self, export_format); destination_file = _gdata_documents_entry_download_document (GDATA_DOCUMENTS_ENTRY (self), GDATA_SERVICE (service), content_type, link_href, - destination_file, export_formats[export_format], replace_file_if_exists, cancellable, error); + destination_file, export_formats[export_format], replace_file_if_exists, + cancellable, error); g_free (link_href); return destination_file; diff --git a/gdata/services/documents/gdata-documents-presentation.h b/gdata/services/documents/gdata-documents-presentation.h index 2f3485c6..024bcd1b 100644 --- a/gdata/services/documents/gdata-documents-presentation.h +++ b/gdata/services/documents/gdata-documents-presentation.h @@ -29,11 +29,14 @@ G_BEGIN_DECLS #define GDATA_TYPE_DOCUMENTS_PRESENTATION (gdata_documents_presentation_get_type ()) -#define GDATA_DOCUMENTS_PRESENTATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION, GDataDocumentsPresentation)) -#define GDATA_DOCUMENTS_PRESENTATION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_DOCUMENTS_PRESENTATION, GDataDocumentsPresentationClass)) +#define GDATA_DOCUMENTS_PRESENTATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION, \ + GDataDocumentsPresentation)) +#define GDATA_DOCUMENTS_PRESENTATION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_DOCUMENTS_PRESENTATION, \ + GDataDocumentsPresentationClass)) #define GDATA_IS_DOCUMENTS_PRESENTATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION)) #define GDATA_IS_DOCUMENTS_PRESENTATION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_DOCUMENTS_PRESENTATION)) -#define GDATA_DOCUMENTS_PRESENTATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION, GDataDocumentsPresentationClass)) +#define GDATA_DOCUMENTS_PRESENTATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION, \ + GDataDocumentsPresentationClass)) typedef struct _GDataDocumentsPresentationPrivate GDataDocumentsPresentationPrivate; @@ -54,7 +57,7 @@ typedef enum { GDATA_DOCUMENTS_PRESENTATION_PNG, GDATA_DOCUMENTS_PRESENTATION_PPT, GDATA_DOCUMENTS_PRESENTATION_SWF, - GDATA_DOCUMENTS_PRESENTATION_TXT, + GDATA_DOCUMENTS_PRESENTATION_TXT } GDataDocumentsPresentationFormat; /** @@ -87,9 +90,9 @@ GDataDocumentsPresentation *gdata_documents_presentation_new (const gchar *id) G #include <gdata/services/documents/gdata-documents-service.h> GFile *gdata_documents_presentation_download_document (GDataDocumentsPresentation *self, GDataDocumentsService *service, gchar **content_type, - GDataDocumentsPresentationFormat export_format, GFile *destination_file, - gboolean replace_file_if_exists, GCancellable *cancellable, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataDocumentsPresentationFormat export_format, GFile *destination_file, + gboolean replace_file_if_exists, GCancellable *cancellable, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; gchar *gdata_documents_presentation_get_download_uri (GDataDocumentsPresentation *self, GDataDocumentsPresentationFormat export_format) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; diff --git a/gdata/services/documents/gdata-documents-query.c b/gdata/services/documents/gdata-documents-query.c index 8d9e64ad..042a2729 100644 --- a/gdata/services/documents/gdata-documents-query.c +++ b/gdata/services/documents/gdata-documents-query.c @@ -94,10 +94,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_SHOW_DELETED, - g_param_spec_boolean ("show-deleted", - "Show deleted?", "A shortcut to request all documents that have been deleted.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("show-deleted", + "Show deleted?", "A shortcut to request all documents that have been deleted.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataDocumentsQuery:show-folders: @@ -107,10 +107,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_SHOW_FOLDERS, - g_param_spec_boolean ("show-folders", - "Show folders?", "Specifies if the request also returns folders.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("show-folders", + "Show folders?", "Specifies if the request also returns folders.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataDocumentsQuery:exact-title: @@ -120,10 +120,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_EXACT_TITLE, - g_param_spec_boolean ("exact-title", - "Exact title?", "Specifies whether the query should search for an exact title match.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("exact-title", + "Exact title?", "Specifies whether the query should search for an exact title match.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataDocumentsQuery:folder-id: @@ -133,10 +133,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_FOLDER_ID, - g_param_spec_string ("folder-id", - "Folder ID", "Specifies the ID of the folder in which to search.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("folder-id", + "Folder ID", "Specifies the ID of the folder in which to search.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataDocumentsQuery:title: @@ -147,10 +147,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_TITLE, - g_param_spec_string ("title", - "Title", "A title (or title fragment) to be searched for.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("title", + "Title", "A title (or title fragment) to be searched for.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -242,28 +242,28 @@ get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboo GDATA_QUERY_CLASS (gdata_documents_query_parent_class)->get_query_uri (self, feed_uri, query_uri, params_started); if (priv->collaborator_addresses != NULL) { - GList *collaborator_address; + GList *address; APPEND_SEP - collaborator_address = priv->collaborator_addresses; + address = priv->collaborator_addresses; g_string_append (query_uri, "writer="); - g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (collaborator_address->data), NULL, FALSE); - for (collaborator_address = collaborator_address->next; collaborator_address != NULL; collaborator_address = collaborator_address->next) { + g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (address->data), NULL, FALSE); + for (address = address->next; address != NULL; address = address->next) { g_string_append_c (query_uri, ';'); - g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (collaborator_address->data), NULL, FALSE); + g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (address->data), NULL, FALSE); } } if (priv->reader_addresses != NULL) { - GList *reader_address; + GList *address; APPEND_SEP - reader_address = priv->reader_addresses; + address = priv->reader_addresses; g_string_append (query_uri, "reader="); - g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (reader_address->data), NULL, FALSE); - for (reader_address = reader_address->next; reader_address != NULL; reader_address = reader_address->next) { + g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (address->data), NULL, FALSE); + for (address = address->next; address != NULL; address = address->next) { g_string_append_c (query_uri, ';'); - g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (reader_address->data), NULL, FALSE); + g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (address->data), NULL, FALSE); } } @@ -320,10 +320,10 @@ GDataDocumentsQuery * gdata_documents_query_new_with_limits (const gchar *q, guint start_index, guint max_results) { return g_object_new (GDATA_TYPE_DOCUMENTS_QUERY, - "q", q, - "start-index", start_index, - "max-results", max_results, - NULL); + "q", q, + "start-index", start_index, + "max-results", max_results, + NULL); } /** diff --git a/gdata/services/documents/gdata-documents-service.c b/gdata/services/documents/gdata-documents-service.c index c2ce0de2..e19b815d 100644 --- a/gdata/services/documents/gdata-documents-service.c +++ b/gdata/services/documents/gdata-documents-service.c @@ -62,7 +62,7 @@ static void gdata_documents_service_get_property (GObject *object, guint propert static void notify_authenticated_cb (GObject *service, GParamSpec *pspec, GObject *self); static void notify_proxy_uri_cb (GObject *service, GParamSpec *pspec, GObject *self); static GDataDocumentsEntry *upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file, - const gchar *method, const gchar *upload_uri, GCancellable *cancellable, GError **error); + const gchar *method, const gchar *upload_uri, GCancellable *cancellable, GError **error); struct _GDataDocumentsServicePrivate { GDataService *spreadsheet_service; @@ -100,10 +100,10 @@ gdata_documents_service_class_init (GDataDocumentsServiceClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_SPREADSHEET_SERVICE, - g_param_spec_object ("spreadsheet-service", - "Spreadsheet service", "Another service for spreadsheets.", - GDATA_TYPE_SERVICE, - G_PARAM_READABLE)); + g_param_spec_object ("spreadsheet-service", + "Spreadsheet service", "Another service for spreadsheets.", + GDATA_TYPE_SERVICE, + G_PARAM_READABLE)); } static void @@ -158,8 +158,8 @@ gdata_documents_service_new (const gchar *client_id) g_return_val_if_fail (client_id != NULL, NULL); return g_object_new (GDATA_TYPE_DOCUMENTS_SERVICE, - "client-id", client_id, - NULL); + "client-id", client_id, + NULL); } /** @@ -182,8 +182,8 @@ gdata_documents_service_new (const gchar *client_id) **/ GDataDocumentsFeed * gdata_documents_service_query_documents (GDataDocumentsService *self, GDataDocumentsQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) { GDataFeed *feed; gchar *request_uri; @@ -196,7 +196,7 @@ gdata_documents_service_query_documents (GDataDocumentsService *self, GDataDocum /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to query documents.")); + _("You must be authenticated to query documents.")); return NULL; } @@ -233,8 +233,8 @@ gdata_documents_service_query_documents (GDataDocumentsService *self, GDataDocum **/ void gdata_documents_service_query_documents_async (GDataDocumentsService *self, GDataDocumentsQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data) { gchar *request_uri; @@ -246,8 +246,8 @@ gdata_documents_service_query_documents_async (GDataDocumentsService *self, GDat /* Ensure we're authenticated first */ if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, - GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to query documents.")); + GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, + _("You must be authenticated to query documents.")); return; } @@ -273,7 +273,7 @@ notify_authenticated_cb (GObject *service, GParamSpec *pspec, GObject *self) spreadsheet_service = g_object_new (GDATA_TYPE_SERVICE, "client-id", gdata_service_get_client_id (GDATA_SERVICE (service)), NULL); GDATA_SERVICE_GET_CLASS (spreadsheet_service)->service_name = "wise"; gdata_service_authenticate (spreadsheet_service, gdata_service_get_username (GDATA_SERVICE (service)), - gdata_service_get_password (GDATA_SERVICE (service)), NULL, NULL); + gdata_service_get_password (GDATA_SERVICE (service)), NULL, NULL); priv->spreadsheet_service = spreadsheet_service; } @@ -292,7 +292,7 @@ notify_proxy_uri_cb (GObject *service, GParamSpec *pspec, GObject *self) static GDataDocumentsEntry * upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file, const gchar *method, - const gchar *upload_uri, GCancellable *cancellable, GError **error) + const gchar *upload_uri, GCancellable *cancellable, GError **error) { GDataDocumentsEntry *new_entry; GOutputStream *output_stream; @@ -331,17 +331,17 @@ upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *docume strcmp (content_type, "application/vnd.ms-excel") == 0) { new_document_type = GDATA_TYPE_DOCUMENTS_SPREADSHEET; } else if (strcmp (content_type, "application/msword") == 0 || - strcmp (content_type, "application/vnd.oasis.opendocument.text") == 0 || - strcmp (content_type, "application/rtf") == 0 || - strcmp (content_type, "text/html") == 0 || - strcmp (content_type, "application/vnd.sun.xml.writer") == 0 || - strcmp (content_type, "text/plain") == 0) { + strcmp (content_type, "application/vnd.oasis.opendocument.text") == 0 || + strcmp (content_type, "application/rtf") == 0 || + strcmp (content_type, "text/html") == 0 || + strcmp (content_type, "application/vnd.sun.xml.writer") == 0 || + strcmp (content_type, "text/plain") == 0) { new_document_type = GDATA_TYPE_DOCUMENTS_TEXT; } else if (strcmp (content_type, "application/vnd.ms-powerpoint") == 0) { new_document_type = GDATA_TYPE_DOCUMENTS_PRESENTATION; } else { g_set_error_literal (error, GDATA_DOCUMENTS_SERVICE_ERROR, GDATA_DOCUMENTS_SERVICE_ERROR_INVALID_CONTENT_TYPE, - _("The supplied document had an invalid content type.")); + _("The supplied document had an invalid content type.")); if (file_info != NULL) g_object_unref (file_info); return NULL; @@ -366,7 +366,7 @@ upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *docume } g_output_stream_splice (output_stream, input_stream, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, - cancellable, &child_error); + cancellable, &child_error); g_object_unref (input_stream); if (child_error != NULL) { @@ -412,8 +412,8 @@ upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *docume * Since: 0.4.0 **/ GDataDocumentsEntry * -gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file, GDataDocumentsFolder *folder, - GCancellable *cancellable, GError **error) +gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file, + GDataDocumentsFolder *folder, GCancellable *cancellable, GError **error) { GDataDocumentsEntry *new_document; gchar *upload_uri; @@ -428,13 +428,13 @@ gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocum if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to upload documents.")); + _("You must be authenticated to upload documents.")); return NULL; } if (document != NULL && gdata_entry_is_inserted (GDATA_ENTRY (document)) == TRUE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED, - _("The document has already been uploaded.")); + _("The document has already been uploaded.")); return NULL; } @@ -442,7 +442,7 @@ gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocum if (document_file == NULL) { new_document = GDATA_DOCUMENTS_ENTRY (gdata_service_insert_entry (GDATA_SERVICE (self), upload_uri, GDATA_ENTRY (document), - cancellable, error)); + cancellable, error)); } else { new_document = upload_update_document (self, document, document_file, SOUP_METHOD_POST, upload_uri, cancellable, error); } @@ -473,7 +473,7 @@ gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocum **/ GDataDocumentsEntry * gdata_documents_service_update_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file, - GCancellable *cancellable, GError **error) + GCancellable *cancellable, GError **error) { GDataLink *update_link; @@ -485,7 +485,7 @@ gdata_documents_service_update_document (GDataDocumentsService *self, GDataDocum if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to update documents.")); + _("You must be authenticated to update documents.")); return NULL; } @@ -517,7 +517,7 @@ gdata_documents_service_update_document (GDataDocumentsService *self, GDataDocum **/ GDataDocumentsEntry * gdata_documents_service_move_document_to_folder (GDataDocumentsService *self, GDataDocumentsEntry *document, GDataDocumentsFolder *folder, - GCancellable *cancellable, GError **error) + GCancellable *cancellable, GError **error) { GDataDocumentsEntry *new_document; gchar *uri, *upload_data; @@ -533,7 +533,7 @@ gdata_documents_service_move_document_to_folder (GDataDocumentsService *self, GD if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to move documents.")); + _("You must be authenticated to move documents.")); return NULL; } @@ -592,7 +592,7 @@ gdata_documents_service_move_document_to_folder (GDataDocumentsService *self, GD **/ GDataDocumentsEntry * gdata_documents_service_remove_document_from_folder (GDataDocumentsService *self, GDataDocumentsEntry *document, GDataDocumentsFolder *folder, - GCancellable *cancellable, GError **error) + GCancellable *cancellable, GError **error) { const gchar *folder_id, *document_id; SoupMessage *message; @@ -647,8 +647,8 @@ gdata_documents_service_remove_document_from_folder (GDataDocumentsService *self /* Error */ GDataServiceClass *klass = GDATA_SERVICE_GET_CLASS (self); g_assert (klass->parse_error_response != NULL); - klass->parse_error_response (GDATA_SERVICE (self), GDATA_OPERATION_UPDATE, status, message->reason_phrase, message->response_body->data, - message->response_body->length, error); + klass->parse_error_response (GDATA_SERVICE (self), GDATA_OPERATION_UPDATE, status, message->reason_phrase, + message->response_body->data, message->response_body->length, error); g_object_unref (message); return NULL; } diff --git a/gdata/services/documents/gdata-documents-service.h b/gdata/services/documents/gdata-documents-service.h index 33edf7b9..0b5a0231 100644 --- a/gdata/services/documents/gdata-documents-service.h +++ b/gdata/services/documents/gdata-documents-service.h @@ -81,25 +81,25 @@ GQuark gdata_documents_service_error_quark (void) G_GNUC_CONST; GDataDocumentsService *gdata_documents_service_new (const gchar *client_id) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataDocumentsFeed *gdata_documents_service_query_documents (GDataDocumentsService *self, GDataDocumentsQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; void gdata_documents_service_query_documents_async (GDataDocumentsService *self, GDataDocumentsQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data); + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data); #include <gdata/services/documents/gdata-documents-folder.h> GDataDocumentsEntry *gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file, - GDataDocumentsFolder *folder, GCancellable *cancellable, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataDocumentsFolder *folder, GCancellable *cancellable, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataDocumentsEntry *gdata_documents_service_update_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file, - GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataDocumentsEntry *gdata_documents_service_move_document_to_folder (GDataDocumentsService *self, GDataDocumentsEntry *document, - GDataDocumentsFolder *folder, GCancellable *cancellable, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataDocumentsFolder *folder, GCancellable *cancellable, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataDocumentsEntry *gdata_documents_service_remove_document_from_folder (GDataDocumentsService *self, GDataDocumentsEntry *document, - GDataDocumentsFolder *folder, GCancellable *cancellable, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataDocumentsFolder *folder, GCancellable *cancellable, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; gchar *gdata_documents_service_get_upload_uri (GDataDocumentsFolder *folder) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; G_END_DECLS diff --git a/gdata/services/documents/gdata-documents-spreadsheet.c b/gdata/services/documents/gdata-documents-spreadsheet.c index f364ab9b..50da9aef 100644 --- a/gdata/services/documents/gdata-documents-spreadsheet.c +++ b/gdata/services/documents/gdata-documents-spreadsheet.c @@ -26,8 +26,8 @@ * * #GDataDocumentsSpreadsheet is a subclass of #GDataDocumentsEntry to represent a spreadsheet from Google Documents. * - * For more details of Google Documents' GData API, see the <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html"> - * online documentation</ulink>. + * For more details of Google Documents' GData API, see the + * <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html">online documentation</ulink>. * * Since: 0.4.0 **/ @@ -137,8 +137,8 @@ gdata_documents_spreadsheet_new (const gchar *id) **/ GFile * gdata_documents_spreadsheet_download_document (GDataDocumentsSpreadsheet *self, GDataDocumentsService *service, gchar **content_type, - GDataDocumentsSpreadsheetFormat export_format, gint gid, GFile *destination_file, - gboolean replace_file_if_exists, GCancellable *cancellable, GError **error) + GDataDocumentsSpreadsheetFormat export_format, gint gid, GFile *destination_file, + gboolean replace_file_if_exists, GCancellable *cancellable, GError **error) { gchar *link_href; const gchar *extension; @@ -149,7 +149,8 @@ gdata_documents_spreadsheet_download_document (GDataDocumentsSpreadsheet *self, g_return_val_if_fail (GDATA_IS_DOCUMENTS_SERVICE (service), NULL); g_return_val_if_fail (export_format < G_N_ELEMENTS (export_formats), NULL); g_return_val_if_fail (gid >= -1, NULL); - g_return_val_if_fail ((export_format != GDATA_DOCUMENTS_SPREADSHEET_CSV && export_format != GDATA_DOCUMENTS_SPREADSHEET_TSV) || gid != -1, NULL); + g_return_val_if_fail ((export_format != GDATA_DOCUMENTS_SPREADSHEET_CSV && export_format != GDATA_DOCUMENTS_SPREADSHEET_TSV) || + gid != -1, NULL); g_return_val_if_fail (G_IS_FILE (destination_file), NULL); g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); @@ -162,8 +163,8 @@ gdata_documents_spreadsheet_download_document (GDataDocumentsSpreadsheet *self, /* Download the document */ link_href = gdata_documents_spreadsheet_get_download_uri (self, export_format, gid); destination_file = _gdata_documents_entry_download_document (GDATA_DOCUMENTS_ENTRY (self), spreadsheet_service, content_type, - link_href, destination_file, extension, replace_file_if_exists, - cancellable, error); + link_href, destination_file, extension, replace_file_if_exists, + cancellable, error); g_free (link_href); return destination_file; @@ -195,7 +196,8 @@ gdata_documents_spreadsheet_get_download_uri (GDataDocumentsSpreadsheet *self, G g_return_val_if_fail (GDATA_IS_DOCUMENTS_SPREADSHEET (self), NULL); g_return_val_if_fail (export_format < G_N_ELEMENTS (export_formats), NULL); g_return_val_if_fail (gid >= -1, NULL); - g_return_val_if_fail ((export_format != GDATA_DOCUMENTS_SPREADSHEET_CSV && export_format != GDATA_DOCUMENTS_SPREADSHEET_TSV) || gid != -1, NULL); + g_return_val_if_fail ((export_format != GDATA_DOCUMENTS_SPREADSHEET_CSV && export_format != GDATA_DOCUMENTS_SPREADSHEET_TSV) || + gid != -1, NULL); document_id = gdata_documents_entry_get_document_id (GDATA_DOCUMENTS_ENTRY (self)); g_assert (document_id != NULL); diff --git a/gdata/services/documents/gdata-documents-spreadsheet.h b/gdata/services/documents/gdata-documents-spreadsheet.h index b395f04a..5a7a8476 100644 --- a/gdata/services/documents/gdata-documents-spreadsheet.h +++ b/gdata/services/documents/gdata-documents-spreadsheet.h @@ -29,11 +29,14 @@ G_BEGIN_DECLS #define GDATA_TYPE_DOCUMENTS_SPREADSHEET (gdata_documents_spreadsheet_get_type ()) -#define GDATA_DOCUMENTS_SPREADSHEET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET, GDataDocumentsSpreadsheet)) -#define GDATA_DOCUMENTS_SPREADSHEET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_DOCUMENTS_SPREADSHEET, GDataDocumentsSpreadsheetClass)) +#define GDATA_DOCUMENTS_SPREADSHEET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET, \ + GDataDocumentsSpreadsheet)) +#define GDATA_DOCUMENTS_SPREADSHEET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_DOCUMENTS_SPREADSHEET, \ + GDataDocumentsSpreadsheetClass)) #define GDATA_IS_DOCUMENTS_SPREADSHEET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET)) #define GDATA_IS_DOCUMENTS_SPREADSHEET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_DOCUMENTS_SPREADSHEET)) -#define GDATA_DOCUMENTS_SPREADSHEET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET, GDataDocumentsSpreadsheetClass)) +#define GDATA_DOCUMENTS_SPREADSHEET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET, \ + GDataDocumentsSpreadsheetClass)) typedef struct _GDataDocumentsSpreadsheetPrivate GDataDocumentsSpreadsheetPrivate; @@ -51,7 +54,7 @@ typedef struct _GDataDocumentsSpreadsheetPrivate GDataDocumentsSpreadsheetPrivat * Since: 0.4.0 **/ typedef enum { - GDATA_DOCUMENTS_SPREADSHEET_XLS = 0, + GDATA_DOCUMENTS_SPREADSHEET_XLS = 0, GDATA_DOCUMENTS_SPREADSHEET_CSV, GDATA_DOCUMENTS_SPREADSHEET_PDF, GDATA_DOCUMENTS_SPREADSHEET_ODS, @@ -90,11 +93,11 @@ GDataDocumentsSpreadsheet *gdata_documents_spreadsheet_new (const gchar *id) G_G #include <gdata/services/documents/gdata-documents-service.h> GFile *gdata_documents_spreadsheet_download_document (GDataDocumentsSpreadsheet *self, GDataDocumentsService *service, gchar **content_type, - GDataDocumentsSpreadsheetFormat export_format, gint gid, GFile *destination_file, - gboolean replace_file_if_exists, GCancellable *cancellable, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataDocumentsSpreadsheetFormat export_format, gint gid, GFile *destination_file, + gboolean replace_file_if_exists, GCancellable *cancellable, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; gchar *gdata_documents_spreadsheet_get_download_uri (GDataDocumentsSpreadsheet *self, GDataDocumentsSpreadsheetFormat export_format, - gint gid) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + gint gid) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; G_END_DECLS diff --git a/gdata/services/documents/gdata-documents-text.c b/gdata/services/documents/gdata-documents-text.c index 95c0a873..18cf3504 100644 --- a/gdata/services/documents/gdata-documents-text.c +++ b/gdata/services/documents/gdata-documents-text.c @@ -26,8 +26,8 @@ * * #GDataDocumentsText is a subclass of #GDataDocumentsEntry to represent a text document from Google Documents. * - * For more details of Google Documents' GData API, see the <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html"> - * online documentation</ulink>. + * For more details of Google Documents' GData API, see the + * <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html">online documentation</ulink>. * * Since: 0.4.0 **/ @@ -134,8 +134,8 @@ gdata_documents_text_new (const gchar *id) **/ GFile * gdata_documents_text_download_document (GDataDocumentsText *self, GDataDocumentsService *service, gchar **content_type, - GDataDocumentsTextFormat export_format, GFile *destination_file, - gboolean replace_file_if_exists, GCancellable *cancellable, GError **error) + GDataDocumentsTextFormat export_format, GFile *destination_file, + gboolean replace_file_if_exists, GCancellable *cancellable, GError **error) { gchar *link_href; @@ -149,8 +149,8 @@ gdata_documents_text_download_document (GDataDocumentsText *self, GDataDocuments /* Download the file */ link_href = gdata_documents_text_get_download_uri (self, export_format); destination_file = _gdata_documents_entry_download_document (GDATA_DOCUMENTS_ENTRY (self), GDATA_SERVICE (service), - content_type, link_href, destination_file, export_formats[export_format], replace_file_if_exists, - cancellable, error); + content_type, link_href, destination_file, export_formats[export_format], + replace_file_if_exists, cancellable, error); g_free (link_href); return destination_file; diff --git a/gdata/services/documents/gdata-documents-text.h b/gdata/services/documents/gdata-documents-text.h index a8779fcf..1f5d10bc 100644 --- a/gdata/services/documents/gdata-documents-text.h +++ b/gdata/services/documents/gdata-documents-text.h @@ -94,10 +94,11 @@ GDataDocumentsText *gdata_documents_text_new (const gchar *id) G_GNUC_WARN_UNUSE #include <gdata/services/documents/gdata-documents-service.h> GFile *gdata_documents_text_download_document (GDataDocumentsText *self, GDataDocumentsService *service, gchar **content_type, - GDataDocumentsTextFormat export_format, GFile *destination_file, - gboolean replace_file_if_exists, GCancellable *cancellable, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; -gchar *gdata_documents_text_get_download_uri (GDataDocumentsText *self, GDataDocumentsTextFormat export_format) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataDocumentsTextFormat export_format, GFile *destination_file, + gboolean replace_file_if_exists, GCancellable *cancellable, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; +gchar *gdata_documents_text_get_download_uri (GDataDocumentsText *self, + GDataDocumentsTextFormat export_format) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; G_END_DECLS diff --git a/gdata/services/picasaweb/gdata-picasaweb-album.c b/gdata/services/picasaweb/gdata-picasaweb-album.c index 0e808a5b..3bdd2ccf 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-album.c +++ b/gdata/services/picasaweb/gdata-picasaweb-album.c @@ -128,10 +128,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_ALBUM_ID, - g_param_spec_string ("album-id", - "Album ID", "The ID of the album.", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("album-id", + "Album ID", "The ID of the album.", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:user @@ -144,10 +144,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_USER, - g_param_spec_string ("user", - "User", "The username of the album owner.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("user", + "User", "The username of the album owner.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:nickname @@ -160,10 +160,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_NICKNAME, - g_param_spec_string ("nickname", - "Nickname", "The user's nickname.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("nickname", + "Nickname", "The user's nickname.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:edited @@ -176,10 +176,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_EDITED, - g_param_spec_boxed ("edited", - "Edited", "The time this album was last edited.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("edited", + "Edited", "The time this album was last edited.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:location @@ -192,10 +192,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_LOCATION, - g_param_spec_string ("location", - "Location", "The user-specified location associated with the album.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("location", + "Location", "The user-specified location associated with the album.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:visibility @@ -208,10 +208,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_VISIBILITY, - g_param_spec_enum ("visibility", - "Visibility", "The visibility (or access rights) of the album.", - GDATA_TYPE_PICASAWEB_VISIBILITY, GDATA_PICASAWEB_PUBLIC, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_enum ("visibility", + "Visibility", "The visibility (or access rights) of the album.", + GDATA_TYPE_PICASAWEB_VISIBILITY, GDATA_PICASAWEB_PUBLIC, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:timestamp @@ -224,10 +224,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_TIMESTAMP, - g_param_spec_boxed ("timestamp", - "Timestamp", "The timestamp of when the album occurred, settable by the user.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("timestamp", + "Timestamp", "The timestamp of when the album occurred, settable by the user.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* TODO: Change to photo-count? */ /** @@ -241,10 +241,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_NUM_PHOTOS, - g_param_spec_uint ("num-photos", - "Number of photos", "The number of photos and videos in the album.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("num-photos", + "Number of photos", "The number of photos and videos in the album.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /* TODO: Change to remaining-photos-count? */ /** @@ -259,11 +259,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_NUM_PHOTOS_REMAINING, - g_param_spec_uint ("num-photos-remaining", - "Number of photo spaces remaining", "The number of photos and videos that can still be" - " uploaded to this album.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("num-photos-remaining", + "Number of photo spaces remaining", "The number of files spaces still free for uploads.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:bytes-used: @@ -277,10 +276,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_BYTES_USED, - g_param_spec_long ("bytes-used", - "Number of bytes used", "The number of bytes consumed by this album and its contents.", - -1, G_MAXLONG, -1, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_long ("bytes-used", + "Number of bytes used", "The number of bytes consumed by this album and its contents.", + -1, G_MAXLONG, -1, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:commenting-enabled: @@ -290,10 +289,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_IS_COMMENTING_ENABLED, - g_param_spec_boolean ("is-commenting-enabled", - "Commenting enabled?", "Whether commenting is enabled for this album.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("is-commenting-enabled", + "Commenting enabled?", "Whether commenting is enabled for this album.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:comment-count: @@ -306,10 +305,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_COMMENT_COUNT, - g_param_spec_uint ("comment-count", - "Comment count", "The number of comments on the album.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("comment-count", + "Comment count", "The number of comments on the album.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:tags: @@ -322,10 +321,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_TAGS, - g_param_spec_boxed ("tags", - "Tags", "A NULL-terminated array of tags associated with the album", - G_TYPE_STRV, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("tags", + "Tags", "A NULL-terminated array of tags associated with the album", + G_TYPE_STRV, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:latitude: @@ -339,10 +338,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_LATITUDE, - g_param_spec_double ("latitude", - "Latitude", "The location as a latitude coordinate associated with this album.", - -90.0, 90.0, 0.0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("latitude", + "Latitude", "The location as a latitude coordinate associated with this album.", + -90.0, 90.0, 0.0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebAlbum:longitude: @@ -356,10 +355,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_LONGITUDE, - g_param_spec_double ("longitude", - "Longitude", "The location as a longitude coordinate associated with this album.", - -180.0, 180.0, 0.0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("longitude", + "Longitude", "The location as a longitude coordinate associated with this album.", + -180.0, 180.0, 0.0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -661,7 +660,8 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da return gdata_parser_error_required_content_missing (node, error); } - gdata_picasaweb_album_set_is_commenting_enabled (self, (xmlStrcmp (commenting_enabled, (xmlChar*) "true") == 0) ? TRUE : FALSE); + gdata_picasaweb_album_set_is_commenting_enabled (self, + (xmlStrcmp (commenting_enabled, (xmlChar*) "true") == 0) ? TRUE : FALSE); xmlFree (commenting_enabled); } else if (xmlStrcmp (node->name, (xmlChar*) "commentCount") == 0) { /* gphoto:commentCount */ @@ -712,7 +712,7 @@ get_xml (GDataParsable *parsable, GString *xml_string) if (priv->timestamp.tv_sec != 0 || priv->timestamp.tv_usec != 0) { /* in milliseconds */ g_string_append_printf (xml_string, "<gphoto:timestamp>%" G_GUINT64_FORMAT "</gphoto:timestamp>", - ((guint64) priv->timestamp.tv_sec) * 1000 + priv->timestamp.tv_usec / 1000); + ((guint64) priv->timestamp.tv_sec) * 1000 + priv->timestamp.tv_usec / 1000); } if (priv->is_commenting_enabled == FALSE) diff --git a/gdata/services/picasaweb/gdata-picasaweb-album.h b/gdata/services/picasaweb/gdata-picasaweb-album.h index c9cbddf3..f3dc33e7 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-album.h +++ b/gdata/services/picasaweb/gdata-picasaweb-album.h @@ -33,8 +33,8 @@ G_BEGIN_DECLS * @GDATA_PICASAWEB_PUBLIC: the album is visible to everyone, regardless of whether they're authenticated * @GDATA_PICASAWEB_PRIVATE: the album is visible only to authenticated users in a whitelist * - * Visibility statuses available for albums on PicasaWeb. For more information, see the <ulink type="http" - * url="http://code.google.com/apis/picasaweb/reference.html#Visibility">online documentation</ulink>. + * Visibility statuses available for albums on PicasaWeb. For more information, see the + * <ulink type="http" url="http://code.google.com/apis/picasaweb/reference.html#Visibility">online documentation</ulink>. * * Since: 0.4.0 **/ diff --git a/gdata/services/picasaweb/gdata-picasaweb-feed.c b/gdata/services/picasaweb/gdata-picasaweb-feed.c index c297ef6e..749afd2f 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-feed.c +++ b/gdata/services/picasaweb/gdata-picasaweb-feed.c @@ -46,7 +46,6 @@ gdata_picasaweb_feed_class_init (GDataPicasaWebFeedClass *klass) { GDataParsableClass *parsable_class = GDATA_PARSABLE_CLASS (klass); parsable_class->parse_xml = parse_xml; - } static void @@ -59,60 +58,30 @@ static gboolean parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_data, GError **error) { if (gdata_parser_is_namespace (node, "http://schemas.google.com/photos/2007") == TRUE) { - if (xmlStrcmp (node->name, (xmlChar*) "user") == 0) { - /* gphoto:user */ - /* From user's feed of album entries. Redundant with user entry represented by GDataPicasaWebUser. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "nickname") == 0) { - /* gphoto:nickname */ - /* From user's feed of album entries. Redundant with user entry represented by GDataPicasaWebUser. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "quotacurrent") == 0) { - /* gphoto:quota-current */ - /* From user's feed of album entries. Redundant with user entry represented by GDataPicasaWebUser. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "quotalimit") == 0) { - /* gphoto:quota-limit */ - /* From user's feed of album entries. Redundant with user entry represented by GDataPicasaWebUser. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "maxPhotosPerAlbum") == 0) { - /* gphoto:max-photos-per-album */ - /* From user's feed of album entries. Redundant with user entry represented by GDataPicasaWebUser. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "thumbnail") == 0) { - /* gphoto:thumbnail */ - /* From user's feed of album entries. Redundant with user entry represented by GDataPicasaWebUser. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "allowDownloads") == 0) { - /* gphoto:allowDownloads */ - /* Not part of public API so we're capturing and ignoring for now. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "allowPrints") == 0) { - /* gphoto:allowPrints */ - /* Not part of public API so we're capturing and ignoring for now. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "id") == 0 && xmlStrcmp (node->ns->href, (xmlChar*) "http://schemas.google.com/photos/2007") == 0) { - /* gphoto:id */ - /* From album's feed of file entries. Redundant with album entries represented by GDataPicasaWebAlbum. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "rights") == 0) { - /* gphoto:rights */ - /* From album's feed of file entries. Redundant with album entries represented by GDataPicasaWebAlbum. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "location") == 0) { - /* gphoto:location */ - /* From album's feed of file entries. Redundant with album entries represented by GDataPicasaWebAlbum. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "access") == 0) { - /* gphoto:access */ - /* From album's feed of file entries. Redundant with album entries represented by GDataPicasaWebAlbum. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "timestamp") == 0) { - /* gphoto:timestamp */ - /* From album's feed of file entries. Redundant with album entries represented by GDataPicasaWebAlbum. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "numphotos") == 0) { - /* gphoto:numphotos */ - /* From album's feed of file entries. Redundant with album entries represented by GDataPicasaWebAlbum. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "numphotosremaining") == 0) { - /* gphoto:numphotosremaining */ - /* From album's feed of file entries. Redundant with album entries represented by GDataPicasaWebAlbum. Capturing and ignoring. See bgo #589858. */ - } else if (xmlStrcmp (node->name, (xmlChar*) "bytesUsed") == 0) { - /* gphoto:bytesUsed */ - /* From album's feed of file entries. Redundant with album entries represented by GDataPicasaWebAlbum. Capturing and ignoring. See bgo #589858. */ + if (xmlStrcmp (node->name, (xmlChar*) "user") == 0 || + xmlStrcmp (node->name, (xmlChar*) "nickname") == 0 || + xmlStrcmp (node->name, (xmlChar*) "quotacurrent") == 0 || + xmlStrcmp (node->name, (xmlChar*) "quotalimit") == 0 || + xmlStrcmp (node->name, (xmlChar*) "maxPhotosPerAlbum") == 0 || + xmlStrcmp (node->name, (xmlChar*) "thumbnail") == 0 || + xmlStrcmp (node->name, (xmlChar*) "allowDownloads") == 0 || + xmlStrcmp (node->name, (xmlChar*) "allowPrints") == 0 || + xmlStrcmp (node->name, (xmlChar*) "id") == 0 || + xmlStrcmp (node->name, (xmlChar*) "rights") == 0 || + xmlStrcmp (node->name, (xmlChar*) "location") == 0 || + xmlStrcmp (node->name, (xmlChar*) "access") == 0 || + xmlStrcmp (node->name, (xmlChar*) "timestamp") == 0 || + xmlStrcmp (node->name, (xmlChar*) "numphotos") == 0 || + xmlStrcmp (node->name, (xmlChar*) "numphotosremaining") == 0 || + xmlStrcmp (node->name, (xmlChar*) "bytesUsed") == 0) { + /* From user's feed of album entries. Redundant with user entry represented by #GDataPicasaWebUser. + * Capturing and ignoring. See bgo #589858. */ } else { return GDATA_PARSABLE_CLASS (gdata_picasaweb_feed_parent_class)->parse_xml (parsable, doc, node, user_data, error); } } else if (gdata_parser_is_namespace (node, "http://www.georss.org/georss") == TRUE && xmlStrcmp (node->name, (xmlChar*) "where") == 0) { - /* georss:where */ - /* From album's feed of file entries. Redundant with album entries represented by GDataPicasaWebAlbum. Capturing and ignoring. See bgo #589858. */ + /* From user's feed of album entries. Redundant with user entry represented by #GDataPicasaWebUser. + * Capturing and ignoring. See bgo #589858. */ } else { return GDATA_PARSABLE_CLASS (gdata_picasaweb_feed_parent_class)->parse_xml (parsable, doc, node, user_data, error); } diff --git a/gdata/services/picasaweb/gdata-picasaweb-file.c b/gdata/services/picasaweb/gdata-picasaweb-file.c index 2c47d484..661bb2ab 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-file.c +++ b/gdata/services/picasaweb/gdata-picasaweb-file.c @@ -149,10 +149,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.7.0 **/ g_object_class_install_property (gobject_class, PROP_FILE_ID, - g_param_spec_string ("file-id", - "File ID", "The ID of the file.", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("file-id", + "File ID", "The ID of the file.", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:version: @@ -165,10 +165,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_VERSION, - g_param_spec_string ("version", - "Version", "The version number of the file.", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("version", + "Version", "The version number of the file.", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:album-id: @@ -181,10 +181,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_ALBUM_ID, - g_param_spec_string ("album-id", - "Album ID", "The ID for the file's album.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("album-id", + "Album ID", "The ID for the file's album.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:client: @@ -197,10 +197,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_CLIENT, - g_param_spec_string ("client", - "Client", "The name of the software which created or last modified the file.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("client", + "Client", "The name of the software which created or last modified the file.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** * GDataPicasaWebFile:checksum: * @@ -212,10 +213,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_CHECKSUM, - g_param_spec_string ("checksum", - "Checksum", "A checksum of the file, useful for duplicate detection.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("checksum", + "Checksum", "A checksum of the file, useful for duplicate detection.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** * GDataPicasaWebFile:video-status: * @@ -227,10 +229,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_VIDEO_STATUS, - g_param_spec_string ("video-status", - "Video Status", "The status of the file, if it is a video.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("video-status", + "Video Status", "The status of the file, if it is a video.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:position: @@ -243,10 +245,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_POSITION, - g_param_spec_double ("position", - "Position", "The ordinal position of the file within the album.", - 0.0, G_MAXFLOAT, 0.0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("position", + "Position", "The ordinal position of the file within the album.", + 0.0, G_MAXFLOAT, 0.0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** * GDataPicasaWebFile:width: * @@ -258,10 +261,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_WIDTH, - g_param_spec_uint ("width", - "Width", "The width of the photo or video, in pixels.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("width", + "Width", "The width of the photo or video, in pixels.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** * GDataPicasaWebFile:height: * @@ -273,10 +277,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_HEIGHT, - g_param_spec_uint ("height", - "Height", "The height of the photo or video, in pixels.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("height", + "Height", "The height of the photo or video, in pixels.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** * GDataPicasaWebFile:size: * @@ -288,10 +293,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_SIZE, - g_param_spec_ulong ("size", - "Size", "The size of the file, in bytes.", - 0, G_MAXULONG, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_ulong ("size", + "Size", "The size of the file, in bytes.", + 0, G_MAXULONG, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:edited: @@ -304,10 +309,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_EDITED, - g_param_spec_boxed ("edited", - "Edited", "The time this file was last edited.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("edited", + "Edited", "The time this file was last edited.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** * GDataPicasaWebFile:timestamp: * @@ -319,10 +325,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_TIMESTAMP, - g_param_spec_boxed ("timestamp", - "Timestamp", "The time the file was purportedly taken.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("timestamp", + "Timestamp", "The time the file was purportedly taken.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** * GDataPicasaWebFile:comment-count: * @@ -334,10 +341,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_COMMENT_COUNT, - g_param_spec_uint ("comment-count", - "Comment Count", "The number of comments on the file.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("comment-count", + "Comment Count", "The number of comments on the file.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** * GDataPicasaWebFile:rotation: * @@ -350,10 +358,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_ROTATION, - g_param_spec_uint ("rotation", - "Rotation", "The rotation of the photo, in degrees.", - 0, 359, 0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("rotation", + "Rotation", "The rotation of the photo, in degrees.", + 0, 359, 0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** * GDataPicasaWebFile:is-commenting-enabled: * @@ -362,10 +371,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_IS_COMMENTING_ENABLED, - g_param_spec_boolean ("is-commenting-enabled", - "Commenting enabled?", "Indicates whether comments are enabled.", - TRUE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("is-commenting-enabled", + "Commenting enabled?", "Indicates whether comments are enabled.", + TRUE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:credit: @@ -378,10 +387,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_CREDIT, - g_param_spec_string ("credit", - "Credit", "The nickname of the user credited with this file.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("credit", + "Credit", "The nickname of the user credited with this file.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:caption: @@ -391,10 +400,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_CAPTION, - g_param_spec_string ("caption", - "Caption", "The file's descriptive caption.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("caption", + "Caption", "The file's descriptive caption.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:tags: @@ -407,10 +416,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_TAGS, - g_param_spec_boxed ("tags", - "Tags", "A NULL-terminated array of tags associated with the file.", - G_TYPE_STRV, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("tags", + "Tags", "A NULL-terminated array of tags associated with the file.", + G_TYPE_STRV, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:distance: @@ -423,10 +432,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_DISTANCE, - g_param_spec_double ("distance", - "Distance", "The distance to the subject.", - -1.0, G_MAXDOUBLE, -1.0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("distance", + "Distance", "The distance to the subject.", + -1.0, G_MAXDOUBLE, -1.0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:exposure: @@ -439,10 +448,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_EXPOSURE, - g_param_spec_double ("exposure", - "Exposure", "The exposure time.", - 0.0, G_MAXDOUBLE, 0.0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("exposure", + "Exposure", "The exposure time.", + 0.0, G_MAXDOUBLE, 0.0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:flash: @@ -455,10 +464,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_FLASH, - g_param_spec_boolean ("flash", - "Flash", "Indicates whether the flash was used.", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("flash", + "Flash", "Indicates whether the flash was used.", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:focal-length: @@ -471,11 +480,12 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_FOCAL_LENGTH, - g_param_spec_double ("focal-length", - "Focal Length", "The focal length used in the shot.", - -1.0, G_MAXDOUBLE, -1.0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("focal-length", + "Focal Length", "The focal length used in the shot.", + -1.0, G_MAXDOUBLE, -1.0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /* TODO: Rename to f-stop */ /** * GDataPicasaWebFile:fstop: * @@ -487,10 +497,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_FSTOP, - g_param_spec_double ("fstop", - "F-stop", "The F-stop used.", - 0.0, G_MAXDOUBLE, 0.0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("fstop", + "F-stop", "The F-stop used.", + 0.0, G_MAXDOUBLE, 0.0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:image-unique-id: @@ -503,10 +513,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_IMAGE_UNIQUE_ID, - g_param_spec_string ("image-unique-id", - "Image Unique ID", "An unique ID for the image.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("image-unique-id", + "Image Unique ID", "An unique ID for the image.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:iso: @@ -519,10 +529,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_ISO, - g_param_spec_long ("iso", - "ISO", "The ISO speed.", - -1, G_MAXLONG, -1, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_long ("iso", + "ISO", "The ISO speed.", + -1, G_MAXLONG, -1, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:make: @@ -535,10 +545,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_MAKE, - g_param_spec_string ("make", - "Make", "The name of the manufacturer.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("make", + "Make", "The name of the manufacturer.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:model: @@ -551,10 +561,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_MODEL, - g_param_spec_string ("model", - "Model", "The model of the camera.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("model", + "Model", "The model of the camera.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:latitude: @@ -568,10 +578,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_LATITUDE, - g_param_spec_double ("latitude", - "Latitude", "The location as a latitude coordinate associated with this file.", - -90.0, 90.0, 0.0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("latitude", + "Latitude", "The location as a latitude coordinate associated with this file.", + -90.0, 90.0, 0.0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebFile:longitude: @@ -585,10 +595,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass) * Since: 0.5.0 **/ g_object_class_install_property (gobject_class, PROP_LONGITUDE, - g_param_spec_double ("longitude", - "Longitude", "The location as a longitude coordinate associated with this file.", - -180.0, 180.0, 0.0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("longitude", + "Longitude", "The location as a longitude coordinate associated with this file.", + -180.0, 180.0, 0.0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -806,11 +816,11 @@ gdata_picasaweb_file_set_property (GObject *object, guint property_id, const GVa break; case PROP_LATITUDE: gdata_picasaweb_file_set_coordinates (self, g_value_get_double (value), - gdata_georss_where_get_longitude (self->priv->georss_where)); + gdata_georss_where_get_longitude (self->priv->georss_where)); break; case PROP_LONGITUDE: gdata_picasaweb_file_set_coordinates (self, gdata_georss_where_get_latitude (self->priv->georss_where), - g_value_get_double (value)); + g_value_get_double (value)); break; default: /* We don't have any other property... */ @@ -900,8 +910,8 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da } else if (xmlStrcmp (node->name, (xmlChar*) "access") == 0) { /* gphoto:access */ /* Visibility is already obtained through the album. When PicasaWeb supports per-file access restrictions, - we'll expose this property. Until then, we'll catch this to suppress the Unhandled XML warning. - See https://bugzilla.gnome.org/show_bug.cgi?id=589858 */ + * we'll expose this property. Until then, we'll catch this to suppress the Unhandled XML warning. + * See https://bugzilla.gnome.org/show_bug.cgi?id=589858 */ } else if (xmlStrcmp (node->name, (xmlChar*) "rotation") == 0) { /* gphoto:rotation */ xmlChar *rotation = xmlNodeListGetString (doc, node->children, TRUE); @@ -934,7 +944,7 @@ get_xml (GDataParsable *parsable, GString *xml_string) g_string_append_printf (xml_string, "<gphoto:version>%s</gphoto:version>", priv->version); g_string_append_printf (xml_string, "<gphoto:position>%s</gphoto:position>", - g_ascii_dtostr (ascii_double_str, sizeof (ascii_double_str), priv->position)); + g_ascii_dtostr (ascii_double_str, sizeof (ascii_double_str), priv->position)); if (priv->album_id != NULL) g_string_append_printf (xml_string, "<gphoto:albumid>%s</gphoto:albumid>", priv->album_id); @@ -948,7 +958,7 @@ get_xml (GDataParsable *parsable, GString *xml_string) if (priv->timestamp.tv_sec != 0 || priv->timestamp.tv_usec != 0) { /* timestamp is in milliseconds */ g_string_append_printf (xml_string, "<gphoto:timestamp>%" G_GUINT64_FORMAT "</gphoto:timestamp>", - ((guint64) priv->timestamp.tv_sec) * 1000 + priv->timestamp.tv_usec / 1000); + ((guint64) priv->timestamp.tv_sec) * 1000 + priv->timestamp.tv_usec / 1000); } if (priv->is_commenting_enabled == TRUE) diff --git a/gdata/services/picasaweb/gdata-picasaweb-file.h b/gdata/services/picasaweb/gdata-picasaweb-file.h index 46d90833..2351e45a 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-file.h +++ b/gdata/services/picasaweb/gdata-picasaweb-file.h @@ -108,7 +108,8 @@ const gchar *gdata_picasaweb_file_get_version (GDataPicasaWebFile *self); gdouble gdata_picasaweb_file_get_position (GDataPicasaWebFile *self); void gdata_picasaweb_file_set_position (GDataPicasaWebFile *self, gdouble position); const gchar *gdata_picasaweb_file_get_album_id (GDataPicasaWebFile *self); -void gdata_picasaweb_file_set_album_id (GDataPicasaWebFile *self, const gchar *album_id); /* TODO should we have a more obvious _move() API too? nah */ +/* TODO should we have a more obvious _move() API too? nah */ +void gdata_picasaweb_file_set_album_id (GDataPicasaWebFile *self, const gchar *album_id); guint gdata_picasaweb_file_get_width (GDataPicasaWebFile *self); guint gdata_picasaweb_file_get_height (GDataPicasaWebFile *self); gsize gdata_picasaweb_file_get_size (GDataPicasaWebFile *self); diff --git a/gdata/services/picasaweb/gdata-picasaweb-query.c b/gdata/services/picasaweb/gdata-picasaweb-query.c index 49371a9f..1033178d 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-query.c +++ b/gdata/services/picasaweb/gdata-picasaweb-query.c @@ -100,25 +100,25 @@ gdata_picasaweb_query_class_init (GDataPicasaWebQueryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_VISIBILITY, - g_param_spec_int ("visibility", - "Visibility", "Specifies which albums should be listed, in terms of their visibility.", - 0, GDATA_PICASAWEB_PRIVATE, 0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_int ("visibility", + "Visibility", "Specifies which albums should be listed, in terms of their visibility.", + 0, GDATA_PICASAWEB_PRIVATE, 0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebQuery:thumbnail-size: * - * A comma-separated list of thumbnail sizes (width in pixels) to return. Only certain sizes are allowed, and whether the thumbnail should be + * A comma-separated list of thumbnail widths (in pixels) to return. Only certain sizes are allowed, and whether the thumbnail should be * cropped or scaled can be specified; for more information, see the * <ulink type="http" url="http://code.google.com/apis/picasaweb/reference.html#Parameters">online documentation</ulink>. * * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_THUMBNAIL_SIZE, - g_param_spec_string ("thumbnail-size", - "Thumbnail size", "A comma-separated list of thumbnail sizes (width in pixels) to return.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("thumbnail-size", + "Thumbnail size", "A comma-separated list of thumbnail width (in pixels) to return.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebQuery:image-size: @@ -130,10 +130,10 @@ gdata_picasaweb_query_class_init (GDataPicasaWebQueryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_IMAGE_SIZE, - g_param_spec_string ("image-size", - "Image size", "A comma-separated list of image sizes (width in pixels) to return.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("image-size", + "Image size", "A comma-separated list of image sizes (width in pixels) to return.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebQuery:tag: @@ -143,10 +143,10 @@ gdata_picasaweb_query_class_init (GDataPicasaWebQueryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_TAG, - g_param_spec_string ("tag", - "Tag", "A tag which returned results must contain.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("tag", + "Tag", "A tag which returned results must contain.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebQuery:location: @@ -156,10 +156,10 @@ gdata_picasaweb_query_class_init (GDataPicasaWebQueryClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_LOCATION, - g_param_spec_string ("location", - "Location", "A location to search for photos, e.g. \"London\".", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("location", + "Location", "A location to search for photos, e.g. \"London\".", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -281,10 +281,10 @@ get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboo APPEND_SEP g_string_append_printf (query_uri, "bbox=%s,%s,%s,%s", - g_ascii_dtostr (west, sizeof (west), priv->bounding_box.west), - g_ascii_dtostr (south, sizeof (south), priv->bounding_box.south), - g_ascii_dtostr (east, sizeof (east), priv->bounding_box.east), - g_ascii_dtostr (north, sizeof (north), priv->bounding_box.north)); + g_ascii_dtostr (west, sizeof (west), priv->bounding_box.west), + g_ascii_dtostr (south, sizeof (south), priv->bounding_box.south), + g_ascii_dtostr (east, sizeof (east), priv->bounding_box.east), + g_ascii_dtostr (north, sizeof (north), priv->bounding_box.north)); } if (priv->location != NULL) { @@ -334,10 +334,10 @@ GDataPicasaWebQuery * gdata_picasaweb_query_new_with_limits (const gchar *q, guint start_index, guint max_results) { return g_object_new (GDATA_TYPE_PICASAWEB_QUERY, - "q", q, - "start-index", start_index, - "max-results", max_results, - NULL); + "q", q, + "start-index", start_index, + "max-results", max_results, + NULL); } /** diff --git a/gdata/services/picasaweb/gdata-picasaweb-query.h b/gdata/services/picasaweb/gdata-picasaweb-query.h index a1eb3dc2..7fbff660 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-query.h +++ b/gdata/services/picasaweb/gdata-picasaweb-query.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS #define GDATA_TYPE_PICASAWEB_QUERY (gdata_picasaweb_query_get_type ()) -#define GDATA_PICASAWEB_QUERY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_PICASAWEB_QUERY, GDataPicasaWebQuery)) +#define GDATA_PICASAWEB_QUERY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_PICASAWEB_QUERY, GDataPicasaWebQuery)) #define GDATA_PICASAWEB_QUERY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_PICASAWEB_QUERY, GDataPicasawebQueryClass)) #define GDATA_IS_PICASAWEB_QUERY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_PICASAWEB_QUERY)) #define GDATA_IS_PICASAWEB_QUERY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_PICASAWEB_QUERY)) diff --git a/gdata/services/picasaweb/gdata-picasaweb-service.c b/gdata/services/picasaweb/gdata-picasaweb-service.c index 457577b2..2b092313 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-service.c +++ b/gdata/services/picasaweb/gdata-picasaweb-service.c @@ -75,10 +75,7 @@ GDataPicasaWebService * gdata_picasaweb_service_new (const gchar *client_id) { g_return_val_if_fail (client_id != NULL, NULL); - - return g_object_new (GDATA_TYPE_PICASAWEB_SERVICE, - "client-id", client_id, - NULL); + return g_object_new (GDATA_TYPE_PICASAWEB_SERVICE, "client-id", client_id, NULL); } /* @@ -135,7 +132,7 @@ gdata_picasaweb_service_get_user (GDataPicasaWebService *self, const gchar *user uri = create_uri (self, username, "entry"); if (uri == NULL) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must specify a username or be authenticated to query a user.")); + _("You must specify a username or be authenticated to query a user.")); return NULL; } @@ -176,7 +173,7 @@ gdata_picasaweb_service_get_user (GDataPicasaWebService *self, const gchar *user **/ GDataFeed * gdata_picasaweb_service_query_all_albums (GDataPicasaWebService *self, GDataQuery *query, const gchar *username, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) { gchar *uri; GDataFeed *album_feed; @@ -189,20 +186,20 @@ gdata_picasaweb_service_query_all_albums (GDataPicasaWebService *self, GDataQuer if (query != NULL && gdata_query_get_q (query) != NULL) { /* Bug #593336 — Query parameter "q=..." isn't valid for album kinds */ g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_BAD_QUERY_PARAMETER, - _("Query parameter not allowed for albums.")); + _("Query parameter not allowed for albums.")); return NULL; } uri = create_uri (self, username, "feed"); if (uri == NULL) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must specify a username or be authenticated to query all albums.")); + _("You must specify a username or be authenticated to query all albums.")); return NULL; } /* Execute the query */ album_feed = gdata_service_query (GDATA_SERVICE (self), uri, query, GDATA_TYPE_PICASAWEB_ALBUM, - cancellable, progress_callback, progress_user_data, error); + cancellable, progress_callback, progress_user_data, error); g_free (uri); return album_feed; @@ -230,8 +227,8 @@ gdata_picasaweb_service_query_all_albums (GDataPicasaWebService *self, GDataQuer **/ void gdata_picasaweb_service_query_all_albums_async (GDataPicasaWebService *self, GDataQuery *query, const gchar *username, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data) + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data) { gchar *uri; @@ -243,22 +240,22 @@ gdata_picasaweb_service_query_all_albums_async (GDataPicasaWebService *self, GDa if (query != NULL && gdata_query_get_q (query) != NULL) { /* Bug #593336 — Query parameter "q=..." isn't valid for album kinds */ g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, - GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_BAD_QUERY_PARAMETER, - _("Query parameter not allowed for albums.")); + GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_BAD_QUERY_PARAMETER, + _("Query parameter not allowed for albums.")); return; } uri = create_uri (self, username, "feed"); if (uri == NULL) { g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, - GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must specify a username or be authenticated to query all albums.")); + GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, + _("You must specify a username or be authenticated to query all albums.")); return; } /* Schedule the async query */ gdata_service_query_async (GDATA_SERVICE (self), uri, query, GDATA_TYPE_PICASAWEB_ALBUM, cancellable, progress_callback, progress_user_data, - callback, user_data); + callback, user_data); g_free (uri); } @@ -283,7 +280,7 @@ gdata_picasaweb_service_query_all_albums_async (GDataPicasaWebService *self, GDa **/ GDataFeed * gdata_picasaweb_service_query_files (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataQuery *query, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error) { /* TODO: Async variant */ const gchar *uri; @@ -299,7 +296,7 @@ gdata_picasaweb_service_query_files (GDataPicasaWebService *self, GDataPicasaWeb if (link == NULL) { /* Error */ g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - _("The album did not have a feed link.")); + _("The album did not have a feed link.")); return NULL; } uri = gdata_link_get_uri (link); @@ -310,7 +307,7 @@ gdata_picasaweb_service_query_files (GDataPicasaWebService *self, GDataPicasaWeb /* Execute the query */ return gdata_service_query (GDATA_SERVICE (self), uri, GDATA_QUERY (query), GDATA_TYPE_PICASAWEB_FILE, cancellable, - progress_callback, progress_user_data, error); + progress_callback, progress_user_data, error); } static GOutputStream * @@ -388,7 +385,7 @@ parse_spliced_stream (GOutputStream *output_stream, GError **error) **/ GDataPicasaWebFile * gdata_picasaweb_service_upload_file (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry, GFile *file_data, - GCancellable *cancellable, GError **error) + GCancellable *cancellable, GError **error) { GOutputStream *output_stream; GInputStream *input_stream; @@ -404,13 +401,13 @@ gdata_picasaweb_service_upload_file (GDataPicasaWebService *self, GDataPicasaWeb if (gdata_entry_is_inserted (GDATA_ENTRY (file_entry)) == TRUE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED, - _("The entry has already been inserted.")); + _("The entry has already been inserted.")); return NULL; } if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to upload a file.")); + _("You must be authenticated to upload a file.")); return NULL; } @@ -426,7 +423,7 @@ gdata_picasaweb_service_upload_file (GDataPicasaWebService *self, GDataPicasaWeb } g_output_stream_splice (output_stream, input_stream, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, - cancellable, &child_error); + cancellable, &child_error); g_object_unref (input_stream); if (child_error != NULL) { @@ -473,7 +470,6 @@ gdata_picasaweb_service_upload_file_finish (GDataPicasaWebService *self, GAsyncR g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - /* propagate any potential errors we might have encountered in g_output_stream_splice() or gdata_picasaweb_service_upload_file_async() */ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) return NULL; @@ -510,10 +506,10 @@ upload_file_async_cb (GOutputStream *output_stream, GAsyncResult *result, Upload if (error == NULL && file != NULL) async_result = g_simple_async_result_new (G_OBJECT (data->service), (GAsyncReadyCallback) data->callback, - data->user_data, gdata_picasaweb_service_upload_file_async); + data->user_data, gdata_picasaweb_service_upload_file_async); else async_result = g_simple_async_result_new_from_error (G_OBJECT (data->service), (GAsyncReadyCallback) data->callback, - data->user_data, error); + data->user_data, error); g_simple_async_result_set_op_res_gpointer (async_result, file, NULL); @@ -546,7 +542,7 @@ upload_file_async_cb (GOutputStream *output_stream, GAsyncResult *result, Upload **/ void gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry, - GFile *file_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) + GFile *file_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { GOutputStream *output_stream; GInputStream *input_stream; @@ -562,13 +558,13 @@ gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPic if (gdata_entry_is_inserted (GDATA_ENTRY (file_entry)) == TRUE) { g_set_error_literal (&error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED, - _("The entry has already been inserted.")); + _("The entry has already been inserted.")); goto error; } if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (&error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to upload a file.")); + _("You must be authenticated to upload a file.")); goto error; } @@ -591,14 +587,14 @@ gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPic /* Actually transfer the data */ g_output_stream_splice_async (output_stream, input_stream, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, - 0, cancellable, (GAsyncReadyCallback) upload_file_async_cb, data); + 0, cancellable, (GAsyncReadyCallback) upload_file_async_cb, data); g_object_unref (input_stream); g_object_unref (output_stream); return; - error: +error: result = g_simple_async_result_new_from_error (G_OBJECT (self), callback, user_data, error); g_simple_async_result_complete (result); } @@ -630,13 +626,13 @@ gdata_picasaweb_service_insert_album (GDataPicasaWebService *self, GDataPicasaWe if (gdata_entry_is_inserted (GDATA_ENTRY (album)) == TRUE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED, - _("The album has already been inserted.")); + _("The album has already been inserted.")); return NULL; } if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) { g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to insert an album.")); + _("You must be authenticated to insert an album.")); return NULL; } diff --git a/gdata/services/picasaweb/gdata-picasaweb-service.h b/gdata/services/picasaweb/gdata-picasaweb-service.h index 2d758153..0191edd3 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-service.h +++ b/gdata/services/picasaweb/gdata-picasaweb-service.h @@ -70,31 +70,29 @@ GDataPicasaWebUser *gdata_picasaweb_service_get_user (GDataPicasaWebService *sel GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataFeed *gdata_picasaweb_service_query_all_albums (GDataPicasaWebService *self, GDataQuery *query, const gchar *username, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; void gdata_picasaweb_service_query_all_albums_async (GDataPicasaWebService *self, GDataQuery *query, const gchar *username, GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data); + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data); GDataFeed *gdata_picasaweb_service_query_files (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; #include <gdata/services/picasaweb/gdata-picasaweb-file.h> GDataPicasaWebFile *gdata_picasaweb_service_upload_file (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry, - GFile *file_data, - GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GFile *file_data, + GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; -void -gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry, - GFile *file_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GDataPicasaWebFile * -gdata_picasaweb_service_upload_file_finish (GDataPicasaWebService *self, GAsyncResult *result, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; +void gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry, + GFile *file_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); +GDataPicasaWebFile *gdata_picasaweb_service_upload_file_finish (GDataPicasaWebService *self, GAsyncResult *result, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataPicasaWebAlbum *gdata_picasaweb_service_insert_album (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GCancellable *cancellable, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; - + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; G_END_DECLS diff --git a/gdata/services/picasaweb/gdata-picasaweb-user.c b/gdata/services/picasaweb/gdata-picasaweb-user.c index e3e06bba..48e457d8 100644 --- a/gdata/services/picasaweb/gdata-picasaweb-user.c +++ b/gdata/services/picasaweb/gdata-picasaweb-user.c @@ -85,10 +85,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass) * Since: 0.6.0 **/ g_object_class_install_property (gobject_class, PROP_USER, - g_param_spec_string ("user", - "User", "The username of the user.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("user", + "User", "The username of the user.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebUser:nickname: @@ -99,10 +99,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass) * Since: 0.6.0 **/ g_object_class_install_property (gobject_class, PROP_NICKNAME, - g_param_spec_string ("nickname", - "Nickname", "The user's nickname.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("nickname", + "Nickname", "The user's nickname.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebUser:quota-limit: @@ -113,10 +113,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass) * Since: 0.6.0 **/ g_object_class_install_property (gobject_class, PROP_QUOTA_LIMIT, - g_param_spec_int64 ("quota-limit", - "Quota Limit", "The total amount of space, in bytes, available to the user.", - -1, G_MAXINT64, -1, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_int64 ("quota-limit", + "Quota Limit", "The total amount of space, in bytes, available to the user.", + -1, G_MAXINT64, -1, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebUser:quota-current: @@ -127,10 +127,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass) * Since: 0.6.0 **/ g_object_class_install_property (gobject_class, PROP_QUOTA_CURRENT, - g_param_spec_int64 ("quota-current", - "Quota Current", "The current amount of space, in bytes, already used by the user.", - -1, G_MAXINT64, -1, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_int64 ("quota-current", + "Quota Current", "The current amount of space, in bytes, already used by the user.", + -1, G_MAXINT64, -1, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebUser:max-photos-per-album: @@ -141,10 +141,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass) * Since: 0.6.0 **/ g_object_class_install_property (gobject_class, PROP_MAX_PHOTOS_PER_ALBUM, - g_param_spec_int ("max-photos-per-album", - "Max Photos Per Album", "The maximum number of photos allowed in an album.", - -1, G_MAXINT, -1, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_int ("max-photos-per-album", + "Max Photos Per Album", "The maximum number of photos allowed in an album.", + -1, G_MAXINT, -1, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataPicasaWebUser:thumbnail-uri: @@ -155,10 +155,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass) * Since: 0.6.0 **/ g_object_class_install_property (gobject_class, PROP_THUMBNAIL_URI, - g_param_spec_string ("thumbnail-uri", - "Thumbnail URI", "The URI of a thumbnail-sized portrait of the user.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("thumbnail-uri", + "Thumbnail URI", "The URI of a thumbnail-sized portrait of the user.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/gdata/services/youtube/gdata-youtube-content.c b/gdata/services/youtube/gdata-youtube-content.c index 4e8cce7d..94800924 100644 --- a/gdata/services/youtube/gdata-youtube-content.c +++ b/gdata/services/youtube/gdata-youtube-content.c @@ -77,10 +77,10 @@ gdata_youtube_content_class_init (GDataYouTubeContentClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_FORMAT, - g_param_spec_enum ("format", - "Format", "The video format of the video object.", - GDATA_TYPE_YOUTUBE_FORMAT, GDATA_YOUTUBE_FORMAT_UNKNOWN, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_enum ("format", + "Format", "The video format of the video object.", + GDATA_TYPE_YOUTUBE_FORMAT, GDATA_YOUTUBE_FORMAT_UNKNOWN, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/gdata/services/youtube/gdata-youtube-control.c b/gdata/services/youtube/gdata-youtube-control.c index 69ced11c..cbe1e4ae 100644 --- a/gdata/services/youtube/gdata-youtube-control.c +++ b/gdata/services/youtube/gdata-youtube-control.c @@ -25,8 +25,8 @@ * * #GDataYouTubeControl represents a "control" element from the * <ulink type="http" url="http://www.atomenabled.org/developers/protocol/#appControl">Atom Publishing Protocol specification</ulink>, - * with support for the YouTube-specific <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state"> - * "state" element</ulink>. + * with support for the YouTube-specific + * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state">"state" element</ulink>. * * It is private API, since it would be unnecessary and confusing to expose #GDataYouTubeControl itself. There is the option * of breaking this up into #GDataAPPControl and extending #GDataYouTubeControl classes in the future, if more entry types implement diff --git a/gdata/services/youtube/gdata-youtube-credit.c b/gdata/services/youtube/gdata-youtube-credit.c index 361381a2..3e475636 100644 --- a/gdata/services/youtube/gdata-youtube-credit.c +++ b/gdata/services/youtube/gdata-youtube-credit.c @@ -80,10 +80,10 @@ gdata_youtube_credit_class_init (GDataYouTubeCreditClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_ENTITY_TYPE, - g_param_spec_string ("entity-type", - "Entity type", "The type of entity who is credited.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("entity-type", + "Entity type", "The type of entity who is credited.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/gdata/services/youtube/gdata-youtube-group.c b/gdata/services/youtube/gdata-youtube-group.c index cb8997e9..5dc468f7 100644 --- a/gdata/services/youtube/gdata-youtube-group.c +++ b/gdata/services/youtube/gdata-youtube-group.c @@ -102,7 +102,8 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da if (gdata_parser_string_from_element (node, "videoid", P_NO_DUPES, &(self->priv->video_id), &success, error) == TRUE || gdata_parser_string_from_element (node, "aspectRatio", P_REQUIRED | P_NO_DUPES, &(self->priv->aspect_ratio), &success, error) == TRUE || - gdata_parser_time_val_from_element (node, "uploaded", P_REQUIRED | P_NO_DUPES, &(self->priv->uploaded), &success, error) == TRUE) { + gdata_parser_time_val_from_element (node, "uploaded", P_REQUIRED | P_NO_DUPES, + &(self->priv->uploaded), &success, error) == TRUE) { return success; } else if (xmlStrcmp (node->name, (xmlChar*) "duration") == 0) { /* yt:duration */ diff --git a/gdata/services/youtube/gdata-youtube-group.h b/gdata/services/youtube/gdata-youtube-group.h index 759b6f1e..f4f13671 100644 --- a/gdata/services/youtube/gdata-youtube-group.h +++ b/gdata/services/youtube/gdata-youtube-group.h @@ -30,10 +30,10 @@ G_BEGIN_DECLS #define GDATA_TYPE_YOUTUBE_GROUP (gdata_youtube_group_get_type ()) -#define GDATA_YOUTUBE_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_YOUTUBE_GROUP, GDataYouTubeGroup)) +#define GDATA_YOUTUBE_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_YOUTUBE_GROUP, GDataYouTubeGroup)) #define GDATA_YOUTUBE_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_YOUTUBE_GROUP, GDataYouTubeGroupClass)) #define GDATA_IS_YOUTUBE_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_YOUTUBE_GROUP)) -#define GDATA_IS_YOUTUBE_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_YOUTUBE_GROUP)) +#define GDATA_IS_YOUTUBE_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_YOUTUBE_GROUP)) #define GDATA_YOUTUBE_GROUP_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_YOUTUBE_GROUP, GDataYouTubeGroupClass)) typedef struct _GDataYouTubeGroupPrivate GDataYouTubeGroupPrivate; diff --git a/gdata/services/youtube/gdata-youtube-query.c b/gdata/services/youtube/gdata-youtube-query.c index 5b5bcdac..3139e425 100644 --- a/gdata/services/youtube/gdata-youtube-query.c +++ b/gdata/services/youtube/gdata-youtube-query.c @@ -101,10 +101,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_FORMAT, - g_param_spec_enum ("format", - "Format", "Specifies that videos must be available in a particular video format.", - GDATA_TYPE_YOUTUBE_FORMAT, GDATA_YOUTUBE_FORMAT_UNKNOWN, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_enum ("format", + "Format", "Specifies that videos must be available in a particular video format.", + GDATA_TYPE_YOUTUBE_FORMAT, GDATA_YOUTUBE_FORMAT_UNKNOWN, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:latitude: @@ -127,10 +127,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_LATITUDE, - g_param_spec_double ("latitude", - "Latitude", "The latitude of a particular location of which videos should be found.", - -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("latitude", + "Latitude", "The latitude of a particular location of which videos should be found.", + -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:longitude: @@ -145,10 +145,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_LONGITUDE, - g_param_spec_double ("longitude", - "Longitude", "The longitude of a particular location of which videos should be found.", - -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("longitude", + "Longitude", "The longitude of a particular location of which videos should be found.", + -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:location-radius: @@ -163,10 +163,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_LOCATION_RADIUS, - g_param_spec_double ("location-radius", - "Location radius", "The radius, in metres, of a circle from within which videos should be returned.", - 0.0, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("location-radius", + "Location radius", "The radius, in metres, of a circle to search within.", + 0.0, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:has-location: @@ -181,10 +181,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_HAS_LOCATION, - g_param_spec_boolean ("has-location", - "Has location?", "Whether to restrict search results to videos with specific coordinates associated with them.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("has-location", + "Has location?", "Whether to restrict results to videos with specific coordinates.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:language: @@ -199,10 +199,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_LANGUAGE, - g_param_spec_string ("language", - "Language", "Restricts the search to videos that have a title, description or keywords in a specified language.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("language", + "Language", "Restricts the search to videos described in the given language.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:order-by: @@ -220,10 +220,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_ORDER_BY, - g_param_spec_string ("order-by", - "Order by", "Specifies the order of entries in a feed.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("order-by", + "Order by", "Specifies the order of entries in a feed.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:restriction: @@ -238,10 +238,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_RESTRICTION, - g_param_spec_string ("restriction", - "Restriction", "The IP address that should be used to filter videos playable only in specific countries.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("restriction", + "Restriction", "The IP address to filter videos playable only in specific countries.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:safe-search: @@ -254,10 +254,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_SAFE_SEARCH, - g_param_spec_enum ("safe-search", - "Safe search", "Whether the search results should include restricted content as well as standard content.", - GDATA_TYPE_YOUTUBE_SAFE_SEARCH, GDATA_YOUTUBE_SAFE_SEARCH_MODERATE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_enum ("safe-search", + "Safe search", "Whether the search results should include restricted content.", + GDATA_TYPE_YOUTUBE_SAFE_SEARCH, GDATA_YOUTUBE_SAFE_SEARCH_MODERATE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:sort-order: @@ -267,10 +267,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_SORT_ORDER, - g_param_spec_enum ("sort-order", - "Sort order", "Specifies the direction of sorting.", - GDATA_TYPE_YOUTUBE_SORT_ORDER, GDATA_YOUTUBE_SORT_NONE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_enum ("sort-order", + "Sort order", "Specifies the direction of sorting.", + GDATA_TYPE_YOUTUBE_SORT_ORDER, GDATA_YOUTUBE_SORT_NONE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:age: @@ -281,10 +281,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_AGE, - g_param_spec_enum ("age", - "Age", "Restricts the search to videos uploaded within the specified time period.", - GDATA_TYPE_YOUTUBE_AGE, GDATA_YOUTUBE_AGE_ALL_TIME, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_enum ("age", + "Age", "Restricts the search to videos uploaded within the specified time period.", + GDATA_TYPE_YOUTUBE_AGE, GDATA_YOUTUBE_AGE_ALL_TIME, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeQuery:uploader: @@ -295,10 +295,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_UPLOADER, - g_param_spec_enum ("uploader", - "Uploader", "Restricts the search to videos from the specified type of uploader.", - GDATA_TYPE_YOUTUBE_UPLOADER, GDATA_YOUTUBE_UPLOADER_ALL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_enum ("uploader", + "Uploader", "Restricts the search to videos from the specified type of uploader.", + GDATA_TYPE_YOUTUBE_UPLOADER, GDATA_YOUTUBE_UPLOADER_ALL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -469,8 +469,8 @@ get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboo gchar latitude[G_ASCII_DTOSTR_BUF_SIZE], longitude[G_ASCII_DTOSTR_BUF_SIZE]; g_string_append_printf (query_uri, (priv->has_location == TRUE) ? "&location=%s,%s!" : "&location=%s,%s", - g_ascii_dtostr (latitude, sizeof (latitude), priv->latitude), - g_ascii_dtostr (longitude, sizeof (longitude), priv->longitude)); + g_ascii_dtostr (latitude, sizeof (latitude), priv->latitude), + g_ascii_dtostr (longitude, sizeof (longitude), priv->longitude)); if (priv->location_radius >= 0.0) { gchar radius[G_ASCII_DTOSTR_BUF_SIZE]; diff --git a/gdata/services/youtube/gdata-youtube-service.c b/gdata/services/youtube/gdata-youtube-service.c index 74975d8f..7034f46c 100644 --- a/gdata/services/youtube/gdata-youtube-service.c +++ b/gdata/services/youtube/gdata-youtube-service.c @@ -98,10 +98,10 @@ gdata_youtube_service_class_init (GDataYouTubeServiceClass *klass) * The matching #GDataService:client-id property belongs to #GDataService. **/ g_object_class_install_property (gobject_class, PROP_DEVELOPER_KEY, - g_param_spec_string ("developer-key", - "Developer key", "Your YouTube developer API key.", - NULL, - G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("developer-key", + "Developer key", "Your YouTube developer API key.", + NULL, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeService:youtube-user: @@ -110,10 +110,10 @@ gdata_youtube_service_class_init (GDataYouTubeServiceClass *klass) * YouTube was converted to use Google's centralised login system. **/ g_object_class_install_property (gobject_class, PROP_YOUTUBE_USER, - g_param_spec_string ("youtube-user", - "YouTube username", "The YouTube account username.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("youtube-user", + "YouTube username", "The YouTube account username.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void @@ -177,7 +177,7 @@ parse_authentication_response (GDataService *self, guint status, const gchar *re /* Chain up to the parent method first */ if (GDATA_SERVICE_CLASS (gdata_youtube_service_parent_class)->parse_authentication_response (self, status, - response_body, length, error) == FALSE) { + response_body, length, error) == FALSE) { return FALSE; } @@ -199,7 +199,7 @@ parse_authentication_response (GDataService *self, guint status, const gchar *re protocol_error: g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - _("The server returned a malformed response.")); + _("The server returned a malformed response.")); return FALSE; } @@ -300,34 +300,34 @@ parse_error_response (GDataService *self, GDataOperationType operation_type, gui if (xmlStrcmp (domain, (xmlChar*) "yt:service") == 0 && xmlStrcmp (code, (xmlChar*) "disabled_in_maintenance_mode") == 0) { /* Service disabled */ g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_UNAVAILABLE, - _("This service is not available at the moment.")); + _("This service is not available at the moment.")); } else if (xmlStrcmp (domain, (xmlChar*) "yt:authentication") == 0) { /* Authentication problem; make sure to set our status as unauthenticated */ _gdata_service_set_authenticated (GDATA_SERVICE (self), FALSE); g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED, - _("You must be authenticated to do this.")); + _("You must be authenticated to do this.")); } else if (xmlStrcmp (domain, (xmlChar*) "yt:quota") == 0) { /* Quota errors */ if (xmlStrcmp (code, (xmlChar*) "too_many_recent_calls") == 0) { g_set_error (error, GDATA_YOUTUBE_SERVICE_ERROR, GDATA_YOUTUBE_SERVICE_ERROR_API_QUOTA_EXCEEDED, - _("You have made too many API calls recently. Please wait a few minutes and try again.")); + _("You have made too many API calls recently. Please wait a few minutes and try again.")); } else if (xmlStrcmp (code, (xmlChar*) "too_many_entries") == 0) { g_set_error (error, GDATA_YOUTUBE_SERVICE_ERROR, GDATA_YOUTUBE_SERVICE_ERROR_ENTRY_QUOTA_EXCEEDED, - _("You have exceeded your entry quota. Please delete some entries and try again.")); + _("You have exceeded your entry quota. Please delete some entries and try again.")); } else { /* Protocol error */ g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - /* Translators: the first parameter is an error code, which is a coded string. The second parameter - * is an error domain, which is another coded string. The third parameter is the location of the - * error, which is either a URI or an XPath. */ - _("Unknown error code \"%s\" in domain \"%s\" received with location \"%s\"."), - code, domain, location); + /* Translators: the first parameter is an error code, which is a coded string. + * The second parameter is an error domain, which is another coded string. + * The third parameter is the location of the error, which is either a URI or an XPath. */ + _("Unknown error code \"%s\" in domain \"%s\" received with location \"%s\"."), + code, domain, location); } } else { /* Unknown or validation (protocol) error */ g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - _("Unknown error code \"%s\" in domain \"%s\" received with location \"%s\"."), - code, domain, location); + _("Unknown error code \"%s\" in domain \"%s\" received with location \"%s\"."), + code, domain, location); } } else { /* For all errors after the first, log the error in the terminal */ @@ -371,9 +371,9 @@ gdata_youtube_service_new (const gchar *developer_key, const gchar *client_id) g_return_val_if_fail (client_id != NULL, NULL); return g_object_new (GDATA_TYPE_YOUTUBE_SERVICE, - "developer-key", developer_key, - "client-id", client_id, - NULL); + "developer-key", developer_key, + "client-id", client_id, + NULL); } static const gchar * @@ -423,8 +423,8 @@ standard_feed_type_to_feed_uri (GDataYouTubeStandardFeedType feed_type) **/ GDataFeed * gdata_youtube_service_query_standard_feed (GDataYouTubeService *self, GDataYouTubeStandardFeedType feed_type, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) { g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (self), NULL); g_return_val_if_fail (query == NULL || GDATA_IS_QUERY (query), NULL); @@ -433,7 +433,7 @@ gdata_youtube_service_query_standard_feed (GDataYouTubeService *self, GDataYouTu /* TODO: Support the "time" parameter, as well as category- and region-specific feeds */ return gdata_service_query (GDATA_SERVICE (self), standard_feed_type_to_feed_uri (feed_type), query, - GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error); + GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error); } /** @@ -457,8 +457,8 @@ gdata_youtube_service_query_standard_feed (GDataYouTubeService *self, GDataYouTu **/ void gdata_youtube_service_query_standard_feed_async (GDataYouTubeService *self, GDataYouTubeStandardFeedType feed_type, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data) + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data) { g_return_if_fail (GDATA_IS_YOUTUBE_SERVICE (self)); g_return_if_fail (query == NULL || GDATA_IS_QUERY (query)); @@ -466,7 +466,7 @@ gdata_youtube_service_query_standard_feed_async (GDataYouTubeService *self, GDat g_return_if_fail (callback != NULL); gdata_service_query_async (GDATA_SERVICE (self), standard_feed_type_to_feed_uri (feed_type), query, - GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data); + GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data); } /** @@ -487,8 +487,8 @@ gdata_youtube_service_query_standard_feed_async (GDataYouTubeService *self, GDat **/ GDataFeed * gdata_youtube_service_query_videos (GDataYouTubeService *self, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) { g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (self), NULL); g_return_val_if_fail (query == NULL || GDATA_IS_QUERY (query), NULL); @@ -496,7 +496,7 @@ gdata_youtube_service_query_videos (GDataYouTubeService *self, GDataQuery *query g_return_val_if_fail (error == NULL || *error == NULL, NULL); return gdata_service_query (GDATA_SERVICE (self), "http://gdata.youtube.com/feeds/api/videos", query, - GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error); + GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error); } /** @@ -519,8 +519,8 @@ gdata_youtube_service_query_videos (GDataYouTubeService *self, GDataQuery *query **/ void gdata_youtube_service_query_videos_async (GDataYouTubeService *self, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data) + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data) { g_return_if_fail (GDATA_IS_YOUTUBE_SERVICE (self)); g_return_if_fail (query == NULL || GDATA_IS_QUERY (query)); @@ -528,7 +528,7 @@ gdata_youtube_service_query_videos_async (GDataYouTubeService *self, GDataQuery g_return_if_fail (callback != NULL); gdata_service_query_async (GDATA_SERVICE (self), "http://gdata.youtube.com/feeds/api/videos", query, - GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data); + GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data); } /** @@ -550,8 +550,8 @@ gdata_youtube_service_query_videos_async (GDataYouTubeService *self, GDataQuery **/ GDataFeed * gdata_youtube_service_query_related (GDataYouTubeService *self, GDataYouTubeVideo *video, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) { GDataLink *related_link; @@ -566,13 +566,13 @@ gdata_youtube_service_query_related (GDataYouTubeService *self, GDataYouTubeVide if (related_link == NULL) { /* Erroring out is probably the safest thing to do */ g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - _("The video did not have a related videos <link>.")); + _("The video did not have a related videos <link>.")); return NULL; } /* Execute the query */ return gdata_service_query (GDATA_SERVICE (self), gdata_link_get_uri (related_link), query, - GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error); + GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error); } /** @@ -596,8 +596,8 @@ gdata_youtube_service_query_related (GDataYouTubeService *self, GDataYouTubeVide **/ void gdata_youtube_service_query_related_async (GDataYouTubeService *self, GDataYouTubeVideo *video, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data) + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data) { GDataLink *related_link; @@ -612,13 +612,13 @@ gdata_youtube_service_query_related_async (GDataYouTubeService *self, GDataYouTu if (related_link == NULL) { /* Erroring out is probably the safest thing to do */ g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, - GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - _("The video did not have a related videos <link>.")); + GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, + _("The video did not have a related videos <link>.")); return; } gdata_service_query_async (GDATA_SERVICE (self), gdata_link_get_uri (related_link), query, - GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data); + GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data); } /** diff --git a/gdata/services/youtube/gdata-youtube-service.h b/gdata/services/youtube/gdata-youtube-service.h index c81ccca0..4d5cf890 100644 --- a/gdata/services/youtube/gdata-youtube-service.h +++ b/gdata/services/youtube/gdata-youtube-service.h @@ -108,30 +108,30 @@ GQuark gdata_youtube_service_error_quark (void) G_GNUC_CONST; GDataYouTubeService *gdata_youtube_service_new (const gchar *developer_key, const gchar *client_id) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; GDataFeed *gdata_youtube_service_query_standard_feed (GDataYouTubeService *self, GDataYouTubeStandardFeedType feed_type, GDataQuery *query, - GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; void gdata_youtube_service_query_standard_feed_async (GDataYouTubeService *self, GDataYouTubeStandardFeedType feed_type, GDataQuery *query, - GCancellable *cancellable, - GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data); + GCancellable *cancellable, + GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data); GDataFeed *gdata_youtube_service_query_videos (GDataYouTubeService *self, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; void gdata_youtube_service_query_videos_async (GDataYouTubeService *self, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data); + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data); GDataFeed *gdata_youtube_service_query_related (GDataYouTubeService *self, GDataYouTubeVideo *video, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; void gdata_youtube_service_query_related_async (GDataYouTubeService *self, GDataYouTubeVideo *video, GDataQuery *query, - GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, - GAsyncReadyCallback callback, gpointer user_data); + GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data, + GAsyncReadyCallback callback, gpointer user_data); GDataYouTubeVideo *gdata_youtube_service_upload_video (GDataYouTubeService *self, GDataYouTubeVideo *video, GFile *video_file, - GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; + GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; const gchar *gdata_youtube_service_get_developer_key (GDataYouTubeService *self); const gchar *gdata_youtube_service_get_youtube_user (GDataYouTubeService *self); diff --git a/gdata/services/youtube/gdata-youtube-state.c b/gdata/services/youtube/gdata-youtube-state.c index a9290e06..6df4da5c 100644 --- a/gdata/services/youtube/gdata-youtube-state.c +++ b/gdata/services/youtube/gdata-youtube-state.c @@ -80,32 +80,32 @@ gdata_youtube_state_class_init (GDataYouTubeStateClass *klass) * * The name of the status of the unpublished video. Valid values are: "processing", "restricted", "deleted", "rejected" and "failed". * - * For more information, see the <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state"> - * online documentation</ulink>. + * For more information, see the + * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state">online documentation</ulink>. * * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_NAME, - g_param_spec_string ("name", - "Name", "The name of the status of the unpublished video.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("name", + "Name", "The name of the status of the unpublished video.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeState:reason-code: * * The reason code explaining why the video failed to upload. * - * For more information, see the <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state"> - * online documentation</ulink>. + * For more information, see the + * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state">online documentation</ulink>. * * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_REASON_CODE, - g_param_spec_string ("reason-code", - "Reason code", "The reason code explaining why the video failed to upload.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("reason-code", + "Reason code", "The reason code explaining why the video failed to upload.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeState:help-uri: @@ -113,32 +113,32 @@ gdata_youtube_state_class_init (GDataYouTubeStateClass *klass) * A URI for a YouTube Help Center page that may help the developer or the video owner to diagnose * the reason that an upload failed or was rejected. * - * For more information, see the <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state"> - * online documentation</ulink>. + * For more information, see the + * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state">online documentation</ulink>. * * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_HELP_URI, - g_param_spec_string ("help-uri", - "Help URI", "A URI for a YouTube Help Center page.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("help-uri", + "Help URI", "A URI for a YouTube Help Center page.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeState:message: * * A human-readable description of why the video failed to upload. * - * For more information, see the <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state"> - * online documentation</ulink>. + * For more information, see the + * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state">online documentation</ulink>. * * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_MESSAGE, - g_param_spec_string ("message", - "Message", "A human-readable description of why the video failed to upload.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("message", + "Message", "A human-readable description of why the video failed to upload.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/gdata/services/youtube/gdata-youtube-video.c b/gdata/services/youtube/gdata-youtube-video.c index 36b1e991..80f3f774 100644 --- a/gdata/services/youtube/gdata-youtube-video.c +++ b/gdata/services/youtube/gdata-youtube-video.c @@ -166,24 +166,24 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:statistics">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_VIEW_COUNT, - g_param_spec_uint ("view-count", - "View count", "The number of times the video has been viewed.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("view-count", + "View count", "The number of times the video has been viewed.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:favorite-count: * - * The number of YouTube users who have added the video to their list of favorite videos. + * The number of users who have added the video to their favorites. * * For more information, see the <ulink type="http" * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:statistics">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_FAVORITE_COUNT, - g_param_spec_uint ("favorite-count", - "Favorite count", "The number of YouTube users who have added the video to their list of favorite videos.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("favorite-count", + "Favorite count", "The number of users who have added the video to their favorites.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:location: @@ -194,10 +194,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:location">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_LOCATION, - g_param_spec_string ("location", - "Location", "Descriptive text about the location where the video was taken.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("location", + "Location", "Descriptive text about the location where the video was taken.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:min-rating: @@ -208,10 +208,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdRating">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_MIN_RATING, - g_param_spec_uint ("min-rating", - "Minimum rating", "The minimum allowed rating for the video.", - 0, G_MAXUINT, 1, /* defaults to 1 */ - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("min-rating", + "Minimum rating", "The minimum allowed rating for the video.", + 0, G_MAXUINT, 1, /* defaults to 1 */ + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:max-rating: @@ -222,10 +222,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdRating">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_MAX_RATING, - g_param_spec_uint ("max-rating", - "Maximum rating", "The maximum allowed rating for the video.", - 0, G_MAXUINT, 5, /* defaults to 5 */ - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("max-rating", + "Maximum rating", "The maximum allowed rating for the video.", + 0, G_MAXUINT, 5, /* defaults to 5 */ + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:rating-count: @@ -236,10 +236,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdRating">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_RATING_COUNT, - g_param_spec_uint ("rating-count", - "Rating count", "The number of times the video has been rated.", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("rating-count", + "Rating count", "The number of times the video has been rated.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:average-rating: @@ -250,10 +250,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdRating">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_AVERAGE_RATING, - g_param_spec_double ("average-rating", - "Average rating", "The average rating of the video, over all the ratings it's received.", - 0.0, G_MAXDOUBLE, 0.0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_double ("average-rating", + "Average rating", "The average rating of the video.", + 0.0, G_MAXDOUBLE, 0.0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:keywords: @@ -264,26 +264,24 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:keywords">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_KEYWORDS, - g_param_spec_boxed ("keywords", - "Keywords", "A NULL-terminated array of words associated with the video.", - G_TYPE_STRV, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("keywords", + "Keywords", "A NULL-terminated array of words associated with the video.", + G_TYPE_STRV, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:player-uri: * - * Specifies a URI where the full-length video is available through a media player that runs inside a web browser - * (i.e. the video's page on YouTube). + * A URI for a browser-based media player for the full-length video (i.e. the video's page on YouTube). * * For more information, see the <ulink type="http" * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:player">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_PLAYER_URI, - g_param_spec_string ("player-uri", - "Player URI", "Specifies a URI where the full-length video is available through a media player" - "that runs inside a web browser.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("player-uri", + "Player URI", "A URI for a browser-based media player for the full-length video.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:category: @@ -294,10 +292,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:category">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_CATEGORY, - g_param_spec_object ("category", - "Category", "Specifies a genre or developer tag that describes the video.", - GDATA_TYPE_MEDIA_CATEGORY, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_object ("category", + "Category", "Specifies a genre or developer tag that describes the video.", + GDATA_TYPE_MEDIA_CATEGORY, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:credit: @@ -308,10 +306,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:credit">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_CREDIT, - g_param_spec_object ("credit", - "Credit", "Identifies the owner of the video.", - GDATA_TYPE_YOUTUBE_CREDIT, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_object ("credit", + "Credit", "Identifies the owner of the video.", + GDATA_TYPE_YOUTUBE_CREDIT, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:description: @@ -322,10 +320,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:description">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_DESCRIPTION, - g_param_spec_string ("description", - "Description", "A summary or description of the video.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("description", + "Description", "A summary or description of the video.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:duration: @@ -336,10 +334,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:duration">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_DURATION, - g_param_spec_uint ("duration", - "Duration", "The duration of the video in seconds.", - 0, G_MAXINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_uint ("duration", + "Duration", "The duration of the video in seconds.", + 0, G_MAXINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:private: @@ -350,10 +348,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:private">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_IS_PRIVATE, - g_param_spec_boolean ("is-private", - "Private?", "Indicates whether the video is private.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("is-private", + "Private?", "Indicates whether the video is private.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:uploaded: @@ -364,10 +362,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:uploaded">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_UPLOADED, - g_param_spec_boxed ("uploaded", - "Uploaded", "Specifies the time the video was originally uploaded to YouTube.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("uploaded", + "Uploaded", "Specifies the time the video was originally uploaded to YouTube.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:video-id: @@ -378,10 +376,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:videoid">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_VIDEO_ID, - g_param_spec_string ("video-id", - "Video ID", "Specifies a unique ID which YouTube uses to identify the video.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("video-id", + "Video ID", "Specifies a unique ID which YouTube uses to identify the video.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:is-draft: @@ -392,9 +390,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_app:draft">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_IS_DRAFT, - g_param_spec_boolean ("is-draft", - "Draft?", "Indicates whether the video is in draft, or unpublished, status.", - FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("is-draft", + "Draft?", "Indicates whether the video is in draft, or unpublished, status.", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:state: @@ -406,10 +405,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state">online documentation</ulink>. **/ g_object_class_install_property (gobject_class, PROP_STATE, - g_param_spec_object ("state", - "State", "Information describing the state of the video.", - GDATA_TYPE_YOUTUBE_STATE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_param_spec_object ("state", + "State", "Information describing the state of the video.", + GDATA_TYPE_YOUTUBE_STATE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:recorded: @@ -422,10 +421,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * Since: 0.3.0 **/ g_object_class_install_property (gobject_class, PROP_RECORDED, - g_param_spec_boxed ("recorded", - "Recorded", "Specifies the time the video was originally recorded.", - GDATA_TYPE_G_TIME_VAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boxed ("recorded", + "Recorded", "Specifies the time the video was originally recorded.", + GDATA_TYPE_G_TIME_VAL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GDataYouTubeVideo:aspect-ratio: @@ -439,10 +438,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass) * Since: 0.4.0 **/ g_object_class_install_property (gobject_class, PROP_ASPECT_RATIO, - g_param_spec_string ("aspect-ratio", - "Aspect Ratio", "The aspect ratio of the video.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_string ("aspect-ratio", + "Aspect Ratio", "The aspect ratio of the video.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -618,7 +617,7 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da return success; } else if (gdata_parser_is_namespace (node, "http://www.w3.org/2007/app") == TRUE && gdata_parser_object_from_element (node, "control", P_REQUIRED | P_NO_DUPES, GDATA_TYPE_YOUTUBE_CONTROL, - &(self->priv->youtube_control), &success, error) == TRUE) { + &(self->priv->youtube_control), &success, error) == TRUE) { return success; } else if (gdata_parser_is_namespace (node, "http://gdata.youtube.com/schemas/2007") == TRUE) { if (gdata_parser_string_from_element (node, "location", P_NONE, &(self->priv->location), &success, error) == TRUE) { @@ -641,7 +640,7 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da } else if (xmlStrcmp (node->name, (xmlChar*) "noembed") == 0) { /* yt:noembed */ /* Ignore this now; it's been superceded by yt:accessControl. - See http://apiblog.youtube.com/2010/02/extended-access-controls-available-via.html */ + * See http://apiblog.youtube.com/2010/02/extended-access-controls-available-via.html */ } else if (xmlStrcmp (node->name, (xmlChar*) "accessControl") == 0) { /* yt:accessControl */ xmlChar *action, *permission; diff --git a/gdata/services/youtube/gdata-youtube-video.h b/gdata/services/youtube/gdata-youtube-video.h index 587882a8..ac1f8f8b 100644 --- a/gdata/services/youtube/gdata-youtube-video.h +++ b/gdata/services/youtube/gdata-youtube-video.h @@ -105,7 +105,8 @@ G_BEGIN_DECLS * * Permissions for actions which can be set on a #GDataYouTubeVideo using gdata_youtube_video_set_access_control(). * - * The only actions which can have the %GDATA_YOUTUBE_PERMISSION_MODERATED permission are %GDATA_YOUTUBE_ACTION_RATE and %GDATA_YOUTUBE_ACTION_COMMENT. + * The only actions which can have the %GDATA_YOUTUBE_PERMISSION_MODERATED permission are + * %GDATA_YOUTUBE_ACTION_RATE and %GDATA_YOUTUBE_ACTION_COMMENT. * * Since: 0.7.0 **/ |