Changeset 85d7b85 for protocols/oscar/info.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/info.c (modified) (5 diffs)

protocols/oscar/info.c

@@ -261 +261 @@
                 if (!identified) {
                         /*FIXME*/
+                        /*REMOVEME :-)
                         g_strdup_printf("unknown capability: {%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
                                         cap[0], cap[1], cap[2], cap[3],
@@ -268 +269 @@
                                         cap[10], cap[11], cap[12], cap[13],
                                         cap[14], cap[15]);
-                        
+                        */
                 }
 
@@ -473 +474 @@
                          */
 #ifdef DEBUG
-                        // do_error_dialog(sess->aux_data, G_STRLOC, "Unknown TLV encountered");
+                        // imcb_error(sess->aux_data, G_STRLOC);
 #endif
 
@@ -634 +635 @@
 
         if (!origsnac || !origsnac->data) {
-                do_error_dialog(sess->aux_data, "major problem: no snac stored!", "Gaim");
+                imcb_error(sess->aux_data, "major problem: no snac stored!");
                 return 0;
         }
@@ -643 +644 @@
                         (inforeq->infotype != AIM_GETINFO_AWAYMESSAGE) &&
                         (inforeq->infotype != AIM_GETINFO_CAPABILITIES)) {
-                do_error_dialog(sess->aux_data, "unknown infotype in request!", "Gaim");
+                imcb_error(sess->aux_data, "unknown infotype in request!");
                 return 0;
         }