Mercurial > pidgin3 / file diff

--- a/pidgin/plugins/timestamp_format.c	Thu Mar 09 21:04:44 2017 -0600
+++ b/pidgin/plugins/timestamp_format.c	Thu Mar 23 19:19:01 2017 +0300
@@ -87,9 +87,9 @@
 	    !strcmp(dates, "always") ||
 	    (conv != NULL && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && !strcmp(dates, "chats")))
 	{
-		if (g_str_equal(force, "force24"))
+		if (purple_strequal(force, "force24"))
 			return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%Y-%m-%d %H:%M:%S", tm), parens ? ")" : "");
-		else if (g_str_equal(force, "force12")) {
+		else if (purple_strequal(force, "force12")) {
 			char *date = g_strdup_printf("%s", purple_utf8_strftime("%Y-%m-%d ", tm));
 			char *remtime = g_strdup_printf("%s", purple_utf8_strftime(":%M:%S %p", tm));
 			const char *hour = format_12hour_hour(tm);
@@ -107,9 +107,9 @@
 			return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_date_format_long(tm), parens ? ")" : "");
 	}
 
-	if (g_str_equal(force, "force24"))
+	if (purple_strequal(force, "force24"))
 		return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%H:%M:%S", tm), parens ? ")" : "");
-	else if (g_str_equal(force, "force12")) {
+	else if (purple_strequal(force, "force12")) {
 		const char *hour = format_12hour_hour(tm);
 		char *remtime = g_strdup_printf("%s", purple_utf8_strftime(":%M:%S %p", tm));
 		char *output = g_strdup_printf("%s%s%s%s", parens ? "(" : "", hour, remtime, parens ? ")" : "");