flickcurl.h   flickcurl.h 
skipping to change at line 86 skipping to change at line 86
* @VALUE_TYPE_FLOAT: floating point number * @VALUE_TYPE_FLOAT: floating point number
* @VALUE_TYPE_INTEGER: integer * @VALUE_TYPE_INTEGER: integer
* @VALUE_TYPE_STRING: string * @VALUE_TYPE_STRING: string
* @VALUE_TYPE_URI: URI * @VALUE_TYPE_URI: URI
* @VALUE_TYPE_PERSON_ID: person ID * @VALUE_TYPE_PERSON_ID: person ID
* @VALUE_TYPE_PHOTO_ID: internal * @VALUE_TYPE_PHOTO_ID: internal
* @VALUE_TYPE_PHOTO_URI: internal * @VALUE_TYPE_PHOTO_URI: internal
* @VALUE_TYPE_MEDIA_TYPE: internal * @VALUE_TYPE_MEDIA_TYPE: internal
* @VALUE_TYPE_NONE: internal * @VALUE_TYPE_NONE: internal
* @VALUE_TYPE_TAG_STRING: internal * @VALUE_TYPE_TAG_STRING: internal
* @VALUE_TYPE_COLLECTION_ID: internal
* @VALUE_TYPE_ICON_PHOTOS: internal
* @VALUE_TYPE_LAST: internal offset to last in enum list * @VALUE_TYPE_LAST: internal offset to last in enum list
* *
* Field data types * Field data types
*/ */
typedef enum { typedef enum {
VALUE_TYPE_NONE, /* empty field */ VALUE_TYPE_NONE, /* empty field */
VALUE_TYPE_PHOTO_ID, /* internal */ VALUE_TYPE_PHOTO_ID, /* internal */
VALUE_TYPE_PHOTO_URI, /* internal */ VALUE_TYPE_PHOTO_URI, /* internal */
VALUE_TYPE_UNIXTIME, VALUE_TYPE_UNIXTIME,
VALUE_TYPE_BOOLEAN, VALUE_TYPE_BOOLEAN,
VALUE_TYPE_DATETIME, VALUE_TYPE_DATETIME,
VALUE_TYPE_FLOAT, VALUE_TYPE_FLOAT,
VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER,
VALUE_TYPE_STRING, VALUE_TYPE_STRING,
VALUE_TYPE_URI, VALUE_TYPE_URI,
VALUE_TYPE_PERSON_ID, /* internal */ VALUE_TYPE_PERSON_ID, /* internal */
VALUE_TYPE_MEDIA_TYPE, /* internal */ VALUE_TYPE_MEDIA_TYPE, /* internal */
VALUE_TYPE_TAG_STRING, /* internal */ VALUE_TYPE_TAG_STRING, /* internal */
VALUE_TYPE_LAST = VALUE_TYPE_TAG_STRING VALUE_TYPE_COLLECTION_ID, /* internal */
VALUE_TYPE_ICON_PHOTOS, /* internal */
VALUE_TYPE_LAST = VALUE_TYPE_ICON_PHOTOS
} flickcurl_field_value_type; } flickcurl_field_value_type;
/** /**
* flickcurl_photo_field_type: * flickcurl_photo_field_type:
* @PHOTO_FIELD_dateuploaded: date uploaded * @PHOTO_FIELD_dateuploaded: date uploaded
* @PHOTO_FIELD_farm: farm number * @PHOTO_FIELD_farm: farm number
* @PHOTO_FIELD_isfavorite: is favorite boolean * @PHOTO_FIELD_isfavorite: is favorite boolean
* @PHOTO_FIELD_license: license * @PHOTO_FIELD_license: license
* @PHOTO_FIELD_originalformat: original format * @PHOTO_FIELD_originalformat: original format
* @PHOTO_FIELD_rotation: rotation * @PHOTO_FIELD_rotation: rotation
skipping to change at line 886 skipping to change at line 890
* A blog. * A blog.
*/ */
typedef struct { typedef struct {
char* id; char* id;
char* name; char* name;
int needs_password; int needs_password;
char* url; char* url;
} flickcurl_blog; } flickcurl_blog;
/** /**
* flickcurl_blog_service:
* @id: ID
* @name: Service Name
*
* A blog service.
*/
typedef struct {
char* id;
char* name;
} flickcurl_blog_service;
/**
* flickcurl_category: * flickcurl_category:
* @id: category ID * @id: category ID
* @name: Name * @name: Name
* @path: path to category * @path: path to category
* @count: count * @count: count
* *
* A category. * A category.
*/ */
struct flickcurl_category_s { struct flickcurl_category_s {
char* id; char* id;
skipping to change at line 907 skipping to change at line 923
char* path; char* path;
int count; int count;
struct flickcurl_category_s** categories; struct flickcurl_category_s** categories;
int categories_count; int categories_count;
flickcurl_group** groups; flickcurl_group** groups;
int groups_count; int groups_count;
}; };
typedef struct flickcurl_category_s flickcurl_category; typedef struct flickcurl_category_s flickcurl_category;
/** /**
* flickcurl_photoset:
* @id: photoset ID
* @primary: primary photo ID
* @secret: secret
* @server: server
* @farm: farm
* @photos_count: count of photos in set
* @title: title of photoset
* @description: description of photoset (may be NULL)
* @photos: photos in a photoset (may be NULL)
*
* A photoset.
*
*/
typedef struct {
char *id;
char *primary;
char *secret;
int server;
int farm;
int photos_count;
char* title;
char *description;
struct flickcurl_photo_s** photos;
} flickcurl_photoset;
/**
* flickcurl_collection:
* @id: ID
* @child_count: children??
* @date_created: date created
* @iconlarge: large icon url
* @iconsmall: small icon url
* @server: server ID
* @secret: secret
* @title: title
* @description: description
* @photos: icon photos
* @photos_count: number of icon photos
* @collections: sub-collections
* @collections_count: number of sub-collections
* @sets: photo sets
* @sets_count: number of photo sets
*
* A photo collection. May contain collections OR sets but not both.
*/
struct flickcurl_collection_s {
char* id;
int child_count;
int date_created;
char *iconlarge;
char *iconsmall;
int server;
char *secret;
char *title;
char *description;
flickcurl_photo **photos;
int photos_count;
struct flickcurl_collection_s** collections;
int collections_count;
struct flickcurl_photoset_s** sets;
int sets_count;
};
typedef struct flickcurl_collection_s flickcurl_collection;
/**
* flickcurl_person_field_type: * flickcurl_person_field_type:
* @PERSON_FIELD_isadmin: is admin field boolean * @PERSON_FIELD_isadmin: is admin field boolean
* @PERSON_FIELD_ispro: is pro field boolean * @PERSON_FIELD_ispro: is pro field boolean
* @PERSON_FIELD_iconserver: icon server integer * @PERSON_FIELD_iconserver: icon server integer
* @PERSON_FIELD_iconfarm: icon farm integer * @PERSON_FIELD_iconfarm: icon farm integer
* @PERSON_FIELD_username: username * @PERSON_FIELD_username: username
* @PERSON_FIELD_realname: real name * @PERSON_FIELD_realname: real name
* @PERSON_FIELD_mbox_sha1sum: Email SHA1 sum * @PERSON_FIELD_mbox_sha1sum: Email SHA1 sum
* @PERSON_FIELD_location: location * @PERSON_FIELD_location: location
* @PERSON_FIELD_photosurl: photos URL * @PERSON_FIELD_photosurl: photos URL
skipping to change at line 1135 skipping to change at line 1217
int has_geo; int has_geo;
double lat; double lat;
double lon; double lon;
double radius; double radius;
char* radius_units; char* radius_units;
char* contacts; char* contacts;
int woe_id; int woe_id;
} flickcurl_search_params; } flickcurl_search_params;
/** /**
* flickcurl_photoset:
* @id: photoset ID
* @primary: primary photo ID
* @secret: secret
* @server: server
* @farm: farm
* @photos_count: count of photos in set
* @title: title of photoset
* @description: description of photoset (may be NULL)
*
* A photoset.
*
*/
typedef struct {
char *id;
char *primary;
char *secret;
int server;
int farm;
int photos_count;
char* title;
char *description;
} flickcurl_photoset;
/**
* flickcurl_size: * flickcurl_size:
* @label: label * @label: label
* @width: width in pixels * @width: width in pixels
* @height: height in pixels * @height: height in pixels
* @source: raw image source URL * @source: raw image source URL
* @url: url of photo page * @url: url of photo page
* @media: 'photo' or 'video' * @media: 'photo' or 'video'
* *
* A photo at a size. * A photo at a size.
* *
skipping to change at line 1400 skipping to change at line 1457
/* flickcurl* object set methods */ /* flickcurl* object set methods */
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_api_key(flickcurl *fc); const char* flickcurl_get_api_key(flickcurl *fc);
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_shared_secret(flickcurl *fc); const char* flickcurl_get_shared_secret(flickcurl *fc);
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_auth_token(flickcurl *fc); const char* flickcurl_get_auth_token(flickcurl *fc);
/* other flickcurl class destructors */ /* other flickcurl class destructors */
FLICKCURL_API FLICKCURL_API
void flickcurl_free_collection(flickcurl_collection *collection);
FLICKCURL_API
void flickcurl_free_collections(flickcurl_collection** collections);
FLICKCURL_API
void flickcurl_free_tag_namespace(flickcurl_tag_namespace *tag_nspace); void flickcurl_free_tag_namespace(flickcurl_tag_namespace *tag_nspace);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_tag_namespaces(flickcurl_tag_namespace** tag_nspaces); void flickcurl_free_tag_namespaces(flickcurl_tag_namespace** tag_nspaces);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_tag(flickcurl_tag *t); void flickcurl_free_tag(flickcurl_tag *t);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_tag_clusters(flickcurl_tag_clusters *tcs); void flickcurl_free_tag_clusters(flickcurl_tag_clusters *tcs);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_photo(flickcurl_photo *photo); void flickcurl_free_photo(flickcurl_photo *photo);
FLICKCURL_API FLICKCURL_API
skipping to change at line 1473 skipping to change at line 1534
FLICKCURL_API FLICKCURL_API
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 a page URL for a photo */ /* get a page URL for a photo */
FLICKCURL_API FLICKCURL_API
char* flickcurl_photo_as_page_uri(flickcurl_photo *photo); char* flickcurl_photo_as_page_uri(flickcurl_photo *photo);
/* get a owner icon URL for a photo */ /* get a owner icon URL for a photo */
FLICKCURL_API FLICKCURL_API
char* flickcurl_user_icon_uri(int farm, int server, char *nsid); char* flickcurl_user_icon_uri(int farm, int server, char *nsid);
FLICKCURL_API FLICKCURL_API
char* flickcurl_photo_as_user_icon_uri(flickcurl_photo *photo); char* flickcurl_photo_as_user_icon_uri(flickcurl_photo *photo);
/* get a short URL for a photo ID - http://flic.kr */
FLICKCURL_API
char* flickcurl_photo_id_as_short_uri(char *photo_id);
/* get a short URL for a photo object - http://flic.kr */
FLICKCURL_API
char* flickcurl_photo_as_short_uri(flickcurl_photo *photo);
/* get labels for various field/types */ /* get labels for various field/types */
FLICKCURL_API FLICKCURL_API
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);
FLICKCURL_API FLICKCURL_API
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);
FLICKCURL_API FLICKCURL_API
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);
FLICKCURL_API FLICKCURL_API
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 1540 skipping to change at line 1607
FLICKCURL_API FLICKCURL_API
char* flickcurl_auth_getToken(flickcurl* fc, const char* frob); char* flickcurl_auth_getToken(flickcurl* fc, const char* frob);
/* flickr.blogs */ /* flickr.blogs */
FLICKCURL_API FLICKCURL_API
flickcurl_blog** flickcurl_blogs_getList(flickcurl* fc); flickcurl_blog** flickcurl_blogs_getList(flickcurl* fc);
FLICKCURL_API FLICKCURL_API
int flickcurl_blogs_postPhoto(flickcurl* fc, const char* blog_id, const cha r* photo_id, const char* title, const char* description, const char* blog_p assword); int flickcurl_blogs_postPhoto(flickcurl* fc, const char* blog_id, const cha r* photo_id, const char* title, const char* description, const char* blog_p assword);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_blogs(flickcurl_blog **blogs_object); void flickcurl_free_blogs(flickcurl_blog **blogs_object);
FLICKCURL_API
flickcurl_blog_service** flickcurl_blogs_getServices(flickcurl* fc);
FLICKCURL_API
void flickcurl_free_blog_services(flickcurl_blog_service **blog_services_ob
ject);
/* flickr.collections */
FLICKCURL_API
flickcurl_collection* flickcurl_collections_getInfo(flickcurl* fc, const ch
ar* collection_id);
FLICKCURL_API
flickcurl_collection* flickcurl_collections_getTree(flickcurl* fc, const ch
ar* collection_id, const char* user_id);
/* flickr.commons */ /* flickr.commons */
FLICKCURL_API FLICKCURL_API
flickcurl_institution** flickcurl_commons_getInstitutions(flickcurl* fc); flickcurl_institution** flickcurl_commons_getInstitutions(flickcurl* fc);
const char* flickcurl_get_institution_url_type_label(flickcurl_institution_ url_type url_type); const char* flickcurl_get_institution_url_type_label(flickcurl_institution_ url_type url_type);
/* flickr.favorites */ /* flickr.favorites */
FLICKCURL_API FLICKCURL_API
int flickcurl_favorites_add(flickcurl* fc, const char* photo_id); int flickcurl_favorites_add(flickcurl* fc, const char* photo_id);
FLICKCURL_API FLICKCURL_API
skipping to change at line 1613 skipping to change at line 1690
/* flickr.machinetags */ /* flickr.machinetags */
FLICKCURL_API FLICKCURL_API
flickcurl_tag_namespace** flickcurl_machinetags_getNamespaces(flickcurl* fc , const char* predicate, int per_page, int page); flickcurl_tag_namespace** flickcurl_machinetags_getNamespaces(flickcurl* fc , const char* predicate, int per_page, int page);
FLICKCURL_API FLICKCURL_API
flickcurl_tag_predicate_value** flickcurl_machinetags_getPairs(flickcurl* f c, const char *nspace, const char* predicate, int per_page, int page); flickcurl_tag_predicate_value** flickcurl_machinetags_getPairs(flickcurl* f c, const char *nspace, const char* predicate, int per_page, int page);
FLICKCURL_API FLICKCURL_API
flickcurl_tag_predicate_value** flickcurl_machinetags_getPredicates(flickcu rl* fc, const char *nspace, int per_page, int page); flickcurl_tag_predicate_value** flickcurl_machinetags_getPredicates(flickcu rl* fc, const char *nspace, int per_page, int page);
FLICKCURL_API FLICKCURL_API
flickcurl_tag_predicate_value** flickcurl_machinetags_getValues(flickcurl* fc, const char *nspace, const char* predicate, int per_page, int page); flickcurl_tag_predicate_value** flickcurl_machinetags_getValues(flickcurl* fc, const char *nspace, const char* predicate, int per_page, int page);
FLICKCURL_API
flickcurl_tag_predicate_value** flickcurl_machinetags_getRecentValues(flick
curl* fc, const char *nspace, const char* predicate, int added_since);
/* flickr.panda */ /* flickr.panda */
FLICKCURL_API FLICKCURL_API
char** flickcurl_panda_getList(flickcurl* fc); char** flickcurl_panda_getList(flickcurl* fc);
FLICKCURL_API FLICKCURL_API
flickcurl_photo** flickcurl_panda_getPhotos(flickcurl *fc, const char *pand a_name); flickcurl_photo** flickcurl_panda_getPhotos(flickcurl *fc, const char *pand a_name);
/* flickr.photo.getSizes */ /* flickr.photo.getSizes */
FLICKCURL_API FLICKCURL_API
void flickcurl_free_size(flickcurl_size *size); void flickcurl_free_size(flickcurl_size *size);
skipping to change at line 1728 skipping to change at line 1807
flickcurl_place* flickcurl_places_findByLatLon(flickcurl* fc, double lat, d ouble lon, int accuracy); flickcurl_place* flickcurl_places_findByLatLon(flickcurl* fc, double lat, d ouble lon, int accuracy);
FLICKCURL_API FLICKCURL_DEPRECATED FLICKCURL_API FLICKCURL_DEPRECATED
flickcurl_place** flickcurl_places_getChildrenWithPhotosPublic(flickcurl* f c, const char* place_id, const char* woe_id); flickcurl_place** flickcurl_places_getChildrenWithPhotosPublic(flickcurl* f c, const char* place_id, const char* woe_id);
FLICKCURL_API FLICKCURL_API
flickcurl_place** flickcurl_places_getChildrenWithPhotosPublic2(flickcurl* fc, const char* place_id, int woe_id); flickcurl_place** flickcurl_places_getChildrenWithPhotosPublic2(flickcurl* fc, const char* place_id, int woe_id);
FLICKCURL_API FLICKCURL_DEPRECATED FLICKCURL_API FLICKCURL_DEPRECATED
flickcurl_place* flickcurl_places_getInfo(flickcurl* fc, const char* place_ id, const char* woe_id); flickcurl_place* flickcurl_places_getInfo(flickcurl* fc, const char* place_ id, const char* woe_id);
FLICKCURL_API FLICKCURL_API
flickcurl_place* flickcurl_places_getInfo2(flickcurl* fc, const char* place _id, const int woe_id); flickcurl_place* flickcurl_places_getInfo2(flickcurl* fc, const char* place _id, const int woe_id);
FLICKCURL_API FLICKCURL_API
flickcurl_place** flickcurl_places_getTopPlacesList(flickcurl* fc, flickcur
l_place_type place_type, const char* date, int woe_id, const char* place_id
);
FLICKCURL_API
flickcurl_place* flickcurl_places_getInfoByUrl(flickcurl* fc, const char* u rl); flickcurl_place* flickcurl_places_getInfoByUrl(flickcurl* fc, const char* u rl);
FLICKCURL_API FLICKCURL_API
flickcurl_place* flickcurl_places_resolvePlaceId(flickcurl* fc, const char* place_id); flickcurl_place* flickcurl_places_resolvePlaceId(flickcurl* fc, const char* place_id);
FLICKCURL_API FLICKCURL_API
flickcurl_place* flickcurl_places_resolvePlaceURL(flickcurl* fc, const char * url); flickcurl_place* flickcurl_places_resolvePlaceURL(flickcurl* fc, const char * url);
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_place_type_label(flickcurl_place_type place_type) ; const char* flickcurl_get_place_type_label(flickcurl_place_type place_type) ;
flickcurl_place_type flickcurl_get_place_type_by_label(const char* place_la bel); flickcurl_place_type flickcurl_get_place_type_by_label(const char* place_la bel);
FLICKCURL_API FLICKCURL_API
flickcurl_place_type_info** flickcurl_places_getPlaceTypes(flickcurl* fc); flickcurl_place_type_info** flickcurl_places_getPlaceTypes(flickcurl* fc);
skipping to change at line 1780 skipping to change at line 1861
FLICKCURL_API FLICKCURL_API
void flickcurl_free_comments(flickcurl_comment **comments_object); void flickcurl_free_comments(flickcurl_comment **comments_object);
FLICKCURL_API FLICKCURL_API
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);
FLICKCURL_API FLICKCURL_API
int flickcurl_photos_comments_deleteComment(flickcurl* fc, const char* comm ent_id); int flickcurl_photos_comments_deleteComment(flickcurl* fc, const char* comm ent_id);
FLICKCURL_API FLICKCURL_API
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_API FLICKCURL_API
flickcurl_comment** flickcurl_photos_comments_getList(flickcurl* fc, const char* photo_id); flickcurl_comment** flickcurl_photos_comments_getList(flickcurl* fc, const char* photo_id);
FLICKCURL_API
flickcurl_photos_list* flickcurl_photos_comments_getRecentForContacts_param
s(flickcurl* fc, int date_lastcomment, const char* contacts_filter, flickcu
rl_photos_list_params* list_params);
/* flickr.photos.geo */ /* flickr.photos.geo */
FLICKCURL_API FLICKCURL_API
int flickcurl_photos_geo_batchCorrectLocation(flickcurl* fc, flickcurl_loca tion* location, const char* place_id, int woe_id); int flickcurl_photos_geo_batchCorrectLocation(flickcurl* fc, flickcurl_loca tion* location, const char* place_id, int woe_id);
FLICKCURL_API FLICKCURL_API
int flickcurl_photos_geo_correctLocation(flickcurl* fc, const char* photo_i d, const char* place_id, int woe_id); int flickcurl_photos_geo_correctLocation(flickcurl* fc, const char* photo_i d, const char* place_id, int woe_id);
FLICKCURL_API FLICKCURL_API
flickcurl_location* flickcurl_photos_geo_getLocation(flickcurl* fc, const c har* photo_id); flickcurl_location* flickcurl_photos_geo_getLocation(flickcurl* fc, const c har* photo_id);
FLICKCURL_API FLICKCURL_API
flickcurl_perms* flickcurl_photos_geo_getPerms(flickcurl* fc, const char* p hoto_id); flickcurl_perms* flickcurl_photos_geo_getPerms(flickcurl* fc, const char* p hoto_id);
 End of changes. 11 change blocks. 
26 lines changed or deleted 117 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/