Mercurial > pidgin3 / changeset

--- a/finch/gntconv.c	Fri Sep 06 21:45:14 2013 +0530
+++ b/finch/gntconv.c	Fri Sep 06 23:02:04 2013 +0530
@@ -1243,9 +1243,9 @@
 		tmp = g_strdup_printf("Using Finch v%s with libpurple v%s.",
 				DISPLAY_VERSION, purple_core_get_version());
 	} else if (!g_ascii_strcasecmp(args[0], "plugins")) {
-		/* Show all the loaded plugins, including the protocol plugins and plugin loaders.
+		/* Show all the loaded plugins, including plugins marked internal.
 		 * This is intentional, since third party protocols are often sources of bugs, and some
-		 * plugin loaders (e.g. mono) can also be buggy.
+		 * loaders can also be buggy.
 		 */
 		GString *str = g_string_new("Loaded Plugins: ");
 		const GList *plugins = purple_plugins_get_loaded();

--- a/libpurple/account.c	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/account.c	Fri Sep 06 23:02:04 2013 +0530
@@ -327,7 +327,7 @@
 	if (protocol == NULL) {
 		gchar *message;
 
-		message = g_strdup_printf(_("Missing protocol plugin for %s"), username);
+		message = g_strdup_printf(_("Missing protocol for %s"), username);
 		purple_notify_error(account, _("Connection Error"), message, NULL);
 		g_free(message);
 		return;

--- a/libpurple/accountopt.c	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/accountopt.c	Fri Sep 06 23:02:04 2013 +0530
@@ -32,7 +32,7 @@
 /**
  * An option for an account.
  *
- * This is set by protocol plugins, and appears in the account settings
+ * This is set by protocols, and appears in the account settings
  * dialogs.
  */
 struct _PurpleAccountOption

--- a/libpurple/connection.c	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/connection.c	Fri Sep 06 23:02:04 2013 +0530
@@ -878,7 +878,7 @@
 	if (protocol == NULL) {
 		gchar *message;
 
-		message = g_strdup_printf(_("Missing protocol plugin for %s"),
+		message = g_strdup_printf(_("Missing protocol for %s"),
 			purple_account_get_username(account));
 		purple_notify_error(NULL, regist ? _("Registration Error") :
 						  _("Connection Error"), message, NULL);
@@ -942,7 +942,7 @@
 	if (protocol == NULL) {
 		gchar *message;
 
-		message = g_strdup_printf(_("Missing protocol plugin for %s"),
+		message = g_strdup_printf(_("Missing protocol for %s"),
 								  purple_account_get_username(account));
 		purple_notify_error(NULL, _("Unregistration Error"), message, NULL);
 		g_free(message);

--- a/libpurple/connection.h	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/connection.h	Fri Sep 06 23:02:04 2013 +0530
@@ -352,11 +352,11 @@
 PurpleAccount *purple_connection_get_account(const PurpleConnection *gc);
 
 /**
- * Returns the protocol plugin managing a connection.
+ * Returns the protocol managing a connection.
  *
  * @param gc The connection.
  *
- * @return The protocol plugin.
+ * @return The protocol.
  */
 PurpleProtocol *purple_connection_get_protocol(const PurpleConnection *gc);
 

--- a/libpurple/example/nullclient.c	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/example/nullclient.c	Fri Sep 06 23:02:04 2013 +0530
@@ -210,7 +210,7 @@
 	}
 
 	/* Set path to search for plugins. The core (libpurple) takes care of loading the
-	 * core-plugins, which includes the protocol-plugins. So it is not essential to add
+	 * core-plugins, which includes the in-tree protocols. So it is not essential to add
 	 * any path here, but it might be desired, especially for ui-specific plugins. */
 	purple_plugins_add_search_path(CUSTOM_PLUGIN_PATH);
 	purple_plugins_refresh();

--- a/libpurple/roomlist.h	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/roomlist.h	Fri Sep 06 23:02:04 2013 +0530
@@ -250,7 +250,7 @@
  * @param list The roomlist, which must not be @c NULL.
  *
  * @return The protocol data associated with this room list.  This is a
- *         convenience field provided to the protocol plugin--it is not
+ *         convenience field provided to the protocol -- it is not
  *         used the libpurple core.
  */
 gpointer purple_roomlist_get_proto_data(PurpleRoomlist *list);

--- a/libpurple/server.h	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/server.h	Fri Sep 06 23:02:04 2013 +0530
@@ -75,7 +75,7 @@
 void serv_got_alias(PurpleConnection *gc, const char *who, const char *alias);
 
 /**
- * A protocol plugin should call this when it retrieves a private alias from
+ * A protocol should call this when it retrieves a private alias from
  * the server.  Private aliases are the aliases the user sets, while public
  * aliases are the aliases or display names that buddies set for themselves.
  *

--- a/libpurple/util.h	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/util.h	Fri Sep 06 23:02:04 2013 +0530
@@ -956,7 +956,7 @@
 /**
  * Checks, if a string is valid.
  *
- * @param protocol The protocol plugin the string belongs to.
+ * @param protocol The protocol the string belongs to.
  * @param str      The string to validate.
  *
  * @return TRUE, if string is valid, otherwise FALSE.

--- a/libpurple/whiteboard.c	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/whiteboard.c	Fri Sep 06 23:02:04 2013 +0530
@@ -37,7 +37,7 @@
 
 	void *ui_data;                   /**< Graphical user-interface data */
 	void *proto_data;                /**< Protocol specific data */
-	PurpleWhiteboardOps *protocol_ops; /**< Protocol-plugin operations */
+	PurpleWhiteboardOps *protocol_ops; /**< Protocol operations */
 
 	GList *draw_list;                /**< List of drawing elements/deltas to send */
 };

--- a/libpurple/xfer.h	Fri Sep 06 21:45:14 2013 +0530
+++ b/libpurple/xfer.h	Fri Sep 06 23:02:04 2013 +0530
@@ -630,7 +630,7 @@
  * @a ip and @a port are ignored.
  *
  * Passing @a fd as '-1' is a special-case and indicates to the
- * protocol plugin to facilitate the file transfer itself.
+ * protocol to facilitate the file transfer itself.
  *
  * @param xfer The file transfer.
  * @param fd   The file descriptor for the socket.

--- a/pidgin/gtkconv.c	Fri Sep 06 21:45:14 2013 +0530
+++ b/pidgin/gtkconv.c	Fri Sep 06 23:02:04 2013 +0530
@@ -377,9 +377,9 @@
 		tmp = g_strdup_printf("Using Pidgin v%s with libpurple v%s.",
 				DISPLAY_VERSION, purple_core_get_version());
 	} else if (!g_ascii_strcasecmp(args[0], "plugins")) {
-		/* Show all the loaded plugins, including the protocol plugins and plugin loaders.
+		/* Show all the loaded plugins, including plugins marked internal.
 		 * This is intentional, since third party protocols are often sources of bugs, and some
-		 * plugin loaders (e.g. mono) can also be buggy.
+		 * plugin loaders can also be buggy.
 		 */
 		GString *str = g_string_new("Loaded Plugins: ");
 		const GList *plugins = purple_plugins_get_loaded();