Mon, 21 Aug 2006 22:50:58 +0000
[gaim-migrate @ 16963]
Fix a crazy bug that we found at meebo. I'm not sure it
affects gtk Gaim in quite the same way, but what was
happeing is that the conversation sequence number should
be incremented by 1 each time a new conversation is
created (whether created by someone else or created by
you). However, in one place in Gaim conv_seq was being
incremented BEFORE it was used and in another it was
being incremented AFTER it was used. This can lead to
a sequence number being used twice.
| 8810 | 1 | /** |
| 2 | * @file command.c MSN command functions | |
| 3 | * | |
| 4 | * gaim | |
| 5 | * | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
6 | * Gaim is the legal property of its developers, whose names are too numerous |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
7 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
8 | * source distribution. |
| 8810 | 9 | * |
| 10 | * This program is free software; you can redistribute it and/or modify | |
| 11 | * it under the terms of the GNU General Public License as published by | |
| 12 | * the Free Software Foundation; either version 2 of the License, or | |
| 13 | * (at your option) any later version. | |
| 14 | * | |
| 15 | * This program is distributed in the hope that it will be useful, | |
| 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 | * GNU General Public License for more details. | |
| 19 | * | |
| 20 | * You should have received a copy of the GNU General Public License | |
| 21 | * along with this program; if not, write to the Free Software | |
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 23 | */ | |
| 24 | #include "msn.h" | |
| 25 | #include "command.h" | |
| 26 | ||
|
11897
10853b830964
[gaim-migrate @ 14188]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
27 | static gboolean |
| 8810 | 28 | is_num(char *str) |
| 29 | { | |
| 30 | char *c; | |
| 31 | for (c = str; *c; c++) { | |
| 32 | if (!(g_ascii_isdigit(*c))) | |
| 33 | return FALSE; | |
| 34 | } | |
| 35 | ||
| 36 | return TRUE; | |
| 37 | } | |
| 38 | ||
| 39 | MsnCommand * | |
| 40 | msn_command_from_string(const char *string) | |
| 41 | { | |
| 42 | MsnCommand *cmd; | |
| 43 | char *tmp; | |
| 44 | char *param_start; | |
| 45 | ||
| 46 | g_return_val_if_fail(string != NULL, NULL); | |
| 47 | ||
| 48 | tmp = g_strdup(string); | |
| 49 | param_start = strchr(tmp, ' '); | |
| 50 | ||
| 51 | cmd = g_new0(MsnCommand, 1); | |
| 52 | cmd->command = tmp; | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
53 | |
| 8810 | 54 | if (param_start) |
| 55 | { | |
| 56 | char *param; | |
| 57 | int c; | |
| 58 | ||
| 59 | *param_start++ = '\0'; | |
| 60 | cmd->params = g_strsplit(param_start, " ", 0); | |
| 61 | ||
| 62 | for (c = 0; cmd->params[c]; c++); | |
| 63 | cmd->param_count = c; | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
64 | |
| 8810 | 65 | param = cmd->params[0]; |
| 66 | ||
| 67 | cmd->trId = is_num(param) ? atoi(param) : 0; | |
| 68 | } | |
| 69 | else | |
| 70 | cmd->trId = 0; | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
71 | |
| 8810 | 72 | msn_command_ref(cmd); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
73 | |
| 8810 | 74 | return cmd; |
| 75 | } | |
| 76 | ||
| 77 | void | |
| 78 | msn_command_destroy(MsnCommand *cmd) | |
| 79 | { | |
| 80 | g_return_if_fail(cmd != NULL); | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
81 | |
| 8810 | 82 | if (cmd->ref_count > 0) |
| 83 | { | |
| 84 | msn_command_unref(cmd); | |
| 85 | return; | |
| 86 | } | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
87 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
88 | if (cmd->payload != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
89 | g_free(cmd->payload); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8810
diff
changeset
|
90 | |
| 8810 | 91 | g_free(cmd->command); |
| 92 | g_strfreev(cmd->params); | |
| 93 | g_free(cmd); | |
| 94 | } | |
| 95 | ||
| 96 | MsnCommand * | |
| 97 | msn_command_ref(MsnCommand *cmd) | |
| 98 | { | |
| 99 | g_return_val_if_fail(cmd != NULL, NULL); | |
| 100 | ||
| 101 | cmd->ref_count++; | |
| 102 | return cmd; | |
| 103 | } | |
| 104 | ||
| 105 | MsnCommand * | |
| 106 | msn_command_unref(MsnCommand *cmd) | |
| 107 | { | |
| 108 | g_return_val_if_fail(cmd != NULL, NULL); | |
|
12250
5b14301dd1ec
[gaim-migrate @ 14552]
Richard Laager <rlaager@pidgin.im>
parents:
11897
diff
changeset
|
109 | g_return_val_if_fail(cmd->ref_count > 0, NULL); |
| 8810 | 110 | |
| 111 | cmd->ref_count--; | |
| 112 | ||
| 113 | if (cmd->ref_count == 0) | |
| 114 | { | |
| 115 | msn_command_destroy(cmd); | |
| 116 | return NULL; | |
| 117 | } | |
| 118 | ||
| 119 | return cmd; | |
| 120 | } |