Changeset ec3e411 for protocols

Timestamp:

2006-02-12T07:20:49Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

58bc4e6

Parents:

9fae35c (diff), 1d2e3c2 (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:

Merge Wilmer

Location:

protocols/msn

Files:

• msn.c (modified) (2 diffs)
• sb.c (modified) (2 diffs)

protocols/msn/msn.c

@@ -84 +84 @@
                 {
                         m = l->data;
+                
+                        serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
                         g_free( m->who );
                         g_free( m->text );
@@ -89 +91 @@
                 }
                 g_slist_free( md->msgq );
-                
-                serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message(s), you'll have to resend them." );
         }
         

protocols/msn/sb.c

@@ -213 +213 @@
                 {
                         m = l->data;
+
                         g_free( m->who );
                         g_free( m->text );
@@ -219 +220 @@
                 g_slist_free( sb->msgq );
                 
-                serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with unsent message(s), you'll have to resend them." );
+                serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with "
+                                   "unsent message to %s, you'll have to resend it.",
+                                   m->who ? m->who : "(unknown)" );
         }