pidgin/plugins/timestamp_format.c

branch
string-comparison-r2
changeset 38258
9a6551eba09c
parent 38256
035f00c4fd87
equal deleted inserted replaced
38257:1a294a6d2a57 38258:9a6551eba09c
82 g_return_val_if_fail(dates != NULL, NULL); 82 g_return_val_if_fail(dates != NULL, NULL);
83 83
84 tm = localtime(&t); 84 tm = localtime(&t);
85 85
86 if (show_date || 86 if (show_date ||
87 !strcmp(dates, "always") || 87 purple_strequal(dates, "always") ||
88 (conv != NULL && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && !strcmp(dates, "chats"))) 88 (conv != NULL && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && purple_strequal(dates, "chats")))
89 { 89 {
90 if (purple_strequal(force, "force24")) 90 if (purple_strequal(force, "force24"))
91 return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%Y-%m-%d %H:%M:%S", tm), parens ? ")" : ""); 91 return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%Y-%m-%d %H:%M:%S", tm), parens ? ")" : "");
92 else if (purple_strequal(force, "force12")) { 92 else if (purple_strequal(force, "force12")) {
93 char *date = g_strdup_printf("%s", purple_utf8_strftime("%Y-%m-%d ", tm)); 93 char *date = g_strdup_printf("%s", purple_utf8_strftime("%Y-%m-%d ", tm));

mercurial