Changeset 2cdd8ce for protocols

Timestamp:

2005-11-19T15:17:03Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

9c8ae50, b20b32f

Parents:

c998255 (diff), 94281ef (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

Files:

• jabber/genhash.c (deleted)
• jabber/jabber.c (modified) (1 diff)
• jabber/jconn.c (deleted)
• jabber/karma.c (deleted)
• jabber/pproxy.c (deleted)
• jabber/rate.c (deleted)
• jabber/xhash.c (deleted)
• jabber/xstream.c (deleted)
• msn/msn_util.c (modified) (1 diff)
• nogaim.c (modified) (22 diffs)
• oscar/aim_cbtypes.h (deleted)
• oscar/im.c (modified) (2 diffs)
• oscar/im.h (modified) (2 diffs)
• oscar/oscar.c (modified) (6 diffs)
• util.c (modified) (1 diff)
• yahoo/yahoo.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -1123 +1123 @@
                  */
                 struct jabber_add_permit *jap = g_new0(struct jabber_add_permit, 1);
-                gchar *msg = g_strdup_printf(_("The user %s wants to add you to their buddy list."),
+                gchar *msg = g_strdup_printf(_("The user %s wants to add you to his/her buddy list."),
                                 Jid);
 

protocols/msn/msn_util.c

@@ -166 +166 @@
         
         g_snprintf( buf, sizeof( buf ),
-                    "The user %s (%s) wants to add you to his/her buddy list. Do you want to allow this?",
+                    "The user %s (%s) wants to add you to his/her buddy list.",
                     handle, realname );
         do_ask_dialog( gc, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );

protocols/nogaim.c

@@ -184 +184 @@
                         gc->prpl->set_away( gc, s, away );
                         if( set_getint( gc->irc, "debug" ) )
-                                irc_usermsg( gc->irc, "Setting away state for %s to %s", gc->prpl->name, s );
+                                serv_got_crap( gc, "Setting away state to %s", s );
                 }
                 else
@@ -277 +277 @@
 void set_login_progress( struct gaim_connection *gc, int step, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Logging in: %s", gc->prpl->name, gc->username, msg );
+        serv_got_crap( gc, "Logging in: %s", msg );
 }
 
@@ -283 +283 @@
 void hide_login_progress( struct gaim_connection *gc, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Login error: %s", gc->prpl->name, gc->username, msg );
+        serv_got_crap( gc, "Login error: %s", msg );
 }
 
@@ -289 +289 @@
 void hide_login_progress_error( struct gaim_connection *gc, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Logged out: %s", gc->prpl->name, gc->username, msg );
+        serv_got_crap( gc, "Logged out: %s", msg );
 }
 
@@ -308 +308 @@
                 msg = text;
         
-        /* if( g_strcasecmp( set_getstr(gc->irc, "html" ), "strip" ) == 0 ) */
-        if( gc->flags & OPT_CONN_HTML )
+        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -337 +337 @@
         u = user_find( gc->irc, gc->irc->nick );
         
-        irc_usermsg( gc->irc, "%s(%s) - Logged in", gc->prpl->name, gc->username );
+        serv_got_crap( gc, "Logged in" );
         
         gc->keepalive = g_timeout_add( 60000, send_keepalive, gc );
@@ -351 +351 @@
                 
                 if( u == NULL )
-                        irc_usermsg( gc->irc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. "
+                        serv_got_crap( gc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. "
                                               "See \x02""help import_buddies\x02"" for more information." );
         }
@@ -384 +384 @@
         account_t *a;
         
-        irc_usermsg( gc->irc, "%s(%s) - Signing off..", gc->prpl->name, gc->username );
+        serv_got_crap( gc, "Signing off.." );
 
         gaim_input_remove( gc->keepalive );
@@ -416 +416 @@
         {
                 int delay = set_getint( irc, "auto_reconnect_delay" );
-                irc_usermsg( gc->irc, "%s(%s) - Reconnecting in %d seconds..", gc->prpl->name, gc->username, delay);
+                serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
                 
                 a->reconnect = 1;
@@ -430 +430 @@
 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Error: %s", gc->prpl->name, gc->username, msg );
+        serv_got_crap( gc, "Error: %s", msg );
 }
 
@@ -459 +459 @@
         
         if( set_getint( irc, "debug" ) && 0 ) /* This message is too useless */
-                irc_usermsg( irc, "Receiving user add from protocol: %s", handle );
+                serv_got_crap( gc, "Receiving user add from handle: %s", handle );
         
         if( user_findhandle( gc, handle ) )
         {
                 if( set_getint( irc, "debug" ) )
-                        irc_usermsg( irc, "User already exists, ignoring add request: %s", handle );
+                        serv_got_crap( gc, "User already exists, ignoring add request: %s", handle );
                 
                 return;
@@ -557 +557 @@
                 
                 if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) )
-                        irc_usermsg( gc->irc, "User `%s' changed name to `%s'", u->nick, u->realname );
+                        serv_got_crap( gc, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
 }
@@ -590 +590 @@
                         if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 )
                         {
-                                irc_usermsg( gc->irc, "serv_got_update() for handle %s on connection %s(%s):", handle, gc->prpl->name, gc->username );
-                                irc_usermsg( gc->irc, "loggedin = %d, type = %d", loggedin, type );
+                                serv_got_crap( gc, "serv_got_update() for handle %s:", handle );
+                                serv_got_crap( gc, "loggedin = %d, type = %d", loggedin, type );
                         }
                         
@@ -671 +671 @@
                 {
                         if( set_getint( irc, "debug" ) )
-                                irc_usermsg( irc, "Ignoring message from unknown handle %s on connection %s(%s)", handle, gc->prpl->name, gc->username );
+                                serv_got_crap( gc, "Ignoring message from unknown handle %s", handle );
                         
                         return;
@@ -693 +693 @@
                 else
                 {
-                        irc_usermsg( irc, "Message from unknown handle %s on connection %s(%s):", handle, gc->prpl->name, gc->username );
+                        serv_got_crap( gc, "Message from unknown handle %s:", handle );
                         u = user_find( irc, irc->mynick );
                 }
         }
         
-        /* if( g_strcasecmp( set_getstr( irc, "html" ), "strip" ) == 0 ) */
-        if( gc->flags & OPT_CONN_HTML )
+        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
 
@@ -753 +753 @@
         
         if( set_getint( gc->irc, "debug" ) )
-                irc_usermsg( gc->irc, "You were removed from conversation %d", (int) id );
+                serv_got_crap( gc, "You were removed from conversation %d", (int) id );
         
         for( c = gc->conversations; c && c->id != id; c = (l=c)->next );
@@ -798 +798 @@
         for( c = gc->conversations; c && c->id != id; c = c->next );
         
-        /* if( g_strcasecmp( set_getstr( gc->irc, "html" ), "strip" ) == 0 ) */
-        if( gc->flags & OPT_CONN_HTML )
+        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -809 +809 @@
                 irc_privmsg( gc->irc, u, "PRIVMSG", c->channel, "", msg );
         else
-                irc_usermsg( gc->irc, "Message from/to conversation %s@%d (unknown conv/user): %s", who, id, msg );
+                serv_got_crap( gc, "Message from/to conversation %s@%d (unknown conv/user): %s", who, id, msg );
 }
 
@@ -832 +832 @@
         
         s = g_new( char, 16 );
-        sprintf( s, "#chat_%03d", gc->irc->c_id++ );
+        sprintf( s, "&chat_%03d", gc->irc->c_id++ );
         c->channel = g_strdup( s );
         g_free( s );
         
         if( set_getint( gc->irc, "debug" ) )
-                irc_usermsg( gc->irc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
+                serv_got_crap( gc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
         
         return( c );
@@ -856 +856 @@
         
         if( set_getint( b->gc->irc, "debug" ) )
-                irc_usermsg( b->gc->irc, "User %s added to conversation %d", handle, b->id );
+                serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id );
         
         /* It might be yourself! */
@@ -890 +890 @@
         
         if( set_getint( b->gc->irc, "debug" ) )
-                irc_usermsg( b->gc->irc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
+                serv_got_crap( b->gc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
         
         /* It might be yourself! */
@@ -1031 +1031 @@
                 msg = buf;
 
-        if( u->gc->flags & OPT_CONN_HTML) {
-                char * html = escape_html(msg);
-                strncpy(buf, html, 8192);
-                g_free(html);
+        if( ( u->gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        {
+                char *html;
+                
+                html = escape_html( msg );
+                strncpy( buf, html, 8192 );
+                g_free( html );
+                
+                msg = buf;
         }
         

protocols/oscar/im.c

@@ -1996 +1996 @@
 }
 
+/*
+ * Subtype 0x0014 - Send a mini typing notification (mtn) packet.
+ *
+ * This is supported by winaim5 and newer, MacAIM bleh and newer, iChat bleh and newer, 
+ * and Gaim 0.60 and newer.
+ *
+ */
+int aim_im_sendmtn(aim_session_t *sess, guint16 type1, const char *sn, guint16 type2)
+{
+        aim_conn_t *conn;
+        aim_frame_t *fr;
+        aim_snacid_t snacid;
+
+        if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0002)))
+                return -EINVAL;
+
+        if (!sn)
+                return -EINVAL;
+
+        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+11+strlen(sn)+2)))
+                return -ENOMEM;
+
+        snacid = aim_cachesnac(sess, 0x0004, 0x0014, 0x0000, NULL, 0);
+        aim_putsnac(&fr->data, 0x0004, 0x0014, 0x0000, snacid);
+
+        /*
+         * 8 days of light
+         * Er, that is to say, 8 bytes of 0's
+         */
+        aimbs_put16(&fr->data, 0x0000);
+        aimbs_put16(&fr->data, 0x0000);
+        aimbs_put16(&fr->data, 0x0000);
+        aimbs_put16(&fr->data, 0x0000);
+
+        /*
+         * Type 1 (should be 0x0001 for mtn)
+         */
+        aimbs_put16(&fr->data, type1);
+
+        /*
+         * Dest sn
+         */
+        aimbs_put8(&fr->data, strlen(sn));
+        aimbs_putraw(&fr->data, sn, strlen(sn));
+
+        /*
+         * Type 2 (should be 0x0000, 0x0001, or 0x0002 for mtn)
+         */
+        aimbs_put16(&fr->data, type2);
+
+        aim_tx_enqueue(sess, fr);
+
+        return 0;
+}
+
+/*
+ * Subtype 0x0014 - Receive a mini typing notification (mtn) packet.
+ *
+ * This is supported by winaim5 and newer, MacAIM bleh and newer, iChat bleh and newer, 
+ * and Gaim 0.60 and newer.
+ *
+ */
+static int mtn_receive(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
+{
+        int ret = 0;
+        aim_rxcallback_t userfunc;
+        char *sn;
+        guint8 snlen;
+        guint16 type1, type2;
+
+        aim_bstream_advance(bs, 8); /* Unknown - All 0's */
+        type1 = aimbs_get16(bs);
+        snlen = aimbs_get8(bs);
+        sn = aimbs_getstr(bs, snlen);
+        type2 = aimbs_get16(bs);
+
+        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+                ret = userfunc(sess, rx, type1, sn, type2);
+
+        g_free(sn);
+
+        return ret;
+}
+
 static int snachandler(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {
@@ -2011 +2095 @@
         else if (snac->subtype == 0x000c)
                 return msgack(sess, mod, rx, snac, bs);
+        else if (snac->subtype == 0x0014)
+                return mtn_receive(sess, mod, rx, snac, bs);
 
         return 0;

protocols/oscar/im.h

@@ -14 +14 @@
 #define AIM_CB_MSG_CLIENTAUTORESP 0x000b
 #define AIM_CB_MSG_ACK 0x000c
+#define AIM_CB_MSG_MTN 0x0014
 #define AIM_CB_MSG_DEFAULT 0xffff
 
@@ -194 +195 @@
 
 int aim_send_im_ch2_geticqmessage(aim_session_t *sess, const char *sn, int type);
+int aim_im_sendmtn(aim_session_t *sess, guint16 type1, const char *sn, guint16 type2);
 int aim_send_im_ch2_statusmessage(aim_session_t *sess, const char *sender, const guint8 *cookie, const char *message, const guint8 state, const guint16 dc);
 

protocols/oscar/oscar.c

@@ -221 +221 @@
 static int gaim_ssi_parselist    (aim_session_t *, aim_frame_t *, ...);
 static int gaim_ssi_parseack     (aim_session_t *, aim_frame_t *, ...);
-
+static int gaim_parsemtn         (aim_session_t *, aim_frame_t *, ...);
 static int gaim_icqinfo          (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parseaiminfo     (aim_session_t *, aim_frame_t *, ...);
@@ -556 +556 @@
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_SRVACK, gaim_ssi_parseack, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO, gaim_parseaiminfo, 0);
+        aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MTN, gaim_parsemtn, 0);
 
         ((struct oscar_data *)gc->proto_data)->conn = bosconn;
@@ -1676 +1677 @@
 
         /* Maybe senderwarn and recverwarn should be user preferences... */
+        params->flags = 0x0000000b;
         params->maxmsglen = 8000;
         params->minmsginterval = 0;
@@ -2433 +2435 @@
 }
 
+int gaim_parsemtn(aim_session_t *sess, aim_frame_t *fr, ...)
+{
+        struct gaim_connection * gc = sess->aux_data;
+        va_list ap;
+        guint16 type1, type2;
+        char * sn;
+
+        va_start(ap, fr);
+        type1 = va_arg(ap, int);
+        sn = va_arg(ap, char*);
+        type2 = va_arg(ap, int);
+        va_end(ap);
+
+        if(type2 == 0x0001 || type2 == 0x0002)
+                serv_got_typing(gc, sn, 0);
+
+        return 1;
+}
+
 static char *oscar_get_status_string( struct gaim_connection *gc, int number )
 {
@@ -2459 +2480 @@
                 return( "Away" );
         }
+}
+
+int oscar_send_typing(struct gaim_connection *gc, char * who, int typing)
+{
+        struct oscar_data *od = gc->proto_data;
+        return( aim_im_sendmtn(od->sess, 1, who, typing ? 0x0002 : 0x0000) );
 }
 
@@ -2482 +2509 @@
         ret->cmp_buddynames = aim_sncmp;
         ret->get_status_string = oscar_get_status_string;
+        ret->send_typing = oscar_send_typing;
 
         register_protocol(ret);

protocols/util.c

@@ -377 +377 @@
         if( html == NULL )
                 return( NULL );
-        if( g_strncasecmp( html, "<html>", 6 ) == 0 )
-                return( g_strdup( html ) );
         
         ret = g_string_new( "" );

protocols/yahoo/yahoo.c

@@ -845 +845 @@
         if( c )
                 add_chat_buddy( c, who );
-        else if( set_getint( gc->irc, "debug" ) )
-                serv_got_crap( gc, "Got ext_yahoo_conf_userjoin() from %s for unknown conference %s", who, room );
 }
 
@@ -858 +856 @@
         if( c )
                 remove_chat_buddy( c, who, "" );
-        else if( set_getint( gc->irc, "debug" ) )
-                serv_got_crap( gc, "Got ext_yahoo_conf_userleave() from %s for unknown conference %s", who, room );
 }