/soc/2015/mmcc/main: 32f6ee5de897: change 'Farsight' to 'Farstre...

[Michael McConville]

Changeset: 32f6ee5de8975449253a1b387705eb2c62e2f6b1
Author:	 Michael McConville <mmcconville at mykolab.com>
Date:	 2015-07-06 19:00 -0400
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/32f6ee5de897

Description:

change 'Farsight' to 'Farstream' in comments

diffstat:

 libpurple/media.h             |  6 +++---
 libpurple/media/backend-fs2.c |  2 +-
 libpurple/media/backend-fs2.h |  8 ++++----
 libpurple/mediamanager.h      |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (86 lines):

diff --git a/libpurple/media.h b/libpurple/media.h
--- a/libpurple/media.h
+++ b/libpurple/media.h
@@ -219,8 +219,8 @@ gboolean purple_media_param_is_supported
  * @type: The type of stream to create.
  * @initiator: Whether or not the local user initiated the stream.
  * @transmitter: The transmitter to use for the stream.
- * @num_params: The number of parameters to pass to Farsight.
- * @params: The parameters to pass to Farsight.
+ * @num_params: The number of parameters to pass to Farstream.
+ * @params: The parameters to pass to Farstream.
  *
  * Adds a stream to a session.
  *
@@ -507,4 +507,4 @@ gboolean purple_media_send_dtmf(PurpleMe
 
 G_END_DECLS
 
-#endif  /* _PURPLE_MEDIA_H_ */
\ No newline at end of file
+#endif  /* _PURPLE_MEDIA_H_ */
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -913,7 +913,7 @@ purple_media_error_fs(PurpleMedia *media
 	const gchar *error_msg = gst_structure_get_string(fs_error, "error-msg");
 
 	purple_media_error(media, "%s%s%s", error,
-	                   error_msg ? _("\n\nMessage from Farsight: ") : "",
+	                   error_msg ? _("\n\nMessage from Farstream: ") : "",
 	                   error_msg ? error_msg : "");
 }
 
diff --git a/libpurple/media/backend-fs2.h b/libpurple/media/backend-fs2.h
--- a/libpurple/media/backend-fs2.h
+++ b/libpurple/media/backend-fs2.h
@@ -25,7 +25,7 @@
  * SECTION:backend-fs2
  * @section_id: libpurple-backend-fs2
  * @short_description: <filename>media/backend-fs2.h</filename>
- * @title: Farsight 2 backend for media API
+ * @title: Farstream 2 backend for media API
  *
  * This file should not yet be part of libpurple's API.
  * It should remain internal only for now.
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 /**
  * PurpleMediaBackendFs2:
  *
- * An opaque structure representing the Farsight 2 media backend.
+ * An opaque structure representing the Farstream 2 media backend.
  */
 typedef struct _PurpleMediaBackendFs2 PurpleMediaBackendFs2;
 
 /**
  * purple_media_backend_fs2_get_type:
  *
- * Gets the type of the Farsight 2 media backend object.
+ * Gets the type of the Farstream 2 media backend object.
  *
- * Returns: The Farsight 2 media backend's GType
+ * Returns: The Farstream 2 media backend's GType
  */
 GType purple_media_backend_fs2_get_type(void);
 
diff --git a/libpurple/mediamanager.h b/libpurple/mediamanager.h
--- a/libpurple/mediamanager.h
+++ b/libpurple/mediamanager.h
@@ -127,7 +127,7 @@ PurpleMediaManager *purple_media_manager
  * purple_media_manager_create_media:
  * @manager: The media manager to create the session under.
  * @account: The account to create the session on.
- * @conference_type: The conference type to feed into Farsight2.
+ * @conference_type: The conference type to feed into Farstream.
  * @remote_user: The remote user to initiate the session with.
  * @initiator: TRUE if the local user is the initiator of this media call, FALSE otherwise.
  *
@@ -178,7 +178,7 @@ purple_media_manager_remove_media(Purple
  * purple_media_manager_create_private_media:
  * @manager: The media manager to create the session under.
  * @account: The account to create the session on.
- * @conference_type: The conference type to feed into Farsight2.
+ * @conference_type: The conference type to feed into Farstream.
  * @remote_user: The remote user to initiate the session with.
  * @initiator: TRUE if the local user is the initiator of this media call, FALSE otherwise.
  *