Mercurial > pidgin

changeset 28445:2c1677e123dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
there's no reason for message_changed to use g_utf8_collate, and also no reason why it can't be replaced by purple_strequal
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 25 Oct 2009 23:04:19 +0000
parents e35043e96a1a
children 986aa7474fd4
files pidgin/gtkstatusbox.c
diffstat 1 files changed, 4 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkstatusbox.c	Sun Oct 25 22:18:08 2009 +0000
+++ b/pidgin/gtkstatusbox.c	Sun Oct 25 23:04:19 2009 +0000
@@ -2324,18 +2324,6 @@
 	pidgin_status_box_refresh(status_box);
 }
 
-static gboolean
-message_changed(const char *one, const char *two)
-{
-	if (one == NULL && two == NULL)
-		return FALSE;
-
-	if (one == NULL || two == NULL)
-		return TRUE;
-
-	return (g_utf8_collate(one, two) != 0);
-}
-
 static void
 activate_currently_selected_status(PidginStatusBox *status_box)
 {
@@ -2408,7 +2396,7 @@
 			if (strncmp(id, purple_status_get_id(status), strlen(id)) == 0)
 			{
 				/* Selected status and previous status is the same */
-				if (!message_changed(message, purple_status_get_attr_string(status, "message")))
+				if (purple_strequal(message, purple_status_get_attr_string(status, "message")))
 				{
 					PurpleSavedStatus *ss = purple_savedstatus_get_current();
 					/* Make sure that statusbox displays the correct thing.
@@ -2425,7 +2413,7 @@
 			if (purple_savedstatus_get_type(saved_status) == primitive &&
 			    !purple_savedstatus_has_substatuses(saved_status))
 			{
-				if (!message_changed(purple_savedstatus_get_message(saved_status), message))
+				if (purple_strequal(purple_savedstatus_get_message(saved_status), message))
 					changed = FALSE;
 			}
 		}
@@ -2442,7 +2430,7 @@
 					const char *ss_msg = purple_savedstatus_get_message(ss);
 					if ((purple_savedstatus_get_type(ss) == primitive) && purple_savedstatus_is_transient(ss) &&
 						purple_savedstatus_has_substatuses(ss) && /* Must have substatuses */
-						!message_changed(ss_msg, message))
+						purple_strequal(ss_msg, message))
 					{
 						gboolean found = FALSE;
 						/* The currently enabled accounts must have substatuses for all the active accts */
@@ -2509,7 +2497,7 @@
 		if (strncmp(id, purple_status_get_id(status), strlen(id)) == 0)
 		{
 			/* Selected status and previous status is the same */
-			if (!message_changed(message, purple_status_get_attr_string(status, "message")))
+			if (purple_strequal(message, purple_status_get_attr_string(status, "message")))
 				changed = FALSE;
 		}