Changeset e8a6211 for protocols

Timestamp:

2006-10-22T17:00:15Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f0071b7

Parents:

66f783f (diff), 6237ded (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 from main tree.

Location:

protocols

Files:

• msn/msn.c (modified) (3 diffs)
• nogaim.c (modified) (3 diffs)
• oscar/oscar.c (modified) (1 diff)

protocols/msn/msn.c

@@ -42 +42 @@
         struct msn_data *md = g_new0( struct msn_data, 1 );
         
-        set_login_progress( gc, 1, "Connecting" );
-        
         gc->proto_data = md;
         md->fd = -1;
@@ -54 +52 @@
         }
         
+        set_login_progress( gc, 1, "Connecting" );
+        
         md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, gc );
         if( md->fd < 0 )
@@ -59 +59 @@
                 hide_login_progress( gc, "Could not connect to server" );
                 signoff( gc );
-        }
-        else
-        {
-                md->gc = gc;
-                md->away_state = msn_away_state_list;
-                
-                msn_connections = g_slist_append( msn_connections, gc );
-        }
+                return;
+        }
+        
+        md->gc = gc;
+        md->away_state = msn_away_state_list;
+        
+        msn_connections = g_slist_append( msn_connections, gc );
 }
 

protocols/nogaim.c

@@ -578 +578 @@
               ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
         {
-                irc_write( gc->irc, ":%s!%s@%s MODE %s %cv %s", gc->irc->mynick, gc->irc->mynick, gc->irc->myhost,
+                irc_write( gc->irc, ":%s MODE %s %cv %s", gc->irc->myhost,
                                                                 gc->irc->channel, u->away?'-':'+', u->nick );
         }
@@ -912 +912 @@
                                 {
                                         for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
-                                        irc_write( irc, ":%s!%s@%s MODE %s %c%s%s",
-                                                   irc->mynick, irc->mynick, irc->myhost,
+                                        irc_write( irc, ":%s MODE %s %c%s%s",
+                                                   irc->myhost,
                                                    irc->channel, pm, v, list );
                                         
@@ -928 +928 @@
                 /* $v = 'v' x $i */
                 for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
-                irc_write( irc, ":%s!%s@%s MODE %s %c%s%s", irc->mynick, irc->mynick, irc->myhost,
+                irc_write( irc, ":%s MODE %s %c%s%s", irc->myhost,
                                                             irc->channel, pm, v, list );
         }

protocols/oscar/oscar.c

@@ -2297 +2297 @@
         }
         info_string_append(str, "\n", _("Mobile Phone"), info->mobile);
-        info_string_append(str, "\n", _("Gender"), info->gender==1 ? _("Female") : _("Male"));
+        info_string_append(str, "\n", _("Gender"), info->gender==1 ? _("Female") : info->gender==2 ? _("Male") : _("Unknown"));
         if (info->birthyear || info->birthmonth || info->birthday) {
                 char date[30];