Changeset 3864c08 for protocols

Timestamp:

2011-10-21T03:00:54Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e6b41b1

Parents:

6a45181 (diff), aea22cd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Big merge from pesco, closing some OTR issues: #759, #824, #839, #830.

Location:

protocols

Files:

• nogaim.c (modified) (1 diff)
• purple/purple.c (modified) (1 diff)

protocols/nogaim.c

@@ -216 +216 @@
         if( a )
                 /* FIXME(wilmer): ui_log callback or so */
-                irc_usermsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
+                irc_rootmsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
         else
-                irc_usermsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
+                irc_rootmsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
         
         g_free( text );

protocols/purple/purple.c

@@ -181 +181 @@
                         /** No way to talk to the user right now, invent one when
                         this becomes important.
-                        irc_usermsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
+                        irc_rootmsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
                                      name, purple_account_option_get_type( o ) );
                         */