flickcurl.h   flickcurl.h 
skipping to change at line 172 skipping to change at line 172
char* author; char* author;
char* authorname; char* authorname;
int datecreate; int datecreate;
char* permalink; char* permalink;
char* text; char* text;
} flickcurl_comment; } flickcurl_comment;
/** /**
* flickcurl_perms: * flickcurl_perms:
* @is_public: non-0 to set the photo to public else private * @is_public: non-0 to set the photo to public else private
* @is_contact:
* @is_friend: non-0 to make the photo visible to friends when private * @is_friend: non-0 to make the photo visible to friends when private
* @is_family: non-0 to make the photo visible to family when private * @is_family: non-0 to make the photo visible to family when private
* @perm_comment: who can add comments to the photo and it's notes. one of: 0 nobody, 1 friends & family, 2 contacts, 3 everybody * @perm_comment: who can add comments to the photo and it's notes. one of: 0 nobody, 1 friends & family, 2 contacts, 3 everybody
* @perm_addmeta: who can add notes and tags to the photo. one of: 0 nobody / just the owner, 1 friends & family, 2 contacts, 3 everybody * @perm_addmeta: who can add notes and tags to the photo. one of: 0 nobody / just the owner, 1 friends & family, 2 contacts, 3 everybody
* *
* Permissions as used by flickcurl_photos_getPerms() and * Permissions as used by flickcurl_photos_getPerms() and
* flickcurl_photos_setPerms(). * flickcurl_photos_setPerms() which use public, friend, family,
* perm_comment and perm-addmeta. flickr.photos.geo.setPerms() uses
* public, contact, friend and family.
*/ */
typedef struct typedef struct
{ {
int is_public; int is_public;
int is_contact;
int is_friend; int is_friend;
int is_family; int is_family;
int perm_comment; int perm_comment;
int perm_addmeta; int perm_addmeta;
} flickcurl_perms; } flickcurl_perms;
/** /**
* flickcurl_location:
* @latitude: The latitude from -90 to 90
* @longitude: The longitude from -180 to 180
* @accuracy: Recorded accuracy level of the location.
* World level is 1, Country is ~3, Region ~6, City ~11, Street
* ~16. Current range is 1-16. Defaults to 16 if not specified. (<0 for n
one)
*/
typedef struct
{
double latitude;
double longitude;
int accuracy;
} flickcurl_location;
/**
* flickcurl_tag: * flickcurl_tag:
* @photo: Associated photo object if any * @photo: Associated photo object if any
* @id: tag identifier * @id: tag identifier
* @author: author (may be NULL) * @author: author (may be NULL)
* @authornamae: author real name (may be NULL) * @authornamae: author real name (may be NULL)
* @raw: raw tag as user typed it (may be NULL, but if so @cooked must be n ot NULL) * @raw: raw tag as user typed it (may be NULL, but if so @cooked must be n ot NULL)
* @cooked: cooked tag (may be NULL, but if so @raw must not be NULL) * @cooked: cooked tag (may be NULL, but if so @raw must not be NULL)
* @machine_tag: boolean (non-0 true) if tag is a Machine Tag * @machine_tag: boolean (non-0 true) if tag is a Machine Tag
* @count: tag count in a histogram (or 0) * @count: tag count in a histogram (or 0)
* *
skipping to change at line 306 skipping to change at line 325
flickcurl_context_type type; flickcurl_context_type type;
char* id; char* id;
char* secret; /* may be NULL */ char* secret; /* may be NULL */
int server; /* may be 0 */ int server; /* may be 0 */
int farm; /* may be 0 */ int farm; /* may be 0 */
char* title; /* may be NULL */ char* title; /* may be NULL */
char* url; /* may be NULL */ char* url; /* may be NULL */
char* thumb; /* may be NULL */ char* thumb; /* may be NULL */
} flickcurl_context; } flickcurl_context;
/**
* flickcurl_exif:
* @tagspace: Tagspace name
* @tagspaceid: ID of tagspace
* @tag: tag ID
* @label: tag label
* @raw: raw tag name
* @clean: pretty-formatted tag name
*
* An EXIF tag.
*/
typedef struct {
char* tagspace;
int tagspaceid;
int tag;
char* label;
char* raw;
char* clean;
} flickcurl_exif;
/**
* flickcurl_group:
* @nsid: NSID
* @name: Group Name
* @is_admin: is admin flag
* @privacy: privacy level
* @photos: photos in group count
* @iconserver: icon server ID
*
* A group.
*/
typedef struct {
char* nsid;
char* name;
int is_admin;
int privacy;
int photos;
int iconserver;
} flickcurl_group;
/* /*
* Fields of a flickcurl_person* * Fields of a flickcurl_person*
*/ */
typedef enum { typedef enum {
PERSON_FIELD_none, PERSON_FIELD_none,
PERSON_FIELD_isadmin, /* boolean */ PERSON_FIELD_isadmin, /* boolean */
PERSON_FIELD_ispro, /* boolean */ PERSON_FIELD_ispro, /* boolean */
PERSON_FIELD_iconserver, /* integer */ PERSON_FIELD_iconserver, /* integer */
PERSON_FIELD_iconfarm, /* integer - not in API docs */ PERSON_FIELD_iconfarm, /* integer - not in API docs */
PERSON_FIELD_username, /* string */ PERSON_FIELD_username, /* string */
PERSON_FIELD_realname, /* string */ PERSON_FIELD_realname, /* string */
PERSON_FIELD_mbox_sha1sum, /* string */ PERSON_FIELD_mbox_sha1sum, /* string */
PERSON_FIELD_location, /* string */ PERSON_FIELD_location, /* string */
PERSON_FIELD_photosurl, /* string */ PERSON_FIELD_photosurl, /* string */
PERSON_FIELD_profileurl, /* string */ PERSON_FIELD_profileurl, /* string */
PERSON_FIELD_mobileurl, /* string - not in API docs */ PERSON_FIELD_mobileurl, /* string - not in API docs */
PERSON_FIELD_photos_firstdate, /* dateTime */ PERSON_FIELD_photos_firstdate, /* dateTime */
PERSON_FIELD_photos_firstdatetaken, /* dateTime */ PERSON_FIELD_photos_firstdatetaken, /* dateTime */
PERSON_FIELD_photos_count, /* integer */ PERSON_FIELD_photos_count, /* integer */
PERSON_FIELD_photos_views, /* integer - not in API docs */ PERSON_FIELD_photos_views, /* integer - not in API docs */
PERSON_FIELD_LAST = PERSON_FIELD_photos_views PERSON_FIELD_favedate, /* dateTime - flickr.photos.getFavori
tes() */
PERSON_FIELD_LAST = PERSON_FIELD_favedate
} flickcurl_person_field_type; } flickcurl_person_field_type;
typedef struct { typedef struct {
char* string; char* string;
flickcurl_person_field_type integer; flickcurl_person_field_type integer;
flickcurl_field_value_type type; flickcurl_field_value_type type;
} flickcurl_person_field; } flickcurl_person_field;
/** /**
* flickcurl_person: * flickcurl_person:
skipping to change at line 490 skipping to change at line 550
const char* flickcurl_get_api_key(flickcurl *fc); const char* flickcurl_get_api_key(flickcurl *fc);
const char* flickcurl_get_shared_secret(flickcurl *fc); const char* flickcurl_get_shared_secret(flickcurl *fc);
const char* flickcurl_get_auth_token(flickcurl *fc); const char* flickcurl_get_auth_token(flickcurl *fc);
/* other flickcurl class destructors */ /* other flickcurl class destructors */
void flickcurl_free_tag(flickcurl_tag *t); void flickcurl_free_tag(flickcurl_tag *t);
void flickcurl_free_photo(flickcurl_photo *photo); void flickcurl_free_photo(flickcurl_photo *photo);
void flickcurl_free_photos(flickcurl_photo** photos); void flickcurl_free_photos(flickcurl_photo** photos);
/* void flickcurl_free_license(flickcurl_person *license); */ /* void flickcurl_free_license(flickcurl_person *license); */
void flickcurl_free_person(flickcurl_person *person); void flickcurl_free_person(flickcurl_person *person);
void flickcurl_free_persons(flickcurl_person** persons);
void flickcurl_free_context(flickcurl_context *context); void flickcurl_free_context(flickcurl_context *context);
void flickcurl_free_contexts(flickcurl_context** contexts); void flickcurl_free_contexts(flickcurl_context** contexts);
void flickcurl_free_perms(flickcurl_perms *perms); void flickcurl_free_perms(flickcurl_perms *perms);
void flickcurl_free_location(flickcurl_location *location);
void flickcurl_free_exif(flickcurl_exif *exif);
void flickcurl_free_exifs(flickcurl_exif **exifs_object);
/* utility methods */ /* utility methods */
/* get an image URL for a photo in some size */ /* get an image URL for a photo in some size */
char* flickcurl_photo_as_source_uri(flickcurl_photo *photo, const char c); char* flickcurl_photo_as_source_uri(flickcurl_photo *photo, const char c);
/* get labels for various field/types */ /* get labels for various field/types */
const char* flickcurl_get_photo_field_label(flickcurl_photo_field_type fiel d); const char* flickcurl_get_photo_field_label(flickcurl_photo_field_type fiel d);
const char* flickcurl_get_person_field_label(flickcurl_person_field_type fi eld); const char* flickcurl_get_person_field_label(flickcurl_person_field_type fi eld);
const char* flickcurl_get_field_value_type_label(flickcurl_field_value_type datatype); const char* flickcurl_get_field_value_type_label(flickcurl_field_value_type datatype);
const char* flickcurl_get_context_type_field_label(flickcurl_context_type t ype); const char* flickcurl_get_context_type_field_label(flickcurl_context_type t ype);
skipping to change at line 516 skipping to change at line 580
/* Flickr API calls */ /* Flickr API calls */
/* flickr.auth */ /* flickr.auth */
char* flickcurl_auth_checkToken(flickcurl* fc, const char* token); char* flickcurl_auth_checkToken(flickcurl* fc, const char* token);
char* flickcurl_auth_getFrob(flickcurl* fc); char* flickcurl_auth_getFrob(flickcurl* fc);
char* flickcurl_auth_getFullToken(flickcurl* fc, const char* frob); char* flickcurl_auth_getFullToken(flickcurl* fc, const char* frob);
char* flickcurl_auth_getToken(flickcurl* fc, const char* frob); char* flickcurl_auth_getToken(flickcurl* fc, const char* frob);
/* flickr.groups */ /* flickr.groups */
int flickcurl_groups_pools_add(flickcurl* fc, const char* photo_id, const c har* group_id);
flickcurl_context** flickcurl_groups_pools_getContext(flickcurl* fc, const char* photo_id, const char* group_id); flickcurl_context** flickcurl_groups_pools_getContext(flickcurl* fc, const char* photo_id, const char* group_id);
flickcurl_group** flickcurl_groups_pools_getGroups(flickcurl* fc, int page,
int per_page);
flickcurl_photo** flickcurl_groups_pools_getPhotos(flickcurl* fc, const cha
r* group_id, const char* tags, const char* user_id, const char* extras, int
per_page, int page);
int flickcurl_groups_pools_remove(flickcurl* fc, const char* photo_id, cons
t char* group_id);
void flickcurl_free_group(flickcurl_group *group);
void flickcurl_free_groups(flickcurl_group **groups_object);
/* flickr.people */ /* flickr.people */
char* flickcurl_people_findByEmail(flickcurl* fc, const char* email); char* flickcurl_people_findByEmail(flickcurl* fc, const char* email);
char* flickcurl_people_findByUsername(flickcurl* fc, const char* username); char* flickcurl_people_findByUsername(flickcurl* fc, const char* username);
flickcurl_person* flickcurl_people_getInfo(flickcurl* fc, const char* user_ id); flickcurl_person* flickcurl_people_getInfo(flickcurl* fc, const char* user_ id);
flickcurl_photo** flickcurl_people_getPublicPhotos(flickcurl* fc, const cha r* user_id, const char* extras, int per_page, int page);
/* flickr.photos */ /* flickr.photos */
int flickcurl_photos_addTags(flickcurl* fc, const char* photo_id, const cha r* tags); int flickcurl_photos_addTags(flickcurl* fc, const char* photo_id, const cha r* tags);
int flickcurl_photos_delete(flickcurl* fc, const char* photo_id); int flickcurl_photos_delete(flickcurl* fc, const char* photo_id);
flickcurl_context** flickcurl_photos_getAllContexts(flickcurl* fc, const ch ar* photo_id); flickcurl_context** flickcurl_photos_getAllContexts(flickcurl* fc, const ch ar* photo_id);
flickcurl_photo** flickcurl_photos_getContactsPhotos(flickcurl* fc, int con tact_count, int just_friends, int single_photo, int include_self, const cha r* extras); flickcurl_photo** flickcurl_photos_getContactsPhotos(flickcurl* fc, int con tact_count, int just_friends, int single_photo, int include_self, const cha r* extras);
flickcurl_photo** flickcurl_photos_getContactsPublicPhotos(flickcurl* fc, c onst char* user_id, int count, int just_friends, int single_photo, int inc lude_self, const char* extras);
flickcurl_context** flickcurl_photos_getContext(flickcurl* fc, const char* photo_id); flickcurl_context** flickcurl_photos_getContext(flickcurl* fc, const char* photo_id);
flickcurl_exif** flickcurl_photos_getExif(flickcurl* fc, const char* photo_
id, const char* secret);
flickcurl_person** flickcurl_photos_getFavorites(flickcurl* fc, const char*
photo_id, int page, int per_page);
flickcurl_photo* flickcurl_photos_getInfo(flickcurl *fc, const char* photo_ id); flickcurl_photo* flickcurl_photos_getInfo(flickcurl *fc, const char* photo_ id);
flickcurl_photo** flickcurl_photos_getNotInSet(flickcurl* fc, int min_uploa d_date, int max_upload_date, const char* min_taken_date, const char* max_ta ken_date, int privacy_filter, const char* extras, int per_page, int page);
flickcurl_perms* flickcurl_photos_getPerms(flickcurl* fc, const char* photo _id); flickcurl_perms* flickcurl_photos_getPerms(flickcurl* fc, const char* photo _id);
flickcurl_photo** flickcurl_photos_getRecent(flickcurl* fc, const char* ext
ras, int per_page, int page);
flickcurl_photo** flickcurl_photos_getUntagged(flickcurl* fc, int min_uploa
d_date, int max_upload_date, const char* min_taken_date, const char* max_ta
ken_date, int privacy_filter, const char* extras, int per_page, int page);
flickcurl_photo** flickcurl_photos_getWithGeoData(flickcurl* fc, int min_up
load_date, int max_upload_date, const char* min_taken_date, const char* max
_taken_date, int privacy_filter, const char* extras, int per_page, int page
);
flickcurl_photo** flickcurl_photos_getWithoutGeoData(flickcurl* fc, int min
_upload_date, int max_upload_date, const char* min_taken_date, const char*
max_taken_date, int privacy_filter, const char* extras, int per_page, int p
age);
flickcurl_photo** flickcurl_photos_recentlyUpdated(flickcurl* fc, int min_d
ate, const char* extras, int per_page, int page);
int flickcurl_photos_removeTag(flickcurl* fc, const char* tag_id); int flickcurl_photos_removeTag(flickcurl* fc, const char* tag_id);
flickcurl_photo** flickcurl_photos_search(flickcurl* fc, flickcurl_search_p arams* params); flickcurl_photo** flickcurl_photos_search(flickcurl* fc, flickcurl_search_p arams* params);
int flickcurl_photos_setContentType(flickcurl* fc, const char* photo_id, in t content_type); int flickcurl_photos_setContentType(flickcurl* fc, const char* photo_id, in t content_type);
int flickcurl_photos_setDates(flickcurl* fc, const char* photo_id, int date _posted, int date_taken, int date_taken_granularity); int flickcurl_photos_setDates(flickcurl* fc, const char* photo_id, int date _posted, int date_taken, int date_taken_granularity);
int flickcurl_photos_setMeta(flickcurl* fc, const char* photo_id, const cha r* title, const char* description); int flickcurl_photos_setMeta(flickcurl* fc, const char* photo_id, const cha r* title, const char* description);
int flickcurl_photos_setPerms(flickcurl* fc, const char* photo_id, flickcur l_perms* perms); int flickcurl_photos_setPerms(flickcurl* fc, const char* photo_id, flickcur l_perms* perms);
int flickcurl_photos_setSafetyLevel(flickcurl* fc, const char* photo_id, in t safety_level, int hidden); int flickcurl_photos_setSafetyLevel(flickcurl* fc, const char* photo_id, in t safety_level, int hidden);
int flickcurl_photos_setTags(flickcurl* fc, const char* photo_id, const cha r* tags); int flickcurl_photos_setTags(flickcurl* fc, const char* photo_id, const cha r* tags);
/* flickr.contacts */ /* flickr.contacts */
skipping to change at line 554 skipping to change at line 634
flickcurl_contact** flickcurl_contacts_getPublicList(flickcurl* fc, const c har* user_id, int page, int per_page); flickcurl_contact** flickcurl_contacts_getPublicList(flickcurl* fc, const c har* user_id, int page, int per_page);
/* flickr.photos.comments */ /* flickr.photos.comments */
void flickcurl_free_comment(flickcurl_comment *comment_object); void flickcurl_free_comment(flickcurl_comment *comment_object);
void flickcurl_free_comments(flickcurl_comment **comments_object); void flickcurl_free_comments(flickcurl_comment **comments_object);
char* flickcurl_photos_comments_addComment(flickcurl* fc, const char* photo _id, const char* comment_text); char* flickcurl_photos_comments_addComment(flickcurl* fc, const char* photo _id, const char* comment_text);
int flickcurl_photos_comments_deleteComment(flickcurl* fc, const char* comm ent_id); int flickcurl_photos_comments_deleteComment(flickcurl* fc, const char* comm ent_id);
int flickcurl_photos_comments_editComment(flickcurl* fc, const char* commen t_id, const char* comment_text); int flickcurl_photos_comments_editComment(flickcurl* fc, const char* commen t_id, const char* comment_text);
flickcurl_comment** flickcurl_photos_comments_getList(flickcurl* fc, const char* photo_id); flickcurl_comment** flickcurl_photos_comments_getList(flickcurl* fc, const char* photo_id);
/* flickr.photos.geo */
flickcurl_location* flickcurl_photos_geo_getLocation(flickcurl* fc, const c
har* photo_id);
flickcurl_perms* flickcurl_photos_geo_getPerms(flickcurl* fc, const char* p
hoto_id);
int flickcurl_photos_geo_removeLocation(flickcurl* fc, const char* photo_id
);
int flickcurl_photos_geo_setLocation(flickcurl* fc, const char* photo_id, f
lickcurl_location* location);
int flickcurl_photos_geo_setPerms(flickcurl* fc, const char* photo_id, flic
kcurl_perms* perms);
const char* flickcurl_get_location_accuracy_label(int accuracy);
/* flickr.photos.licenses */ /* flickr.photos.licenses */
flickcurl_license** flickcurl_photos_licenses_getInfo(flickcurl *fc); flickcurl_license** flickcurl_photos_licenses_getInfo(flickcurl *fc);
flickcurl_license* flickcurl_photos_licenses_getInfo_by_id(flickcurl *fc, i nt id); flickcurl_license* flickcurl_photos_licenses_getInfo_by_id(flickcurl *fc, i nt id);
int flickcurl_photos_licenses_setLicense(flickcurl* fc, const char* photo_i
d, int license_id);
/* flickr.photos.notes */
char* flickcurl_photos_notes_add(flickcurl* fc, const char* photo_id, int n
ote_x, int note_y, int note_w, int note_h, const char* note_text);
int flickcurl_photos_notes_delete(flickcurl* fc, const char* note_id);
int flickcurl_photos_notes_edit(flickcurl* fc, const char* note_id, int not
e_x, int note_y, int note_w, int note_h, const char* note_text);
/* flickr.photosets */ /* flickr.photosets */
flickcurl_context** flickcurl_photosets_getContext(flickcurl* fc, const cha r* photo_id, const char* photoset_id); flickcurl_context** flickcurl_photosets_getContext(flickcurl* fc, const cha r* photo_id, const char* photoset_id);
/* flickr.photosets.comments */ /* flickr.photosets.comments */
char* flickcurl_photosets_comments_addComment(flickcurl* fc, const char* ph otoset_id, const char* comment_text); char* flickcurl_photosets_comments_addComment(flickcurl* fc, const char* ph otoset_id, const char* comment_text);
int flickcurl_photosets_comments_deleteComment(flickcurl* fc, const char* c omment_id); int flickcurl_photosets_comments_deleteComment(flickcurl* fc, const char* c omment_id);
int flickcurl_photosets_comments_editComment(flickcurl* fc, const char* com ment_id, const char* comment_text); int flickcurl_photosets_comments_editComment(flickcurl* fc, const char* com ment_id, const char* comment_text);
flickcurl_comment** flickcurl_photosets_comments_getList(flickcurl* fc, con st char* photoset_id); flickcurl_comment** flickcurl_photosets_comments_getList(flickcurl* fc, con st char* photoset_id);
 End of changes. 17 change blocks. 
2 lines changed or deleted 122 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/