pidgin3: comparison finch/gntconv.c

-:4c386387f6f3
+:c035b9a63457
 		switch (status)
 		{
 			case PURPLE_CMD_STATUS_OK:
 				break;
 			case PURPLE_CMD_STATUS_NOT_FOUND:
-				purple_conversation_write(conv, "", _("No such command."),
+				purple_conversation_write_system_message(conv,
-						PURPLE_MESSAGE_NO_LOG, time(NULL));
+					_("No such command."), PURPLE_MESSAGE_NO_LOG);
 				break;
 			case PURPLE_CMD_STATUS_WRONG_ARGS:
-				purple_conversation_write(conv, "", _("Syntax Error:  You typed the wrong number of arguments "
+				purple_conversation_write_system_message(conv,
-							"to that command."),
+					_("Syntax Error:  You typed the wrong "
-						PURPLE_MESSAGE_NO_LOG, time(NULL));
+					"number of arguments to that command."),
+					PURPLE_MESSAGE_NO_LOG);
 				break;
 			case PURPLE_CMD_STATUS_FAILED:
-				purple_conversation_write(conv, "", error ? error : _("Your command failed for an unknown reason."),
+				purple_conversation_write_system_message(conv,
-						PURPLE_MESSAGE_NO_LOG, time(NULL));
+					error ? error : _("Your command failed for an unknown reason."),
+					PURPLE_MESSAGE_NO_LOG);
 				break;
 			case PURPLE_CMD_STATUS_WRONG_TYPE:
 				if(PURPLE_IS_IM_CONVERSATION(conv))
-					purple_conversation_write(conv, "", _("That command only works in chats, not IMs."),
+					purple_conversation_write_system_message(conv,
-							PURPLE_MESSAGE_NO_LOG, time(NULL));
+						_("That command only works in chats, not IMs."),
+						PURPLE_MESSAGE_NO_LOG);
 				else
-					purple_conversation_write(conv, "", _("That command only works in IMs, not chats."),
+					purple_conversation_write_system_message(conv,
-							PURPLE_MESSAGE_NO_LOG, time(NULL));
+						_("That command only works in IMs, not chats."),
+						PURPLE_MESSAGE_NO_LOG);
 				break;
 			case PURPLE_CMD_STATUS_WRONG_PRPL:
-				purple_conversation_write(conv, "", _("That command doesn't work on this protocol."),
+				purple_conversation_write_system_message(conv,
-						PURPLE_MESSAGE_NO_LOG, time(NULL));
+					_("That command doesn't work on this protocol."),
+					PURPLE_MESSAGE_NO_LOG);
 				break;
 		}
 		g_free(error);
 	}
 	else if (!purple_account_is_connected(purple_conversation_get_account(ggconv->active_conv)))
 	{
-		purple_conversation_write(ggconv->active_conv, "", _("Message was not sent, because you are not signed on."),
+		purple_conversation_write_system_message(ggconv->active_conv,
-				PURPLE_MESSAGE_ERROR | PURPLE_MESSAGE_NO_LOG, time(NULL));
+			_("Message was not sent, because you are not signed on."),
+			PURPLE_MESSAGE_ERROR | PURPLE_MESSAGE_NO_LOG);
 	}
 	else
 	{
 		char *escape = purple_markup_escape_text((*text == '/' ? text + 1 : text), -1);
 		purple_conversation_send(ggconv->active_conv, escape);
 	while (list) {
 		PurpleConversation *conv = list->data;
 		if (!purple_chat_conversation_has_left(PURPLE_CHAT_CONVERSATION(conv)) &&
 				purple_conversation_get_account(conv) == account) {
 			g_object_set_data(G_OBJECT(conv), "want-to-rejoin", GINT_TO_POINTER(TRUE));
-			purple_conversation_write(conv, NULL, _("The account has disconnected and you are no "
+			purple_conversation_write_system_message(conv,
-						"longer in this chat. You will be automatically rejoined in the chat when "
+				_("The account has disconnected and you are no "
-						"the account reconnects."),
+				"longer in this chat. You will be automatically rejoined in the chat when "
-					PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, time(NULL));
+				"the account reconnects."),
+				PURPLE_MESSAGE_NO_LOG);
 		}
 		list = list->next;
 	}
 }
 	/* Xerox */
 	if (logging) {
 		/* Enable logging first so the message below can be logged. */
 		purple_conversation_set_logging(conv, TRUE);
-		purple_conversation_write(conv, NULL,
+		purple_conversation_write_system_message(conv,
-				_("Logging started. Future messages in this conversation will be logged."),
+			_("Logging started. Future messages in this "
-				PURPLE_MESSAGE_SYSTEM, time(NULL));
+			"conversation will be logged."), 0);
 	} else {
-		purple_conversation_write(conv, NULL,
+		purple_conversation_write_system_message(conv,
-				_("Logging stopped. Future messages in this conversation will not be logged."),
+			_("Logging stopped. Future messages in this "
-				PURPLE_MESSAGE_SYSTEM, time(NULL));
+			"conversation will not be logged."), 0);
 		/* Disable the logging second, so that the above message can be logged. */
 		purple_conversation_set_logging(conv, FALSE);
 	}
 	PurpleConnection *gc = purple_account_get_connection(account);
 	PurplePluginProtocolInfo *prpl_info = NULL;
 	char *name, *realname;
 	if (!gc) {
-		purple_conversation_write(fc->active_conv, NULL, _("You are not connected."),
+		purple_conversation_write_system_message(fc->active_conv,
-				PURPLE_MESSAGE_SYSTEM, time(NULL));
+			_("You are not connected."), 0);
 		return;
 	}
 	name = gnt_tree_get_selection_data(GNT_TREE(widget));
 			if ((str = purple_chat_user_get_alias(chatuser)) == NULL)
 				str = purple_chat_user_get_name(chatuser);
 			g_string_append_printf(string, "[ %s ]", str);
 		}
-		purple_conversation_write(conv, NULL, string->str,
+		purple_conversation_write_system_message(
-				PURPLE_MESSAGE_SYSTEM, time(NULL));
+			conv, string->str, 0);
 		g_string_free(string, TRUE);
 	}
 	for (; users; users = users->next)
 	{
 			str = g_string_append(str, "(none)");
 		}
 		tmp = g_string_free(str, FALSE);
 	} else {
-		purple_conversation_write(conv, NULL, _("Supported debug options are: plugins version"),
+		purple_conversation_write_system_message(conv,
-		                        PURPLE_MESSAGE_NO_LOG|PURPLE_MESSAGE_ERROR, time(NULL));
+			_("Supported debug options are: plugins version"),
+			PURPLE_MESSAGE_NO_LOG | PURPLE_MESSAGE_ERROR);
 		return PURPLE_CMD_RET_OK;
 	}
 	markup = g_markup_escape_text(tmp, -1);
 	purple_conversation_send(conv, markup);
 			else
 				g_string_append_printf(s, "%s.", (char *)l->data);
 		g_list_free(text);
 	}
-	purple_conversation_write(conv, NULL, s->str, PURPLE_MESSAGE_NO_LOG, time(NULL));
+	purple_conversation_write_system_message(conv, s->str, PURPLE_MESSAGE_NO_LOG);
 	g_string_free(s, TRUE);
 	return PURPLE_CMD_RET_OK;
 }

Mercurial > pidgin3 / file comparison

comparison: finch/gntconv.c

finch/gntconv.c