[frogr] Renamed async methods from flicksoup to omit the '_async' suffix.
- From: Mario Sanchez Prada <msanchez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [frogr] Renamed async methods from flicksoup to omit the '_async' suffix.
- Date: Fri, 19 Oct 2012 14:28:16 +0000 (UTC)
commit 5b87dc46c4fc752dc41f42ae6331c053e2b75f6d
Author: Mario Sanchez Prada <msanchez gnome org>
Date: Tue Oct 16 16:23:53 2012 +0200
Renamed async methods from flicksoup to omit the '_async' suffix.
No need to do this if they are always asynchronous. Updated callers.
src/examples/example.c | 151 +++++++++++++++++++++----------------------
src/flicksoup/fsp-session.c | 96 ++++++++++++++--------------
src/flicksoup/fsp-session.h | 32 +++++-----
src/frogr-controller.c | 122 +++++++++++++++++-----------------
4 files changed, 198 insertions(+), 203 deletions(-)
---
diff --git a/src/examples/example.c b/src/examples/example.c
index 5f7aabf..7c324b7 100644
--- a/src/examples/example.c
+++ b/src/examples/example.c
@@ -91,27 +91,27 @@ upload_cb (GObject *object,
{
/* Continue setting a license for the picture */
g_print ("Setting license for photo %s...\n", uploaded_photo_id);
- fsp_session_set_license_async (session, uploaded_photo_id,
- FSP_LICENSE_AT_NC_ND, NULL,
- set_license_cb, NULL);
+ fsp_session_set_license (session, uploaded_photo_id,
+ FSP_LICENSE_AT_NC_ND, NULL,
+ set_license_cb, NULL);
}
else if (source_func == photoset_created_cb)
{
/* Continue adding the picture to the photoset */
g_print ("Adding picture to photoset...\n");
- fsp_session_add_to_photoset_async (session,
- uploaded_photo_id,
- created_photoset_id,
- NULL, added_to_photoset_cb, NULL);
+ fsp_session_add_to_photoset (session,
+ uploaded_photo_id,
+ created_photoset_id,
+ NULL, added_to_photoset_cb, NULL);
}
else if (source_func == get_groups_cb)
{
/* Continue adding the picture to the group */
g_print ("Adding picture to group...\n");
- fsp_session_add_to_group_async (session,
- uploaded_photo_id,
- first_group_id,
- NULL, added_to_group_cb, NULL);
+ fsp_session_add_to_group (session,
+ uploaded_photo_id,
+ first_group_id,
+ NULL, added_to_group_cb, NULL);
}
}
}
@@ -182,19 +182,19 @@ get_groups_cb (GObject *object,
/* Continue adding a picture to the group, but first upload a new one */
g_print ("Uploading a new picture to be added to the group...");
- fsp_session_upload_async (session,
- test_photo_path,
- "Yet another title",
- "Yet another description ",
- "yet some other tags",
- FSP_VISIBILITY_NO,
- FSP_VISIBILITY_YES,
- FSP_VISIBILITY_NONE,
- FSP_SAFETY_LEVEL_NONE,
- FSP_CONTENT_TYPE_PHOTO,
- FSP_SEARCH_SCOPE_NONE,
- NULL, upload_cb,
- (gpointer) get_groups_cb);
+ fsp_session_upload (session,
+ test_photo_path,
+ "Yet another title",
+ "Yet another description ",
+ "yet some other tags",
+ FSP_VISIBILITY_NO,
+ FSP_VISIBILITY_YES,
+ FSP_VISIBILITY_NONE,
+ FSP_SAFETY_LEVEL_NONE,
+ FSP_CONTENT_TYPE_PHOTO,
+ FSP_SEARCH_SCOPE_NONE,
+ NULL, upload_cb,
+ (gpointer) get_groups_cb);
g_slist_free (groups_list);
}
@@ -226,8 +226,8 @@ added_to_photoset_cb (GObject *object,
/* Continue getting the list of groups */
g_print ("Getting list of groups...\n");
- fsp_session_get_groups_async (session, NULL,
- get_groups_cb, NULL);
+ fsp_session_get_groups (session, NULL,
+ get_groups_cb, NULL);
}
}
@@ -255,19 +255,19 @@ photoset_created_cb (GObject *object,
/* Continue adding a picture to the photoset, but first upload a new one */
g_print ("Uploading a new picture to be added to the photoset...");
- fsp_session_upload_async (session,
- test_photo_path,
- "Yet another title",
- "Yet another description ",
- "yet some other tags",
- FSP_VISIBILITY_NO,
- FSP_VISIBILITY_YES,
- FSP_VISIBILITY_NONE,
- FSP_SAFETY_LEVEL_NONE,
- FSP_CONTENT_TYPE_PHOTO,
- FSP_SEARCH_SCOPE_NONE,
- NULL, upload_cb,
- (gpointer) photoset_created_cb);
+ fsp_session_upload (session,
+ test_photo_path,
+ "Yet another title",
+ "Yet another description ",
+ "yet some other tags",
+ FSP_VISIBILITY_NO,
+ FSP_VISIBILITY_YES,
+ FSP_VISIBILITY_NONE,
+ FSP_SAFETY_LEVEL_NONE,
+ FSP_CONTENT_TYPE_PHOTO,
+ FSP_SEARCH_SCOPE_NONE,
+ NULL, upload_cb,
+ (gpointer) photoset_created_cb);
}
}
@@ -312,11 +312,11 @@ get_photosets_cb (GObject *object,
/* Continue creating a new photoset */
g_print ("Creatine a new photoset...\n");
- fsp_session_create_photoset_async (session,
- "Photoset's title",
- "Photoset's description\nasdasda",
- uploaded_photo_id,
- NULL, photoset_created_cb, NULL);
+ fsp_session_create_photoset (session,
+ "Photoset's title",
+ "Photoset's description\nasdasda",
+ uploaded_photo_id,
+ NULL, photoset_created_cb, NULL);
g_slist_free (photosets_list);
}
}
@@ -367,8 +367,7 @@ photo_get_info_cb (GObject *object,
/* Continue getting the list of photosets */
g_print ("Getting list of photosets...\n");
- fsp_session_get_photosets_async (session, NULL,
- get_photosets_cb, NULL);
+ fsp_session_get_photosets (session, NULL, get_photosets_cb, NULL);
fsp_data_free (FSP_DATA (photo_info));
}
@@ -402,8 +401,8 @@ get_location_cb (GObject *object,
/* Continue getting info about the picture */
g_print ("Getting info for photo %s...\n", uploaded_photo_id);
- fsp_session_get_info_async (session, uploaded_photo_id, NULL,
- photo_get_info_cb, NULL);
+ fsp_session_get_info (session, uploaded_photo_id, NULL,
+ photo_get_info_cb, NULL);
fsp_data_free (FSP_DATA (location));
}
@@ -435,8 +434,8 @@ set_location_cb (GObject *object,
/* Continue getting the location for the picture (should match) */
g_print ("Getting location for photo %s...\n", uploaded_photo_id);
- fsp_session_get_location_async (session, uploaded_photo_id, NULL,
- get_location_cb, NULL);
+ fsp_session_get_location (session, uploaded_photo_id, NULL,
+ get_location_cb, NULL);
}
}
@@ -478,10 +477,8 @@ set_license_cb (GObject *object,
location->longitude,
location->accuracy);
- fsp_session_set_location_async (session, uploaded_photo_id,
- location, NULL,
- set_location_cb, NULL);
-
+ fsp_session_set_location (session, uploaded_photo_id, location,
+ NULL, set_location_cb, NULL);
fsp_data_free (FSP_DATA (location));
}
}
@@ -521,23 +518,23 @@ get_tags_list_cb (GObject *object, GAsyncResult *res, gpointer unused)
/* Continue uploading a picture */
g_print ("Uploading a picture...\n");
- fsp_session_upload_async (session,
- test_photo_path,
- "title with spaces and wÃÃrd characters!",
- "description with\nmultiple lines",
- "ÃÃÃÃu "
- "ÃÃ*+[]{} "
- "qwerty "
- "!Â$%&/(@#~^*+ "
- "\"Tag With Spaces\"",
- FSP_VISIBILITY_NO,
- FSP_VISIBILITY_YES,
- FSP_VISIBILITY_NONE,
- FSP_SAFETY_LEVEL_NONE,
- FSP_CONTENT_TYPE_PHOTO,
- FSP_SEARCH_SCOPE_NONE,
- NULL, upload_cb,
- (gpointer) get_tags_list_cb);
+ fsp_session_upload (session,
+ test_photo_path,
+ "title with spaces and wÃÃrd characters!",
+ "description with\nmultiple lines",
+ "ÃÃÃÃu "
+ "ÃÃ*+[]{} "
+ "qwerty "
+ "!Â$%&/(@#~^*+ "
+ "\"Tag With Spaces\"",
+ FSP_VISIBILITY_NO,
+ FSP_VISIBILITY_YES,
+ FSP_VISIBILITY_NONE,
+ FSP_SAFETY_LEVEL_NONE,
+ FSP_CONTENT_TYPE_PHOTO,
+ FSP_SEARCH_SCOPE_NONE,
+ NULL, upload_cb,
+ (gpointer) get_tags_list_cb);
}
}
@@ -575,9 +572,7 @@ get_upload_status_cb (GObject *object, GAsyncResult *res, gpointer unused)
/* Continue getting the list of tags */
g_print ("Getting the list of tags...\n");
- fsp_session_get_tags_list_async (session, NULL,
- get_tags_list_cb, NULL);
-
+ fsp_session_get_tags_list (session, NULL, get_tags_list_cb, NULL);
fsp_data_free (FSP_DATA (upload_status));
}
}
@@ -612,7 +607,7 @@ check_auth_info_cb (GObject *object, GAsyncResult *res, gpointer unused)
/* Continue getting the upload status */
g_print ("Retrieving upload status...\n");
- fsp_session_get_upload_status_async (session, NULL, get_upload_status_cb, NULL);
+ fsp_session_get_upload_status (session, NULL, get_upload_status_cb, NULL);
fsp_data_free (FSP_DATA (auth_token));
}
@@ -651,7 +646,7 @@ complete_auth_cb (GObject *object,
/* Continue checking the authorization information */
g_print ("Checking the authorization information...\n");
- fsp_session_check_auth_info_async (session, NULL, check_auth_info_cb, NULL);
+ fsp_session_check_auth_info (session, NULL, check_auth_info_cb, NULL);
fsp_data_free (FSP_DATA (auth_token));
}
@@ -686,7 +681,7 @@ get_auth_url_cb (GObject *object,
/* Continue finishing the authorization */
g_print ("Finishing authorization...\n");
- fsp_session_complete_auth_async (session, verifier, NULL, complete_auth_cb, NULL);
+ fsp_session_complete_auth (session, verifier, NULL, complete_auth_cb, NULL);
g_free (verifier);
}
else
@@ -712,7 +707,7 @@ do_work (gpointer unused)
g_print ("\tAPI key: %s\n\tSecret: %s\n\n", api_key, secret);
g_print ("Getting authorization URL...\n");
- fsp_session_get_auth_url_async (session, NULL, get_auth_url_cb, NULL);
+ fsp_session_get_auth_url (session, NULL, get_auth_url_cb, NULL);
return FALSE;
}
diff --git a/src/flicksoup/fsp-session.c b/src/flicksoup/fsp-session.c
index a1b06c4..8aebe67 100644
--- a/src/flicksoup/fsp-session.c
+++ b/src/flicksoup/fsp-session.c
@@ -1776,7 +1776,7 @@ fsp_session_set_token_secret (FspSession *self,
/* Get authorization URL */
void
-fsp_session_get_auth_url_async (FspSession *self,
+fsp_session_get_auth_url (FspSession *self,
GCancellable *c,
GAsyncReadyCallback cb,
gpointer data)
@@ -1798,7 +1798,7 @@ fsp_session_get_auth_url_async (FspSession *self,
/* Perform the async request */
_perform_async_request (self->priv->soup_session, url,
_get_request_token_session_cb, G_OBJECT (self),
- c, cb, fsp_session_get_auth_url_async, data);
+ c, cb, fsp_session_get_auth_url, data);
g_free (url);
}
@@ -1816,7 +1816,7 @@ fsp_session_get_auth_url_finish (FspSession *self,
auth_token =
FSP_DATA_AUTH_TOKEN (_finish_async_request (G_OBJECT (self), res,
- fsp_session_get_auth_url_async,
+ fsp_session_get_auth_url,
error));
/* Build the auth URL from the request token */
if (auth_token != NULL)
@@ -1838,7 +1838,7 @@ fsp_session_get_auth_url_finish (FspSession *self,
/* Complete authorization */
void
-fsp_session_complete_auth_async (FspSession *self,
+fsp_session_complete_auth (FspSession *self,
const gchar *code,
GCancellable *c,
GAsyncReadyCallback cb,
@@ -1864,7 +1864,7 @@ fsp_session_complete_auth_async (FspSession *self,
/* Perform the async request */
_perform_async_request (priv->soup_session, url,
_get_access_token_soup_session_cb, G_OBJECT (self),
- c, cb, fsp_session_complete_auth_async, data);
+ c, cb, fsp_session_complete_auth, data);
g_free (url);
}
@@ -1893,7 +1893,7 @@ fsp_session_complete_auth_finish (FspSession *self,
auth_token =
FSP_DATA_AUTH_TOKEN (_finish_async_request (G_OBJECT (self), res,
- fsp_session_complete_auth_async,
+ fsp_session_complete_auth,
error));
/* Complete the authorization saving the token if present */
@@ -1907,7 +1907,7 @@ fsp_session_complete_auth_finish (FspSession *self,
}
void
-fsp_session_exchange_token_async (FspSession *self,
+fsp_session_exchange_token (FspSession *self,
GCancellable *c,
GAsyncReadyCallback cb,
gpointer data)
@@ -1932,7 +1932,7 @@ fsp_session_exchange_token_async (FspSession *self,
/* Perform the async request */
_perform_async_request (priv->soup_session, url,
_exchange_token_soup_session_cb, G_OBJECT (self),
- c, cb, fsp_session_exchange_token_async, data);
+ c, cb, fsp_session_exchange_token, data);
g_free (url);
}
@@ -1961,7 +1961,7 @@ fsp_session_exchange_token_finish (FspSession *self,
auth_token =
FSP_DATA_AUTH_TOKEN (_finish_async_request (G_OBJECT (self), res,
- fsp_session_exchange_token_async,
+ fsp_session_exchange_token,
error));
if (auth_token != NULL)
{
@@ -1972,7 +1972,7 @@ fsp_session_exchange_token_finish (FspSession *self,
}
void
-fsp_session_check_auth_info_async (FspSession *self,
+fsp_session_check_auth_info (FspSession *self,
GCancellable *c,
GAsyncReadyCallback cb,
gpointer data)
@@ -1997,7 +1997,7 @@ fsp_session_check_auth_info_async (FspSession *self,
/* Perform the async request */
_perform_async_request (priv->soup_session, url,
_check_token_soup_session_cb, G_OBJECT (self),
- c, cb, fsp_session_check_auth_info_async, data);
+ c, cb, fsp_session_check_auth_info, data);
g_free (url);
}
@@ -2024,13 +2024,13 @@ fsp_session_check_auth_info_finish (FspSession *self,
auth_token =
FSP_DATA_AUTH_TOKEN (_finish_async_request (G_OBJECT (self), res,
- fsp_session_check_auth_info_async,
+ fsp_session_check_auth_info,
error));
return auth_token;
}
void
-fsp_session_get_upload_status_async (FspSession *self,
+fsp_session_get_upload_status (FspSession *self,
GCancellable *c,
GAsyncReadyCallback cb,
gpointer data)
@@ -2055,7 +2055,7 @@ fsp_session_get_upload_status_async (FspSession *self,
/* Perform the async request */
_perform_async_request (priv->soup_session, url,
_get_upload_status_soup_session_cb, G_OBJECT (self),
- c, cb, fsp_session_get_upload_status_async, data);
+ c, cb, fsp_session_get_upload_status, data);
g_free (url);
}
@@ -2082,13 +2082,13 @@ fsp_session_get_upload_status_finish (FspSession *self,
upload_status =
FSP_DATA_UPLOAD_STATUS (_finish_async_request (G_OBJECT (self), res,
- fsp_session_get_upload_status_async,
+ fsp_session_get_upload_status,
error));
return upload_status;
}
void
-fsp_session_upload_async (FspSession *self,
+fsp_session_upload (FspSession *self,
const gchar *fileuri,
const gchar *title,
const gchar *description,
@@ -2153,7 +2153,7 @@ fsp_session_upload_async (FspSession *self,
ard_clos->soup_message = NULL;
ard_clos->cancellable = cancellable;
ard_clos->callback = callback;
- ard_clos->source_tag = fsp_session_upload_async;
+ ard_clos->source_tag = fsp_session_upload;
ard_clos->data = data;
/* Save important data for the upload process itself */
@@ -2175,12 +2175,12 @@ fsp_session_upload_finish (FspSession *self,
g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
return (gchar*) _finish_async_request (G_OBJECT (self), res,
- fsp_session_upload_async,
+ fsp_session_upload,
error);
}
void
-fsp_session_get_info_async (FspSession *self,
+fsp_session_get_info (FspSession *self,
const gchar *photo_id,
GCancellable *cancellable,
GAsyncReadyCallback callback,
@@ -2204,7 +2204,7 @@ fsp_session_get_info_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_photo_get_info_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_get_info_async, data);
+ cancellable, callback, fsp_session_get_info, data);
g_free (url);
}
@@ -2221,13 +2221,13 @@ fsp_session_get_info_finish (FspSession *self,
photo_info =
FSP_DATA_PHOTO_INFO (_finish_async_request (G_OBJECT (self), res,
- fsp_session_get_info_async,
+ fsp_session_get_info,
error));
return photo_info;
}
void
-fsp_session_get_photosets_async (FspSession *self,
+fsp_session_get_photosets (FspSession *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer data)
@@ -2248,7 +2248,7 @@ fsp_session_get_photosets_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_get_photosets_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_get_photosets_async, data);
+ cancellable, callback, fsp_session_get_photosets, data);
g_free (url);
}
@@ -2262,12 +2262,12 @@ fsp_session_get_photosets_finish (FspSession *self,
g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
return (GSList*) _finish_async_request (G_OBJECT (self), res,
- fsp_session_get_photosets_async,
+ fsp_session_get_photosets,
error);
}
void
-fsp_session_add_to_photoset_async (FspSession *self,
+fsp_session_add_to_photoset (FspSession *self,
const gchar *photo_id,
const gchar *photoset_id,
GCancellable *cancellable,
@@ -2294,7 +2294,7 @@ fsp_session_add_to_photoset_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_add_to_photoset_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_add_to_photoset_async, data);
+ cancellable, callback, fsp_session_add_to_photoset, data);
g_free (url);
}
@@ -2310,13 +2310,13 @@ fsp_session_add_to_photoset_finish (FspSession *self,
g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
result = _finish_async_request (G_OBJECT (self), res,
- fsp_session_add_to_photoset_async, error);
+ fsp_session_add_to_photoset, error);
return result ? TRUE : FALSE;
}
void
-fsp_session_create_photoset_async (FspSession *self,
+fsp_session_create_photoset (FspSession *self,
const gchar *title,
const gchar *description,
const gchar *primary_photo_id,
@@ -2345,7 +2345,7 @@ fsp_session_create_photoset_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_create_photoset_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_create_photoset_async, data);
+ cancellable, callback, fsp_session_create_photoset, data);
g_free (url);
}
@@ -2362,13 +2362,13 @@ fsp_session_create_photoset_finish (FspSession *self,
photoset_id =
(gchar*) _finish_async_request (G_OBJECT (self), res,
- fsp_session_create_photoset_async,
+ fsp_session_create_photoset,
error);
return photoset_id;
}
void
-fsp_session_get_groups_async (FspSession *self,
+fsp_session_get_groups (FspSession *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer data)
@@ -2389,7 +2389,7 @@ fsp_session_get_groups_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_get_groups_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_get_groups_async, data);
+ cancellable, callback, fsp_session_get_groups, data);
g_free (url);
}
@@ -2403,12 +2403,12 @@ fsp_session_get_groups_finish (FspSession *self,
g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
return (GSList*) _finish_async_request (G_OBJECT (self), res,
- fsp_session_get_groups_async,
+ fsp_session_get_groups,
error);
}
void
-fsp_session_add_to_group_async (FspSession *self,
+fsp_session_add_to_group (FspSession *self,
const gchar *photo_id,
const gchar *group_id,
GCancellable *cancellable,
@@ -2435,7 +2435,7 @@ fsp_session_add_to_group_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_add_to_group_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_add_to_group_async, data);
+ cancellable, callback, fsp_session_add_to_group, data);
g_free (url);
}
@@ -2451,13 +2451,13 @@ fsp_session_add_to_group_finish (FspSession *self,
g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
result = _finish_async_request (G_OBJECT (self), res,
- fsp_session_add_to_group_async, error);
+ fsp_session_add_to_group, error);
return result ? TRUE : FALSE;
}
void
-fsp_session_get_tags_list_async (FspSession *self,
+fsp_session_get_tags_list (FspSession *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer data)
@@ -2478,7 +2478,7 @@ fsp_session_get_tags_list_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_get_tags_list_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_get_tags_list_async, data);
+ cancellable, callback, fsp_session_get_tags_list, data);
g_free (url);
}
@@ -2492,11 +2492,11 @@ fsp_session_get_tags_list_finish (FspSession *self,
g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
return (GSList*) _finish_async_request (G_OBJECT (self), res,
- fsp_session_get_tags_list_async, error);
+ fsp_session_get_tags_list, error);
}
void
-fsp_session_set_license_async (FspSession *self,
+fsp_session_set_license (FspSession *self,
const gchar *photo_id,
FspLicense license,
GCancellable *cancellable,
@@ -2525,7 +2525,7 @@ fsp_session_set_license_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_set_license_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_set_license_async, data);
+ cancellable, callback, fsp_session_set_license, data);
g_free (url);
}
@@ -2541,13 +2541,13 @@ fsp_session_set_license_finish (FspSession *self,
g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
result = _finish_async_request (G_OBJECT (self), res,
- fsp_session_set_license_async, error);
+ fsp_session_set_license, error);
return result ? TRUE : FALSE;
}
void
-fsp_session_set_location_async (FspSession *self,
+fsp_session_set_location (FspSession *self,
const gchar *photo_id,
FspDataLocation *location,
GCancellable *cancellable,
@@ -2591,7 +2591,7 @@ fsp_session_set_location_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_set_location_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_set_location_async, data);
+ cancellable, callback, fsp_session_set_location, data);
g_free (url);
}
@@ -2607,13 +2607,13 @@ fsp_session_set_location_finish (FspSession *self,
g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
result = _finish_async_request (G_OBJECT (self), res,
- fsp_session_set_location_async, error);
+ fsp_session_set_location, error);
return result ? TRUE : FALSE;
}
void
-fsp_session_get_location_async (FspSession *self,
+fsp_session_get_location (FspSession *self,
const gchar *photo_id,
GCancellable *cancellable,
GAsyncReadyCallback callback,
@@ -2636,7 +2636,7 @@ fsp_session_get_location_async (FspSession *self,
soup_session = _get_soup_session (self);
_perform_async_request (soup_session, url,
_get_location_soup_session_cb, G_OBJECT (self),
- cancellable, callback, fsp_session_get_location_async, data);
+ cancellable, callback, fsp_session_get_location, data);
g_free (url);
}
@@ -2653,7 +2653,7 @@ fsp_session_get_location_finish (FspSession *self,
location =
FSP_DATA_LOCATION (_finish_async_request (G_OBJECT (self), res,
- fsp_session_get_location_async,
+ fsp_session_get_location,
error));
return location;
}
diff --git a/src/flicksoup/fsp-session.h b/src/flicksoup/fsp-session.h
index 6d997ca..298fd91 100644
--- a/src/flicksoup/fsp-session.h
+++ b/src/flicksoup/fsp-session.h
@@ -90,7 +90,7 @@ void
fsp_session_set_token_secret (FspSession *self,
const gchar *token_secret);
void
-fsp_session_get_auth_url_async (FspSession *self,
+fsp_session_get_auth_url (FspSession *self,
GCancellable *c,
GAsyncReadyCallback cb,
gpointer data);
@@ -100,7 +100,7 @@ fsp_session_get_auth_url_finish (FspSession *self,
GError **error);
void
-fsp_session_complete_auth_async (FspSession *self,
+fsp_session_complete_auth (FspSession *self,
const gchar *code,
GCancellable *c,
GAsyncReadyCallback cb,
@@ -111,7 +111,7 @@ fsp_session_complete_auth_finish (FspSession *self,
GError **error);
void
-fsp_session_exchange_token_async (FspSession *self,
+fsp_session_exchange_token (FspSession *self,
GCancellable *c,
GAsyncReadyCallback cb,
gpointer data);
@@ -121,7 +121,7 @@ fsp_session_exchange_token_finish (FspSession *self,
GError **error);
void
-fsp_session_check_auth_info_async (FspSession *self,
+fsp_session_check_auth_info (FspSession *self,
GCancellable *c,
GAsyncReadyCallback cb,
gpointer data);
@@ -131,7 +131,7 @@ fsp_session_check_auth_info_finish (FspSession *self,
GError **error);
void
-fsp_session_get_upload_status_async (FspSession *self,
+fsp_session_get_upload_status (FspSession *self,
GCancellable *c,
GAsyncReadyCallback cb,
gpointer data);
@@ -141,7 +141,7 @@ fsp_session_get_upload_status_finish (FspSession *self,
GError **error);
void
-fsp_session_upload_async (FspSession *self,
+fsp_session_upload (FspSession *self,
const gchar *fileuri,
const gchar *title,
const gchar *description,
@@ -162,7 +162,7 @@ fsp_session_upload_finish (FspSession *self,
GError **error);
void
-fsp_session_get_info_async (FspSession *self,
+fsp_session_get_info (FspSession *self,
const gchar *photo_id,
GCancellable *cancellable,
GAsyncReadyCallback callback,
@@ -173,7 +173,7 @@ fsp_session_get_info_finish (FspSession *self,
GAsyncResult *res,
GError **error);
void
-fsp_session_get_photosets_async (FspSession *self,
+fsp_session_get_photosets (FspSession *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer data);
@@ -184,7 +184,7 @@ fsp_session_get_photosets_finish (FspSession *self,
GError **error);
void
-fsp_session_add_to_photoset_async (FspSession *self,
+fsp_session_add_to_photoset (FspSession *self,
const gchar *photo_id,
const gchar *photoset_id,
GCancellable *cancellable,
@@ -196,7 +196,7 @@ fsp_session_add_to_photoset_finish (FspSession *self,
GAsyncResult *res,
GError **error);
void
-fsp_session_create_photoset_async (FspSession *self,
+fsp_session_create_photoset (FspSession *self,
const gchar *title,
const gchar *description,
const gchar *primary_photo_id,
@@ -210,7 +210,7 @@ fsp_session_create_photoset_finish (FspSession *self,
GError **error);
void
-fsp_session_get_groups_async (FspSession *self,
+fsp_session_get_groups (FspSession *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer data);
@@ -221,7 +221,7 @@ fsp_session_get_groups_finish (FspSession *self,
GError **error);
void
-fsp_session_add_to_group_async (FspSession *self,
+fsp_session_add_to_group (FspSession *self,
const gchar *photo_id,
const gchar *group_id,
GCancellable *cancellable,
@@ -234,7 +234,7 @@ fsp_session_add_to_group_finish (FspSession *self,
GError **error);
void
-fsp_session_get_tags_list_async (FspSession *self,
+fsp_session_get_tags_list (FspSession *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer data);
@@ -245,7 +245,7 @@ fsp_session_get_tags_list_finish (FspSession *self,
GError **error);
void
-fsp_session_set_license_async (FspSession *self,
+fsp_session_set_license (FspSession *self,
const gchar *photo_id,
FspLicense license,
GCancellable *cancellable,
@@ -258,7 +258,7 @@ fsp_session_set_license_finish (FspSession *self,
GError **error);
void
-fsp_session_set_location_async (FspSession *self,
+fsp_session_set_location (FspSession *self,
const gchar *photo_id,
FspDataLocation *location,
GCancellable *cancellable,
@@ -271,7 +271,7 @@ fsp_session_set_location_finish (FspSession *self,
GError **error);
void
-fsp_session_get_location_async (FspSession *self,
+fsp_session_get_location (FspSession *self,
const gchar *photo_id,
GCancellable *cancellable,
GAsyncReadyCallback callback,
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index d231a8d..b488972 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -637,18 +637,18 @@ _upload_picture (FrogrController *self, FrogrPicture *picture,
self);
_enable_cancellable (self, TRUE);
- fsp_session_upload_async (priv->session,
- frogr_picture_get_fileuri (picture),
- frogr_picture_get_title (picture),
- frogr_picture_get_description (picture),
- frogr_picture_get_tags (picture),
- public_visibility,
- family_visibility,
- friend_visibility,
- safety_level,
- content_type,
- search_scope,
- priv->last_cancellable, _upload_picture_cb, up_st);
+ fsp_session_upload (priv->session,
+ frogr_picture_get_fileuri (picture),
+ frogr_picture_get_title (picture),
+ frogr_picture_get_description (picture),
+ frogr_picture_get_tags (picture),
+ public_visibility,
+ family_visibility,
+ friend_visibility,
+ safety_level,
+ content_type,
+ search_scope,
+ priv->last_cancellable, _upload_picture_cb, up_st);
}
static void
@@ -697,12 +697,12 @@ _upload_picture_cb (GObject *object, GAsyncResult *res, gpointer data)
{
priv->setting_license = TRUE;
_notify_setting_license (controller, picture);
- fsp_session_set_license_async (session,
- frogr_picture_get_id (picture),
- license,
- priv->last_cancellable,
- _set_license_cb,
- up_st);
+ fsp_session_set_license (session,
+ frogr_picture_get_id (picture),
+ license,
+ priv->last_cancellable,
+ _set_license_cb,
+ up_st);
}
if (frogr_picture_send_location (picture)
@@ -809,12 +809,12 @@ _set_location_on_idle (gpointer data)
data_location->longitude = frogr_location_get_longitude (location);
_notify_setting_location (controller, picture);
- fsp_session_set_location_async (priv->session,
- frogr_picture_get_id (picture),
- data_location,
- priv->last_cancellable,
- _set_location_cb,
- up_st);
+ fsp_session_set_location (priv->session,
+ frogr_picture_get_id (picture),
+ data_location,
+ priv->last_cancellable,
+ _set_location_cb,
+ up_st);
fsp_data_free (FSP_DATA (data_location));
@@ -866,24 +866,24 @@ _create_set_or_add_picture (FrogrController *self,
{
/* Set with ID: Add picture to it */
_notify_adding_to_set (self, picture, set);
- fsp_session_add_to_photoset_async (priv->session,
- frogr_picture_get_id (picture),
- frogr_photoset_get_id (set),
- priv->last_cancellable,
- _add_to_photoset_cb,
- up_st);
+ fsp_session_add_to_photoset (priv->session,
+ frogr_picture_get_id (picture),
+ frogr_photoset_get_id (set),
+ priv->last_cancellable,
+ _add_to_photoset_cb,
+ up_st);
}
else
{
/* Set with ID: Create set aliong with this picture */
_notify_creating_set (self, picture, set);
- fsp_session_create_photoset_async (priv->session,
- frogr_photoset_get_title (set),
- frogr_photoset_get_description (set),
- frogr_picture_get_id (picture),
- priv->last_cancellable,
- _create_photoset_cb,
- up_st);
+ fsp_session_create_photoset (priv->session,
+ frogr_photoset_get_title (set),
+ frogr_photoset_get_description (set),
+ frogr_picture_get_id (picture),
+ priv->last_cancellable,
+ _create_photoset_cb,
+ up_st);
}
return TRUE;
@@ -1031,12 +1031,12 @@ _add_to_group_cb (GObject *object, GAsyncResult *res, gpointer data)
up_st->groups = groups;
_notify_adding_to_group (controller, picture, group);
- fsp_session_add_to_group_async (session,
- frogr_picture_get_id (picture),
- frogr_group_get_id (group),
- priv->last_cancellable,
- _add_to_group_cb,
- up_st);
+ fsp_session_add_to_group (session,
+ frogr_picture_get_id (picture),
+ frogr_group_get_id (group),
+ priv->last_cancellable,
+ _add_to_group_cb,
+ up_st);
keep_going = TRUE;
}
}
@@ -1092,12 +1092,12 @@ _add_picture_to_groups_on_idle (gpointer data)
_notify_adding_to_group (controller, picture, group);
session = priv->session;
- fsp_session_add_to_group_async (session,
- frogr_picture_get_id (picture),
- frogr_group_get_id (group),
- priv->last_cancellable,
- _add_to_group_cb,
- up_st);
+ fsp_session_add_to_group (session,
+ frogr_picture_get_id (picture),
+ frogr_group_get_id (group),
+ priv->last_cancellable,
+ _add_to_group_cb,
+ up_st);
return FALSE;
}
@@ -1397,8 +1397,8 @@ _fetch_photosets (FrogrController *self)
priv->fetching_photosets = TRUE;
_enable_cancellable (self, TRUE);
- fsp_session_get_photosets_async (priv->session, priv->last_cancellable,
- _fetch_photosets_cb, self);
+ fsp_session_get_photosets (priv->session, priv->last_cancellable,
+ _fetch_photosets_cb, self);
}
static void
@@ -1478,8 +1478,8 @@ _fetch_groups (FrogrController *self)
priv->fetching_groups = TRUE;
_enable_cancellable (self, TRUE);
- fsp_session_get_groups_async (priv->session, priv->last_cancellable,
- _fetch_groups_cb, self);
+ fsp_session_get_groups (priv->session, priv->last_cancellable,
+ _fetch_groups_cb, self);
}
static void
@@ -1557,8 +1557,8 @@ static void _fetch_account_info (FrogrController *self)
priv->fetching_account_info = TRUE;
_enable_cancellable (self, FALSE);
- fsp_session_check_auth_info_async (priv->session, NULL,
- _fetch_account_info_cb, self);
+ fsp_session_check_auth_info (priv->session, NULL,
+ _fetch_account_info_cb, self);
}
static void
@@ -1628,8 +1628,8 @@ static void _fetch_account_extra_info (FrogrController *self)
priv->fetching_account_extra_info = TRUE;
_enable_cancellable (self, FALSE);
- fsp_session_get_upload_status_async (priv->session, NULL,
- _fetch_account_extra_info_cb, self);
+ fsp_session_get_upload_status (priv->session, NULL,
+ _fetch_account_extra_info_cb, self);
}
static void
@@ -1705,7 +1705,7 @@ _fetch_tags (FrogrController *self)
priv->fetching_tags = TRUE;
_enable_cancellable (self, TRUE);
- fsp_session_get_tags_list_async (priv->session, priv->last_cancellable, _fetch_tags_cb, self);
+ fsp_session_get_tags_list (priv->session, priv->last_cancellable, _fetch_tags_cb, self);
}
static void
@@ -2300,7 +2300,7 @@ frogr_controller_set_active_account (FrogrController *self,
{
priv->fetching_token_replacement = TRUE;
_enable_cancellable (self, FALSE);
- fsp_session_exchange_token_async (priv->session, priv->last_cancellable, _exchange_token_cb, self);
+ fsp_session_exchange_token (priv->session, priv->last_cancellable, _exchange_token_cb, self);
gdk_threads_add_timeout (DEFAULT_TIMEOUT, (GSourceFunc) _show_progress_on_idle, GINT_TO_POINTER (FETCHING_TOKEN_REPLACEMENT));
/* Make sure we show proper feedback if connection is too slow */
@@ -2585,7 +2585,7 @@ frogr_controller_open_auth_url (FrogrController *self)
priv->fetching_auth_url = TRUE;
_enable_cancellable (self, TRUE);
- fsp_session_get_auth_url_async (priv->session, priv->last_cancellable, _get_auth_url_cb, self);
+ fsp_session_get_auth_url (priv->session, priv->last_cancellable, _get_auth_url_cb, self);
gdk_threads_add_timeout (DEFAULT_TIMEOUT, (GSourceFunc) _show_progress_on_idle, GINT_TO_POINTER (FETCHING_AUTH_URL));
/* Make sure we show proper feedback if connection is too slow */
@@ -2602,7 +2602,7 @@ frogr_controller_complete_auth (FrogrController *self, const gchar *verification
priv->fetching_auth_token = TRUE;
_enable_cancellable (self, TRUE);
- fsp_session_complete_auth_async (priv->session, verification_code, priv->last_cancellable, _complete_auth_cb, self);
+ fsp_session_complete_auth (priv->session, verification_code, priv->last_cancellable, _complete_auth_cb, self);
gdk_threads_add_timeout (DEFAULT_TIMEOUT, (GSourceFunc) _show_progress_on_idle, GINT_TO_POINTER (FETCHING_AUTH_TOKEN));
/* Make sure we show proper feedback if connection is too slow */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
