Changeset 85d7b85 for protocols/oscar/chatnav.c

Timestamp:

2008-04-02T14:22:57Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f9dbc99

Parents:

875ad42 (diff), dd34575 (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 trunk.

File:

• protocols/oscar/chatnav.c (modified) (4 diffs)

protocols/oscar/chatnav.c

@@ -286 +286 @@
 
         if (!(bigblock = aim_gettlv(tlvlist, 0x0004, 1))) {
-                do_error_dialog(sess->aux_data, "no bigblock in top tlv in create room response", "Gaim");
+                imcb_error(sess->aux_data, "no bigblock in top tlv in create room response");
         
                 aim_freetlvchain(&tlvlist);
@@ -301 +301 @@
 
         if (detaillevel != 0x02) {
-                do_error_dialog(sess->aux_data, "unknown detaillevel in create room response", "Gaim");
+                imcb_error(sess->aux_data, "unknown detaillevel in create room response");
                 aim_freetlvchain(&tlvlist);
                 g_free(ck);
@@ -367 +367 @@
 
         if (!(snac2 = aim_remsnac(sess, snac->id))) {
-                do_error_dialog(sess->aux_data, "received response to unknown request!", "Gaim");
+                imcb_error(sess->aux_data, "received response to unknown request!");
                 return 0;
         }
 
         if (snac2->family != 0x000d) {
-                do_error_dialog(sess->aux_data, "recieved response that maps to corrupt request!", "Gaim");
+                imcb_error(sess->aux_data, "recieved response that maps to corrupt request!");
                 return 0;
         }
@@ -389 +389 @@
                 ret = parseinfo_create(sess, mod, rx, snac, bs, snac2);
         else
-                do_error_dialog(sess->aux_data, "unknown request subtype", "Gaim");
+                imcb_error(sess->aux_data, "unknown request subtype");
 
         if (snac2)