# HG changeset patch # User Ka-Hing Cheung # Date 1256511859 0 # Node ID 2c1677e123dc94cf2cbe2f8ffba7dffbb4014344 # Parent e35043e96a1a4a8d2ef0fad90df81b10eb416c8f 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 diff -r e35043e96a1a -r 2c1677e123dc pidgin/gtkstatusbox.c --- 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; }