[discident-glib] lib: Rename sync functions to _sync()

[Bastien Nocera <hadess src gnome org>]

commit 7aad5b397f54a8a520ce9ad05f1a475a33dc100b
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Dec 3 21:48:14 2012 +0100

    lib: Rename sync functions to _sync()

 discident-glib/discident-ean-glib.c   |   18 +++++-----
 discident-glib/discident-ean-glib.h   |   20 ++++++------
 discident-glib/discident-glib.c       |   56 ++++++++++++++++----------------
 discident-glib/discident-glib.h       |   10 +++---
 discident-glib/discident-glib.symbols |   10 +++---
 discident-glib/test-diglib.c          |   22 ++++++------
 6 files changed, 68 insertions(+), 68 deletions(-)
---
diff --git a/discident-glib/discident-ean-glib.c b/discident-glib/discident-ean-glib.c
index 460c785..eb66705 100644
--- a/discident-glib/discident-ean-glib.c
+++ b/discident-glib/discident-ean-glib.c
@@ -133,7 +133,7 @@ parse_login_response (DiscidentEan *ean,
 }
 
 /**
- * discident_ean_login:
+ * discident_ean_login_sync:
  * @ean: a #DiscidentEan object representing a query
  * @error: a #GError
  *
@@ -142,8 +142,8 @@ parse_login_response (DiscidentEan *ean,
  * Returns: %TRUE on success. %FALSE on failure with @error set.
  **/
 gboolean
-discident_ean_login (DiscidentEan *ean,
-		     GError      **error)
+discident_ean_login_sync (DiscidentEan *ean,
+			  GError      **error)
 {
 	SoupSession *session;
 	SoupMessage *msg;
@@ -265,7 +265,7 @@ parse_lookup_response (const char *response,
 }
 
 /**
- * discident_ean_lookup:
+ * discident_ean_lookup_sync:
  * @ean: a #DiscidentEan object representing a query
  * @barcode: a string representing the barcode to lookup
  * @title: the return value for the title, or %NULL
@@ -278,11 +278,11 @@ parse_lookup_response (const char *response,
  * Returns: %TRUE on success. %FALSE on failure with @error set.
  **/
 gboolean
-discident_ean_lookup (DiscidentEan *ean,
-		      const char   *barcode,
-		      char        **title,
-		      char        **img_url,
-		      GError      **error)
+discident_ean_lookup_sync (DiscidentEan *ean,
+			   const char   *barcode,
+			   char        **title,
+			   char        **img_url,
+			   GError      **error)
 {
 	SoupSession *session;
 	SoupMessage *msg;
diff --git a/discident-glib/discident-ean-glib.h b/discident-glib/discident-ean-glib.h
index 2314555..2467756 100644
--- a/discident-glib/discident-ean-glib.h
+++ b/discident-glib/discident-ean-glib.h
@@ -57,16 +57,16 @@ typedef struct {
 	GObjectClass parent_class;
 } DiscidentEanClass;
 
-GType         discident_ean_get_type (void);
-DiscidentEan *discident_ean_new      (void);
-gboolean      discident_ean_login    (DiscidentEan *ean,
-				      GError      **error);
-
-gboolean       discident_ean_lookup (DiscidentEan *ean,
-				     const char   *barcode,
-				     char        **title,
-				     char        **img_url,
-				     GError      **error);
+GType         discident_ean_get_type     (void);
+DiscidentEan *discident_ean_new          (void);
+gboolean      discident_ean_login_sync   (DiscidentEan *ean,
+					  GError      **error);
+
+gboolean       discident_ean_lookup_sync (DiscidentEan *ean,
+					  const char   *barcode,
+					  char        **title,
+					  char        **img_url,
+					  GError      **error);
 
 G_END_DECLS
 
diff --git a/discident-glib/discident-glib.c b/discident-glib/discident-glib.c
index 1be9e31..50cc91c 100644
--- a/discident-glib/discident-glib.c
+++ b/discident-glib/discident-glib.c
@@ -155,19 +155,19 @@ discident_add_info_to_list (GList *list,
 }
 
 /**
- * discident_get_gtin_file:
+ * discident_get_gtin_file_sync:
  * @directory: a #GFile representing a directory
  * @error: a #GError.
  *
  * Return the GTIN of the DVD location at @directory. Note that this
- * function does blocking I/O. See discident_get_gtin_file_async()
+ * function does blocking I/O. See discident_get_gtin_file()
  * for a function that does not.
  *
  * Returns: a string containing the GTIN for the DVD or %NULL in case of errors.
  * Free the returned string with g_free() when done.
  **/
 char *
-discident_get_gtin_file (GFile *directory, GError **error)
+discident_get_gtin_file_sync (GFile *directory, GError **error)
 {
 	GFileEnumerator *e;
 	GFile *videodir;
@@ -348,7 +348,7 @@ on_videodir_enumerate_loaded (GObject      *source_object,
 }
 
 /**
- * discident_get_gtin_file_async:
+ * discident_get_gtin_file:
  * @directory: a #GFile representing a directory
  * @cancellable: optional #GCancellable object, %NULL to ignore.
  * @callback: a #GAsyncReadyCallback to call when the request is satisfied
@@ -361,10 +361,10 @@ on_videodir_enumerate_loaded (GObject      *source_object,
  * discident_get_gtin_file_finish() to get the result of the operation.
  **/
 void
-discident_get_gtin_file_async  (GFile               *directory,
-				GCancellable        *cancellable,
-				GAsyncReadyCallback  callback,
-				gpointer             user_data)
+discident_get_gtin_file  (GFile               *directory,
+			  GCancellable        *cancellable,
+			  GAsyncReadyCallback  callback,
+			  gpointer             user_data)
 {
 	GSimpleAsyncResult *simple;
 	GFile *video_ts_dir;
@@ -373,7 +373,7 @@ discident_get_gtin_file_async  (GFile               *directory,
 	simple = g_simple_async_result_new (G_OBJECT (directory),
 					    callback,
 					    user_data,
-					    discident_get_gtin_file_async);
+					    discident_get_gtin_file);
 
 	if (cancellable != NULL) {
 		g_object_set_data_full (G_OBJECT (simple), "cancellable",
@@ -404,7 +404,7 @@ discident_get_gtin_file_async  (GFile               *directory,
  * @error: a #GError.
  *
  * Finishes getting the GTIN for the DVD tree at @directory. See 
- * discident_get_gtin_file_async().
+ * discident_get_gtin_file().
  *
  * Returns: the GTIN for the DVD or %NULL in case of errors.
  * Free the returned string with g_free() when done.
@@ -417,7 +417,7 @@ discident_get_gtin_file_finish (GFile               *directory,
 	GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
 	char *ret;
 
-	g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == discident_get_gtin_file_async);
+	g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == discident_get_gtin_file);
 
 	ret = NULL;
 
@@ -506,25 +506,25 @@ discident_get_title_for_gtin (const char *gtin,
 }
 
 /**
- * discident_get_title:
+ * discident_get_title_sync:
  * @directory: a #GFile representing a directory
  * @error: a #GError.
  *
  * Returns the title of the DVD located at @directory. Note that this
- * function does blocking I/O. See discident_get_title_file_async()
+ * function does blocking I/O. See discident_get_title_file()
  * for a function that does not.
  *
  * Returns: a string containing the title or %NULL in case of errors.
  * Free the returned string with g_free() when done.
  **/
 char *
-discident_get_title (GFile   *directory,
-		     GError **error)
+discident_get_title_sync (GFile   *directory,
+			  GError **error)
 {
 	char *gtin;
 	char *title;
 
-	gtin = discident_get_gtin_file (directory, error);
+	gtin = discident_get_gtin_file_sync (directory, error);
 	if (gtin == NULL)
 		return NULL;
 
@@ -608,7 +608,7 @@ on_discident_got_gtin (GObject      *source_object,
 }
 
 /**
- * discident_get_title_file_async:
+ * discident_get_title_file:
  * @directory: a #GFile representing a directory
  * @cancellable: optional #GCancellable object, %NULL to ignore.
  * @callback: a #GAsyncReadyCallback to call when the request is satisfied
@@ -621,27 +621,27 @@ on_discident_got_gtin (GObject      *source_object,
  * discident_get_title_file_finish() to get the result of the operation.
  **/
 void
-discident_get_title_file_async (GFile               *directory,
-				GCancellable        *cancellable,
-				GAsyncReadyCallback  callback,
-				gpointer             user_data)
+discident_get_title_file (GFile               *directory,
+			  GCancellable        *cancellable,
+			  GAsyncReadyCallback  callback,
+			  gpointer             user_data)
 {
 	GSimpleAsyncResult *simple;
 
 	simple = g_simple_async_result_new (G_OBJECT (directory),
 					    callback,
 					    user_data,
-					    discident_get_title_file_async);
+					    discident_get_title_file);
 
 	if (cancellable != NULL) {
 		g_object_set_data_full (G_OBJECT (simple), "cancellable",
 					g_object_ref (cancellable), g_object_unref);
 	}
 
-	discident_get_gtin_file_async (directory,
-				       cancellable,
-				       on_discident_got_gtin,
-				       simple);
+	discident_get_gtin_file (directory,
+				 cancellable,
+				 on_discident_got_gtin,
+				 simple);
 }
 
 /**
@@ -650,7 +650,7 @@ discident_get_title_file_async (GFile               *directory,
  * @res: a #GAsyncResult.
  * @error: a #GError.
  *
- * Finishes a title get operation. See discident_get_title_file_async().
+ * Finishes a title get operation. See discident_get_title_file().
  *
  * Returns: a string containing the title or %NULL in case of errors.
  * Free the returned string with g_free() when done.
@@ -663,7 +663,7 @@ discident_get_title_file_finish (GFile               *directory,
 	GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
 	char *ret;
 
-	g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == discident_get_title_file_async);
+	g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == discident_get_title_file);
 
 	ret = NULL;
 
diff --git a/discident-glib/discident-glib.h b/discident-glib/discident-glib.h
index 91d5372..eb61635 100644
--- a/discident-glib/discident-glib.h
+++ b/discident-glib/discident-glib.h
@@ -28,9 +28,9 @@
 
 G_BEGIN_DECLS
 
-char *discident_get_gtin_file        (GFile   *directory,
+char *discident_get_gtin_file_sync   (GFile   *directory,
 				      GError **error);
-void  discident_get_gtin_file_async  (GFile               *directory,
+void  discident_get_gtin_file        (GFile               *directory,
 				      GCancellable        *cancellable,
 				      GAsyncReadyCallback  callback,
 				      gpointer             user_data);
@@ -38,9 +38,9 @@ char *discident_get_gtin_file_finish (GFile               *directory,
 				      GAsyncResult        *res,
 				      GError             **error);
 
-char *discident_get_title            (GFile   *directory,
-				      GError **error);
-void  discident_get_title_file_async  (GFile               *directory,
+char *discident_get_title_sync        (GFile   *directory,
+				       GError **error);
+void  discident_get_title_file        (GFile               *directory,
 				       GCancellable        *cancellable,
 				       GAsyncReadyCallback  callback,
 				       gpointer             user_data);
diff --git a/discident-glib/discident-glib.symbols b/discident-glib/discident-glib.symbols
index 7e0c03c..e3e91c1 100644
--- a/discident-glib/discident-glib.symbols
+++ b/discident-glib/discident-glib.symbols
@@ -1,13 +1,13 @@
+discident_get_gtin_file_sync
 discident_get_gtin_file
-discident_get_gtin_file_async
 discident_get_gtin_file_finish
-discident_get_title
-discident_get_title_file_async
+discident_get_title_sync
+discident_get_title_file
 discident_get_title_file_finish
 generate_hash
 discident_get_title_for_gtin
 discident_ean_get_type
 discident_ean_new
-discident_ean_login
-discident_ean_lookup
+discident_ean_login_sync
+discident_ean_lookup_sync
 discident_error_quark
diff --git a/discident-glib/test-diglib.c b/discident-glib/test-diglib.c
index 75b6acd..b0a1fa9 100644
--- a/discident-glib/test-diglib.c
+++ b/discident-glib/test-diglib.c
@@ -49,11 +49,11 @@ test_file_list (void)
 		dir = g_file_new_for_path (filename);
 		g_free (filename);
 
-		g_assert_cmpstr (discident_get_gtin_file (dir, NULL), ==, directories[i].gtin);
+		g_assert_cmpstr (discident_get_gtin_file_sync (dir, NULL), ==, directories[i].gtin);
 
 		g_object_set_data (G_OBJECT (dir), "wants-file-list", GINT_TO_POINTER (TRUE));
 
-		g_assert_cmpstr (discident_get_gtin_file (dir, NULL), ==, directories[i].file_list);
+		g_assert_cmpstr (discident_get_gtin_file_sync (dir, NULL), ==, directories[i].file_list);
 
 		g_object_unref (dir);
 	}
@@ -89,12 +89,12 @@ test_ean (void)
 	gboolean ret;
 
 	ean = discident_ean_new ();
-	g_assert (discident_ean_login (ean, NULL) != FALSE);
+	g_assert (discident_ean_login_sync (ean, NULL) != FALSE);
 
 	/* The Little Book of Stress: Calm is for Wimps, Get Real, Get Stressed */
-	ret = discident_ean_lookup (ean, "9780091865856", &title, &img_url, &error);
+	ret = discident_ean_lookup_sync (ean, "9780091865856", &title, &img_url, &error);
 	if (ret == FALSE) {
-		g_test_message ("discident_ean_lookup() failed with: %s", error->message);
+		g_test_message ("discident_ean_lookup_sync() failed with: %s", error->message);
 		g_error_free (error);
 		g_assert_not_reached ();
 	}
@@ -164,15 +164,15 @@ handle_ean (const char *ean)
 	gboolean ret;
 
 	object = discident_ean_new ();
-	if (discident_ean_login (object, &error) == FALSE) {
+	if (discident_ean_login_sync (object, &error) == FALSE) {
 		g_message ("Failed to login: %s", error->message);
 		g_object_unref (object);
 		return;
 	}
 
-	ret = discident_ean_lookup (object, ean, &title, &img_url, &error);
+	ret = discident_ean_lookup_sync (object, ean, &title, &img_url, &error);
 	if (ret == FALSE) {
-		g_message ("discident_ean_lookup() failed with: %s", error->message);
+		g_message ("discident_ean_lookup_sync() failed with: %s", error->message);
 		g_error_free (error);
 		g_object_unref (object);
 		return;
@@ -203,7 +203,7 @@ handle_gtin_uri (const char *uri)
 	g_object_set_data (G_OBJECT (file), "wants-file-list", GINT_TO_POINTER (option_file_list));
 	if (!option_async) {
 		char *title;
-		gtin = discident_get_gtin_file (file, &error);
+		gtin = discident_get_gtin_file_sync (file, &error);
 		g_object_unref (file);
 		if (gtin == NULL) {
 			g_message ("Could not get disc ID: %s", error->message);
@@ -221,9 +221,9 @@ handle_gtin_uri (const char *uri)
 		g_free (title);
 	} else {
 		num_queries++;
-		discident_get_gtin_file_async (file, NULL, discident_gtin_print, NULL);
+		discident_get_gtin_file (file, NULL, discident_gtin_print, NULL);
 		num_queries++;
-		discident_get_title_file_async (file, NULL, discident_title_print, NULL);
+		discident_get_title_file (file, NULL, discident_title_print, NULL);
 		g_object_unref (file);
 	}
 }