flickcurl.h   flickcurl.h 
skipping to change at line 1003 skipping to change at line 1003
* flickcurl_photoset: * flickcurl_photoset:
* @id: photoset ID * @id: photoset ID
* @primary: primary photo ID * @primary: primary photo ID
* @secret: secret * @secret: secret
* @server: server * @server: server
* @farm: farm * @farm: farm
* @photos_count: count of photos in set * @photos_count: count of photos in set
* @title: title of photoset * @title: title of photoset
* @description: description of photoset (may be NULL) * @description: description of photoset (may be NULL)
* @photos: photos in a photoset (may be NULL) * @photos: photos in a photoset (may be NULL)
* @owner: owner NSID
* *
* A photoset. * A photoset.
* *
*/ */
typedef struct { typedef struct {
char *id; char *id;
char *primary; char *primary;
char *secret; char *secret;
int server; int server;
int farm; int farm;
int photos_count; int photos_count;
char* title; char* title;
char *description; char *description;
struct flickcurl_photo_s** photos; struct flickcurl_photo_s** photos;
char *owner;
} flickcurl_photoset; } flickcurl_photoset;
/** /**
* flickcurl_collection: * flickcurl_collection:
* @id: ID * @id: ID
* @child_count: children?? * @child_count: children??
* @date_created: date created * @date_created: date created
* @iconlarge: large icon url * @iconlarge: large icon url
* @iconsmall: small icon url * @iconsmall: small icon url
* @server: server ID * @server: server ID
skipping to change at line 1192 skipping to change at line 1194
* flickcurl_upload_params: * flickcurl_upload_params:
* @photo_file: photo filename * @photo_file: photo filename
* @title: title or NULL * @title: title or NULL
* @description: description of photo (HTML) (or NULL) * @description: description of photo (HTML) (or NULL)
* @tags: space-separated list of tags (or NULL) * @tags: space-separated list of tags (or NULL)
* @is_public: is public photo boolean (non-0 true) * @is_public: is public photo boolean (non-0 true)
* @is_friend: is friend photo boolean (non-0 true) * @is_friend: is friend photo boolean (non-0 true)
* @is_family: is family photo boolean (non-0 true) * @is_family: is family photo boolean (non-0 true)
* @safety_level: 1=safe, 2=moderate, 3=restricted * @safety_level: 1=safe, 2=moderate, 3=restricted
* @content_type: 1=photo, 2=screenshot, 3=other/artwork * @content_type: 1=photo, 2=screenshot, 3=other/artwork
* @hidden: 1=in global search, 2=hidden from publish searches (Flickcurl 1 .22+)
* *
* Photo upload parameters * Photo upload parameters
*/ */
typedef struct { typedef struct {
const char* photo_file; const char* photo_file;
const char *title; const char *title;
const char *description; const char *description;
const char *tags; const char *tags;
int is_public; int is_public;
int is_friend; int is_friend;
int is_family; int is_family;
int safety_level; int safety_level;
int content_type; int content_type;
/* Flickcurl 1.22+ */
int hidden;
} flickcurl_upload_params; } flickcurl_upload_params;
/** /**
* flickcurl_upload_status: * flickcurl_upload_status:
* @photoid: photo ID that was uploaded/replaced (upload only) * @photoid: photo ID that was uploaded/replaced (upload only)
* @secret: secret of photo uploaded (replace only) * @secret: secret of photo uploaded (replace only)
* @originalsecret: secret of original photo (replace only) * @originalsecret: secret of original photo (replace only)
* @ticketid: ticket ID for asynchronous upload (replace only) * @ticketid: ticket ID for asynchronous upload (replace only)
* *
* An upload response. * An upload response.
skipping to change at line 1540 skipping to change at line 1545
extern const char* const flickcurl_home_url_string; extern const char* const flickcurl_home_url_string;
FLICKCURL_API FLICKCURL_API
extern const char* const flickcurl_version_string; extern const char* const flickcurl_version_string;
FLICKCURL_API FLICKCURL_API
extern const char* const flickcurl_flickr_service_uri; extern const char* const flickcurl_flickr_service_uri;
FLICKCURL_API FLICKCURL_API
extern const char* const flickcurl_flickr_upload_service_uri; extern const char* const flickcurl_flickr_upload_service_uri;
FLICKCURL_API FLICKCURL_API
extern const char* const flickcurl_flickr_replace_service_uri; extern const char* const flickcurl_flickr_replace_service_uri;
FLICKCURL_API
extern const char* const flickcurl_flickr_oauth_request_token_uri;
FLICKCURL_API
extern const char* const flickcurl_flickr_oauth_authorize_uri;
FLICKCURL_API
extern const char* const flickcurl_flickr_oauth_access_token_uri;
/* library init - call once before creating anything */ /* library init - call once before creating anything */
FLICKCURL_API FLICKCURL_API
int flickcurl_init(void); int flickcurl_init(void);
/* library cleanup - call once before exit */ /* library cleanup - call once before exit */
FLICKCURL_API FLICKCURL_API
void flickcurl_finish(void); void flickcurl_finish(void);
/* flickcurl* object constructor */ /* flickcurl* object constructor */
FLICKCURL_API FLICKCURL_API
skipping to change at line 1618 skipping to change at line 1629
void flickcurl_free_collections(flickcurl_collection** collections); void flickcurl_free_collections(flickcurl_collection** collections);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_gallery(flickcurl_gallery *gallery); void flickcurl_free_gallery(flickcurl_gallery *gallery);
FLICKCURL_API 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_tags(flickcurl_tag **tags);
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
void flickcurl_free_photos(flickcurl_photo** photos); void flickcurl_free_photos(flickcurl_photo** photos);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_photos_list(flickcurl_photos_list* photos_list); void flickcurl_free_photos_list(flickcurl_photos_list* photos_list);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_photoset(flickcurl_photoset *photoset); void flickcurl_free_photoset(flickcurl_photoset *photoset);
FLICKCURL_API FLICKCURL_API
skipping to change at line 1714 skipping to change at line 1727
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_content_type_label(int content_type); const char* flickcurl_get_content_type_label(int content_type);
FLICKCURL_API FLICKCURL_API
int flickcurl_get_content_type_from_string(const char* content_type_string) ; int flickcurl_get_content_type_from_string(const char* content_type_string) ;
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_safety_level_label(int safety_level); const char* flickcurl_get_safety_level_label(int safety_level);
FLICKCURL_API FLICKCURL_API
int flickcurl_get_safety_level_from_string(const char* safety_level_string) ; int flickcurl_get_safety_level_from_string(const char* safety_level_string) ;
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_hidden_label(int hidden);
FLICKCURL_API
int flickcurl_get_hidden_from_string(const char* hidden_string);
FLICKCURL_API
int flickcurl_get_feed_format_info(int feed_format, const char** name_p, co nst char** label_p, const char** mime_type_p); int flickcurl_get_feed_format_info(int feed_format, const char** name_p, co nst char** label_p, const char** mime_type_p);
FLICKCURL_API FLICKCURL_API
int flickcurl_get_extras_format_info(int extras_format, const char** name_p , const char** label_p); int flickcurl_get_extras_format_info(int extras_format, const char** name_p , const char** label_p);
FLICKCURL_API FLICKCURL_API
int flickcurl_photos_list_params_init(flickcurl_photos_list_params* list_pa rams); int flickcurl_photos_list_params_init(flickcurl_photos_list_params* list_pa rams);
FLICKCURL_API FLICKCURL_API
int flickcurl_search_params_init(flickcurl_search_params* params); int flickcurl_search_params_init(flickcurl_search_params* params);
/** /**
* set_config_var_handler: * set_config_var_handler:
* @userdata: user data pointer * @userdata: user data pointer
* @key: key * @key: key
* @value: value * @value: value
* *
* Handler to get variables returned from an 'INI' style configuration file * Handler to get variables returned from an 'INI' style configuration file
*/ */
typedef void (*set_config_var_handler)(void* userdata, const char* key, con st char* value); typedef void (*set_config_var_handler)(void* userdata, const char* key, con st char* value);
FLICKCURL_API FLICKCURL_DEPRECATED
int read_ini_config(const char* filename, const char* section, void* user_d
ata, set_config_var_handler handler);
FLICKCURL_API
int flickcurl_config_read_ini(flickcurl* fc, const char* filename, const ch
ar* section, void* user_data, set_config_var_handler handler);
FLICKCURL_API
void flickcurl_config_var_handler(void* userdata, const char* key, const ch
ar* value);
FLICKCURL_API FLICKCURL_API
int read_ini_config(const char* filename, const char* application, void* us er_data, set_config_var_handler handler); int flickcurl_config_write_ini(flickcurl *fc, const char* filename, const c har* section);
/* Flickr API calls */ /* Flickr API calls */
/* flickr.activity */ /* flickr.activity */
FLICKCURL_API FLICKCURL_API
flickcurl_activity** flickcurl_activity_userComments(flickcurl* fc, int per _page, int page); flickcurl_activity** flickcurl_activity_userComments(flickcurl* fc, int per _page, int page);
FLICKCURL_API FLICKCURL_API
flickcurl_activity** flickcurl_activity_userPhotos(flickcurl* fc, const cha r* timeframe, int per_page, int page); flickcurl_activity** flickcurl_activity_userPhotos(flickcurl* fc, const cha r* timeframe, int per_page, int page);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_activities(flickcurl_activity **activities_object); void flickcurl_free_activities(flickcurl_activity **activities_object);
/* flickr.auth */ /* flickr.auth */
FLICKCURL_API FLICKCURL_API
char* flickcurl_auth_checkToken(flickcurl* fc, const char* token); char* flickcurl_auth_checkToken(flickcurl* fc, const char* token);
FLICKCURL_API FLICKCURL_API
char* flickcurl_auth_getFrob(flickcurl* fc); char* flickcurl_auth_getFrob(flickcurl* fc);
FLICKCURL_API FLICKCURL_API
char* flickcurl_auth_getFullToken(flickcurl* fc, const char* frob); char* flickcurl_auth_getFullToken(flickcurl* fc, const char* frob);
FLICKCURL_API FLICKCURL_API
char* flickcurl_auth_getToken(flickcurl* fc, const char* frob); char* flickcurl_auth_getToken(flickcurl* fc, const char* frob);
FLICKCURL_API
int flickcurl_auth_oauth_getAccessToken(flickcurl* fc);
/* 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_API
flickcurl_blog_service** flickcurl_blogs_getServices(flickcurl* fc); flickcurl_blog_service** flickcurl_blogs_getServices(flickcurl* fc);
skipping to change at line 1781 skipping to change at line 1806
/* 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
flickcurl_photos_list** flickcurl_favorites_getContext(flickcurl* fc, const
char* photo_id, const char* user_id, int num_prev, int num_next, const cha
r* extras);
FLICKCURL_API
flickcurl_photo** flickcurl_favorites_getList(flickcurl* fc, const char* us er_id, const char* extras, int per_page, int page); flickcurl_photo** flickcurl_favorites_getList(flickcurl* fc, const char* us er_id, const char* extras, int per_page, int page);
FLICKCURL_API FLICKCURL_API
flickcurl_photos_list* flickcurl_favorites_getList_params(flickcurl* fc, co nst char* user_id, flickcurl_photos_list_params* list_params); flickcurl_photos_list* flickcurl_favorites_getList_params(flickcurl* fc, co nst char* user_id, flickcurl_photos_list_params* list_params);
FLICKCURL_API FLICKCURL_API
flickcurl_photo** flickcurl_favorites_getPublicList(flickcurl* fc, const ch ar* user_id, const char* extras, int per_page, int page); flickcurl_photo** flickcurl_favorites_getPublicList(flickcurl* fc, const ch ar* user_id, const char* extras, int per_page, int page);
FLICKCURL_API FLICKCURL_API
flickcurl_photos_list* flickcurl_favorites_getPublicList_params(flickcurl* fc, const char* user_id, flickcurl_photos_list_params* list_params); flickcurl_photos_list* flickcurl_favorites_getPublicList_params(flickcurl* fc, const char* user_id, flickcurl_photos_list_params* list_params);
FLICKCURL_API FLICKCURL_API
int flickcurl_favorites_remove(flickcurl* fc, const char* photo_id); int flickcurl_favorites_remove(flickcurl* fc, const char* photo_id);
 End of changes. 11 change blocks. 
1 lines changed or deleted 33 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/