# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1135280363 0
# Node ID fee6a32644a4e409187e6cbedf5086ed3e3d38f3
# Parent  26647ddcc9c5851e1f99d65c42544cff3a0f4276
[gaim-migrate @ 14965]
I read the commit messages a little too closely. But, hey, what better way than to start another Gaim hacking day than with a bunch of little changes.

committer: Tailor Script <tailor@pidgin.im>

diff -r 26647ddcc9c5 -r fee6a32644a4 plugins/ChangeLog.API
--- a/plugins/ChangeLog.API	Thu Dec 22 19:36:18 2005 +0000
+++ b/plugins/ChangeLog.API	Thu Dec 22 19:39:23 2005 +0000
@@ -2,7 +2,7 @@
 
 version 2.0.0:
 	Changed:
-	* All the status stuff. Yay!
+	* All the status stuff.  Yay!
 	* gaim_prefs_connect_callback(), added handle parameter
 	* gtk_imhtml_toolbar now descends from GtkHBox making it easier to add your
 	  own widgets to it
@@ -33,7 +33,7 @@
 	* gtk_imhtml_toggle_strike(): No longer returns a value
 	* gtk_imhtml_scroll_to_end(): Added the smooth paramter
 	* gaim_log_new(), added conv parameter
-	* gaim_buddy_icon_new(), leaves a reference which the caller owns. Use
+	* gaim_buddy_icon_new(), leaves a reference which the caller owns.  Use
 	  gaim_buddy_icon_unref() immediately if you don't want a reference (the
 	  old behavior).
 	* GAIM_CONV_UNKNOWN to GAIM_CONV_TYPE_UNKNOWN.
@@ -61,15 +61,15 @@
 	  Changed ssize_t to gssize
 	* serv_got_im, serv_got_chat_in, serv_send_im and serv_chat_send all use
 	  GaimMessageFlags instead of GaimConvImFlags / GaimConvChatFlags
-	* All core<->prpl message passing now uses html. This was previously true
-	  for receiving messages, it's now also true for sending them. prpls that
+	* All core<->prpl message passing now uses html.  This was previously true
+	  for receiving messages, it's now also true for sending them.  prpls that
 	  don't support html need to gaim_unescape_html() the message.
 	* Notify API: GCallback -> GaimNotifyCloseCallback,
 	              void *user_data -> gpointer user_data
 	* gaim_notify_searchresults_get_rows_count,
 	  gaim_notify_searchresults_get_columns_count: return type now guint
 	* gaim_account_notify_added: No longer checks if there is a
-	  GaimBuddy for the added user, that's left up to the prpls.See the
+	  GaimBuddy for the added user, that's left up to the prpls.  See the
 	  documentation for this function and gaim_account_request_add.
 	* gaim_accounts_reorder: new_index is now a gint instead of a size_t
 	* displaying-message signals: displaying-[im|chat]-msg and
@@ -155,7 +155,7 @@
 	* gaim_account_remove_buddies()
 	* gaim_account_change_password()
 	* gaim_conversation_close_logs(), to force a conversation's log(s) to
-	  be closed. New logs will be opened as necessary.
+	  be closed.  New logs will be opened as necessary.
 	* gaim_plugin_get_id()
 	* gaim_plugin_get_name()
 	* gaim_plugin_get_version()
@@ -200,7 +200,7 @@
 
 	Signals - Changed:  (See the Doxygen docs for details on all signals.)
 	* Signal propagation now stops after a handler returns a non-NULL value.
-	  This value is now returned. Previously, all registered handlers were
+	  This value is now returned.  Previously, all registered handlers were
 	  called and the value from the last handler was used.
 	* "received-im-msg" and "received-chat-msg" to match, both now pass a
 	  conversation pointer and flags
diff -r 26647ddcc9c5 -r fee6a32644a4 src/conversation.c
--- a/src/conversation.c	Thu Dec 22 19:36:18 2005 +0000
+++ b/src/conversation.c	Thu Dec 22 19:39:23 2005 +0000
@@ -516,7 +516,7 @@
 
 	g_return_if_fail(conv != NULL);
 
-	ops  = gaim_conversation_get_ui_ops(conv);
+	ops = gaim_conversation_get_ui_ops(conv);
 	if(ops && ops->present)
 		ops->present(conv);
 }
diff -r 26647ddcc9c5 -r fee6a32644a4 src/media.h
--- a/src/media.h	Thu Dec 22 19:36:18 2005 +0000
+++ b/src/media.h	Thu Dec 22 19:39:23 2005 +0000
@@ -97,7 +97,7 @@
 void gaim_voice_chat_destroy(GaimVoiceChat *vc);
 
 /**
- * Acessor function to get the name of the other user on the voice chat
+ * Accessor function to get the name of the other user on the voice chat
  *
  * @param vc  The voice chat
  * @return    The name
@@ -105,7 +105,7 @@
 const char *gaim_voice_chat_get_name(GaimVoiceChat *vc);
 
 /**
- * Acessor function to set the name of the other user on the voice chat
+ * Accessor function to set the name of the other user on the voice chat
  *
  * @param vc  The voice chat
  * @return    The name
diff -r 26647ddcc9c5 -r fee6a32644a4 src/protocols/sametime/sametime.c
--- a/src/protocols/sametime/sametime.c	Thu Dec 22 19:36:18 2005 +0000
+++ b/src/protocols/sametime/sametime.c	Thu Dec 22 19:39:23 2005 +0000
@@ -295,7 +295,7 @@
 static GaimConversation *convo_get_gconv(struct mwConversation *conv);
 
 
-/* name and  id */
+/* name and id */
 
 struct named_id {
   char *id;