comparison libgaim/protocols/msn/switchboard.c @ 20392:9ba7dee775e1

The first msn-p13-merge-head.diff.gz from SF Patch #1621854 from Ka-Hing Cheung. "uploaded a diff, this diff is unchanged from the last tarball that I previously uploaded, except that it's against HEAD. This should be a little easier for most people." (This was apparently msn-p13-merge-head.diff, which SourceForge didn't allow to be uploaded.) PLUS "Updated the diff with basically no change, except with simom's icon fix. The previous diff was broken because some of the files were not added"
author Richard Laager <rlaager@wiktel.com>
date Sun, 15 Apr 2007 03:01:41 +0000
parents d634f88e25d8
children
comparison
equal deleted inserted replaced
20391:0b0ecee55091 20392:9ba7dee775e1
23 */ 23 */
24 #include "msn.h" 24 #include "msn.h"
25 #include "prefs.h" 25 #include "prefs.h"
26 #include "switchboard.h" 26 #include "switchboard.h"
27 #include "notification.h" 27 #include "notification.h"
28 #include "msn-utils.h" 28 #include "msnutils.h"
29 29
30 #include "error.h" 30 #include "error.h"
31 31
32 #define MSN_DEBUG_SB 32 #define MSN_DEBUG_SB
33 33
644 const char *user; 644 const char *user;
645 645
646 swboard = cmdproc->data; 646 swboard = cmdproc->data;
647 user = cmd->params[0]; 647 user = cmd->params[0];
648 648
649 /* cmdproc->data is set to NULL when the switchboard is destroyed;
650 * we may get a bye shortly thereafter. */
651 g_return_if_fail(swboard != NULL);
652
649 if (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL)) 653 if (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL))
650 gaim_debug_error("msn_switchboard", "bye_cmd: helper bug\n"); 654 gaim_debug_error("msn_switchboard", "bye_cmd: helper bug\n");
651 655
652 if (swboard->conv == NULL) 656 if (swboard->conv == NULL)
653 { 657 {