* otr-plugin.c:
	* dialogs.h:
	* dialogs.c:
	* gtk-dialog.c: Add a force_create parameter to
	display_otr_message.

ChangeLog

+2008-08-07
+
+	* otr-plugin.c:
+	* dialogs.h:
+	* dialogs.c:
+	* gtk-dialog.c: Add a force_create parameter to
+	display_otr_message.
+
 2008-07-10
 
 	* otr-plugin.c: Use /dev/urandom to generate keys instead of

dialogs.c

@@ -104,9 +104,11 @@ void otrg_dialog_notify_info(const char *accountname, const char *protocol,
  * username conversation.  Return 0 on success, non-0 on error (in which
  * case the message will be displayed inline as a received message). */
 int otrg_dialog_display_otr_message( const char *accountname,
-	const char *protocol, const char *username, const char *msg)
+	const char *protocol, const char *username, const char *msg,
+	int force_create)
 {
-    return ui_ops->display_otr_message(accountname, protocol, username, msg);
+    return ui_ops->display_otr_message(accountname, protocol, username, msg,
+					force_create);
 }
 
 /* Put up a Please Wait dialog.  This dialog can not be cancelled.

dialogs.h

@@ -47,7 +47,7 @@ typedef struct {
 	const char *title, const char *primary, const char *secondary);
 
     int (*display_otr_message)(const char *accountname, const char *protocol,
-	    const char *username, const char *msg);
+	    const char *username, const char *msg, int force_create);
 
     OtrgDialogWaitHandle (*private_key_wait_start)(const char *account,
 	const char *protocol);
@@ -119,7 +119,8 @@ void otrg_dialog_notify_info(const char *accountname, const char *protocol,
  * username conversation.  Return 0 on success, non-0 on error (in which
  * case the message will be displayed inline as a received message). */
 int otrg_dialog_display_otr_message( const char *accountname,
-	const char *protocol, const char *username, const char *msg);
+	const char *protocol, const char *username, const char *msg,
+	int force_create);
 
 /* Put up a Please Wait dialog. This dialog can not be cancelled.
  * Return a handle that must eventually be passed to

gtk-dialog.c

@@ -1017,16 +1017,14 @@ static OtrgDialogWaitHandle otrg_gtk_dialog_private_key_wait_start(
 }
 
 static int otrg_gtk_dialog_display_otr_message(const char *accountname,
-	const char *protocol, const char *username, const char *msg)
+	const char *protocol, const char *username, const char *msg,
+	int force_create)
 {
     /* See if there's a conversation window we can put this in. */
-    PurpleAccount *account;
     PurpleConversation *conv;
 
-    account = purple_accounts_find(accountname, protocol);
-    if (!account) return -1;
-
-    conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, username, account);
+    conv = otrg_plugin_userinfo_to_conv(accountname, protocol, username,
+		force_create);
     if (!conv) return -1;
 
     purple_conversation_write(conv, NULL, msg, PURPLE_MESSAGE_SYSTEM, time(NULL));

otr-plugin.c

@@ -254,7 +254,7 @@ static int display_otr_message_cb(void *opdata, const char *accountname,
 	const char *protocol, const char *username, const char *msg)
 {
     return otrg_dialog_display_otr_message(accountname, protocol,
-	    username, msg);
+	    username, msg, 0);
 }
 
 static void update_context_list_cb(void *opdata)