Tue, 12 Mar 2019 21:33:29 -0400
Fix some leaks in libpurple.
| 14520 | 1 | /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ |
| 2086 | 2 | /* |
| 15884 | 3 | * purple |
| 2086 | 4 | * |
| 5 | * Copyright (C) 1998-2001, Mark Spencer <markster@marko.net> | |
| 6 | * Some code borrowed from GtkZephyr, by | |
|
7084
da83f7ead5c6
[gaim-migrate @ 7649]
Christian Hammond <chipx86@chipx86.com>
parents:
7070
diff
changeset
|
7 | * Jag/Sean Dilda <agrajag@linuxpower.org>/<smdilda@unity.ncsu.edu> |
|
da83f7ead5c6
[gaim-migrate @ 7649]
Christian Hammond <chipx86@chipx86.com>
parents:
7070
diff
changeset
|
8 | * http://gtkzephyr.linuxpower.org/ |
| 2086 | 9 | * |
| 9896 | 10 | * Some code borrowed from kzephyr, by |
| 11 | * Chris Colohan <colohan+@cs.cmu.edu> | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
12 | * |
| 2086 | 13 | * This program is free software; you can redistribute it and/or modify |
| 14 | * it under the terms of the GNU General Public License as published by | |
| 15 | * the Free Software Foundation; either version 2 of the License, or | |
| 16 | * (at your option) any later version. | |
| 17 | * | |
| 18 | * This program is distributed in the hope that it will be useful, | |
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 9896 | 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 2086 | 21 | * GNU General Public License for more details. |
| 22 | * | |
| 23 | * You should have received a copy of the GNU General Public License | |
| 24 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19832
diff
changeset
|
25 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 2086 | 26 | * |
| 9896 | 27 | |
| 28 | */ | |
|
15435
4b933b06d75e
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@pidgin.im>
parents:
15369
diff
changeset
|
29 | #include "libpurple/internal.h" |
| 2086 | 30 | |
| 8212 | 31 | #include "accountopt.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5717
diff
changeset
|
32 | #include "debug.h" |
|
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5717
diff
changeset
|
33 | #include "notify.h" |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
34 | #include "plugins.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5717
diff
changeset
|
35 | #include "server.h" |
|
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5717
diff
changeset
|
36 | #include "util.h" |
| 9434 | 37 | #include "cmds.h" |
| 9943 | 38 | #include "version.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5717
diff
changeset
|
39 | |
| 9478 | 40 | #include "internal.h" |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
41 | #include "zephyr.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5717
diff
changeset
|
42 | |
|
8386
5b9e02f4c03d
[gaim-migrate @ 9114]
Mark Doliner <markdoliner@pidgin.im>
parents:
8354
diff
changeset
|
43 | #include <strings.h> |
|
5b9e02f4c03d
[gaim-migrate @ 9114]
Mark Doliner <markdoliner@pidgin.im>
parents:
8354
diff
changeset
|
44 | |
| 8560 | 45 | #define ZEPHYR_FALLBACK_CHARSET "ISO-8859-1" |
| 46 | ||
| 9478 | 47 | /* these are deliberately high, since most people don't send multiple "PING"s */ |
| 48 | #define ZEPHYR_TYPING_SEND_TIMEOUT 15 | |
| 49 | #define ZEPHYR_TYPING_RECV_TIMEOUT 10 | |
| 9896 | 50 | #define ZEPHYR_FD_READ 0 |
| 51 | #define ZEPHYR_FD_WRITE 1 | |
| 9478 | 52 | |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
53 | static PurpleProtocol *my_protocol = NULL; |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
54 | static GSList *cmds = NULL; |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
55 | |
| 2086 | 56 | extern Code_t ZGetLocations(ZLocations_t *, int *); |
| 57 | extern Code_t ZSetLocation(char *); | |
|
22104
56970903b8e9
Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents:
20288
diff
changeset
|
58 | extern Code_t ZUnsetLocation(void); |
| 9478 | 59 | extern Code_t ZGetSubscriptions(ZSubscription_t *, int*); |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
60 | extern char __Zephyr_realm[]; |
| 2086 | 61 | typedef struct _zframe zframe; |
| 62 | typedef struct _zephyr_triple zephyr_triple; | |
| 9610 | 63 | typedef struct _zephyr_account zephyr_account; |
| 9896 | 64 | typedef struct _parse_tree parse_tree; |
| 2086 | 65 | |
| 9896 | 66 | typedef enum { |
| 15884 | 67 | PURPLE_ZEPHYR_NONE, /* Non-kerberized ZEPH0.2 */ |
| 68 | PURPLE_ZEPHYR_KRB4, /* ZEPH0.2 w/ KRB4 support */ | |
| 69 | PURPLE_ZEPHYR_TZC, /* tzc executable proxy */ | |
|
25105
fe13c190ca13
Remove the commas at the end of enumerator lists. This resolves warnings
Florian Quèze <florian@instantbird.org>
parents:
25085
diff
changeset
|
70 | PURPLE_ZEPHYR_INTERGALACTIC_KRB4 /* Kerberized ZEPH0.3 */ |
| 9896 | 71 | } zephyr_connection_type; |
| 9610 | 72 | |
| 73 | struct _zephyr_account { | |
| 15884 | 74 | PurpleAccount* account; |
| 9896 | 75 | char *username; |
| 76 | char *realm; | |
| 77 | char *encoding; | |
| 78 | char* galaxy; /* not yet useful */ | |
| 79 | char* krbtkfile; /* not yet useful */ | |
| 80 | guint32 nottimer; | |
| 81 | guint32 loctimer; | |
| 82 | GList *pending_zloc_names; | |
| 83 | GSList *subscrips; | |
| 84 | int last_id; | |
| 85 | unsigned short port; | |
| 86 | char ourhost[HOST_NAME_MAX + 1]; | |
| 87 | char ourhostcanon[HOST_NAME_MAX + 1]; | |
| 88 | zephyr_connection_type connection_type; | |
| 89 | int totzc[2]; | |
| 90 | int fromtzc[2]; | |
| 91 | char *exposure; | |
| 9986 | 92 | pid_t tzc_pid; |
| 93 | gchar *away; | |
| 9610 | 94 | }; |
| 9478 | 95 | |
| 9896 | 96 | #define MAXCHILDREN 20 |
| 97 | ||
| 98 | struct _parse_tree { | |
| 99 | gchar* contents; | |
| 100 | parse_tree *children[MAXCHILDREN]; | |
| 101 | int num_children; | |
| 102 | }; | |
| 103 | ||
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
104 | parse_tree null_parse_tree = { |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
105 | "", |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
106 | {NULL}, |
| 9896 | 107 | 0, |
| 108 | }; | |
| 109 | ||
| 15884 | 110 | #define use_none(zephyr) ((zephyr->connection_type == PURPLE_ZEPHYR_NONE)?1:0) |
| 111 | #define use_krb4(zephyr) ((zephyr->connection_type == PURPLE_ZEPHYR_KRB4)?1:0) | |
| 112 | #define use_tzc(zephyr) ((zephyr->connection_type == PURPLE_ZEPHYR_TZC)?1:0) | |
| 9896 | 113 | |
| 15884 | 114 | #define use_zeph02(zephyr) ( (zephyr->connection_type == PURPLE_ZEPHYR_NONE)?1: ((zephyr->connection_type == PURPLE_ZEPHYR_KRB4)?1:0)) |
| 9896 | 115 | |
| 2086 | 116 | /* struct I need for zephyr_to_html */ |
| 117 | struct _zframe { | |
| 118 | /* true for everything but @color, since inside the parens of that one is | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
119 | * the color. */ |
| 2086 | 120 | gboolean has_closer; |
| 14520 | 121 | /* @i, @b, etc. */ |
| 122 | const char *env; | |
| 123 | /* }=1, ]=2, )=4, >=8 */ | |
| 124 | int closer_mask; | |
| 125 | /* }, ], ), > */ | |
| 126 | char *closer; | |
| 2086 | 127 | /* </i>, </font>, </b>, etc. */ |
| 14520 | 128 | const char *closing; |
| 2086 | 129 | /* text including the opening html thingie. */ |
| 130 | GString *text; | |
| 14520 | 131 | /* href for links */ |
| 132 | gboolean is_href; | |
| 133 | GString *href; | |
| 2086 | 134 | struct _zframe *enclosing; |
| 135 | }; | |
| 136 | ||
| 137 | struct _zephyr_triple { | |
| 138 | char *class; | |
| 139 | char *instance; | |
| 140 | char *recipient; | |
| 141 | char *name; | |
| 142 | gboolean open; | |
| 143 | int id; | |
| 144 | }; | |
| 145 | ||
| 146 | #define z_call(func) if (func != ZERR_NONE)\ | |
| 147 | return; | |
| 148 | #define z_call_r(func) if (func != ZERR_NONE)\ | |
| 149 | return TRUE; | |
| 9896 | 150 | |
| 2086 | 151 | #define z_call_s(func, err) if (func != ZERR_NONE) {\ |
|
32157
39ba2e2492ee
Rename purple_connection_error_reason to purple_connection_error
Mark Doliner <markdoliner@pidgin.im>
parents:
32154
diff
changeset
|
152 | purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, err);\ |
| 2086 | 153 | return;\ |
| 154 | } | |
| 155 | ||
| 10867 | 156 | #ifdef WIN32 |
| 157 | extern const char *username; | |
| 158 | #endif | |
| 9896 | 159 | |
|
12424
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
12216
diff
changeset
|
160 | static Code_t zephyr_subscribe_to(zephyr_account* zephyr, char* class, char *instance, char *recipient, char* galaxy) { |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
161 | size_t result; |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
162 | Code_t ret_val = -1; |
| 9328 | 163 | |
| 9896 | 164 | if (use_tzc(zephyr)) { |
| 165 | /* ((tzcfodder . subscribe) ("class" "instance" "recipient")) */ | |
| 166 | gchar *zsubstr = g_strdup_printf("((tzcfodder . subscribe) (\"%s\" \"%s\" \"%s\"))\n",class,instance,recipient); | |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
167 | size_t len = strlen(zsubstr); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
168 | result = write(zephyr->totzc[ZEPHYR_FD_WRITE],zsubstr,len); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
169 | if (result != len) { |
|
22257
dd49963fe3f6
Use g_strerror() instead of strerror() in a few places.
Richard Laager <rlaager@pidgin.im>
parents:
22197
diff
changeset
|
170 | purple_debug_error("zephyr", "Unable to write a message: %s\n", g_strerror(errno)); |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
171 | } else { |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
172 | ret_val = ZERR_NONE; |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
173 | } |
| 9896 | 174 | g_free(zsubstr); |
| 175 | } | |
| 176 | else { | |
| 177 | if (use_zeph02(zephyr)) { | |
| 178 | ZSubscription_t sub; | |
| 179 | sub.zsub_class = class; | |
| 180 | sub.zsub_classinst = instance; | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
181 | sub.zsub_recipient = recipient; |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
182 | ret_val = ZSubscribeTo(&sub,1,0); |
| 9896 | 183 | } |
| 184 | } | |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
185 | return ret_val; |
| 9896 | 186 | } |
| 187 | ||
| 188 | char *local_zephyr_normalize(zephyr_account* zephyr,const char *); | |
| 15884 | 189 | static void zephyr_chat_set_topic(PurpleConnection * gc, int id, const char *topic); |
| 9896 | 190 | char* zephyr_tzc_deescape_str(const char *message); |
| 191 | ||
|
12424
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
12216
diff
changeset
|
192 | static char *zephyr_strip_local_realm(zephyr_account* zephyr,const char* user){ |
| 9896 | 193 | /* |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
194 | Takes in a username of the form username or username@realm |
| 9896 | 195 | and returns: |
| 196 | username, if there is no realm, or the realm is the local realm | |
| 197 | or: | |
| 198 | username@realm if there is a realm and it is foreign | |
| 199 | */ | |
| 9328 | 200 | char *tmp = g_strdup(user); |
| 201 | char *at = strchr(tmp,'@'); | |
| 9896 | 202 | if (at && !g_ascii_strcasecmp(at+1,zephyr->realm)) { |
| 9328 | 203 | /* We're passed in a username of the form user@users-realm */ |
| 204 | char* tmp2; | |
| 205 | *at = '\0'; | |
| 206 | tmp2 = g_strdup(tmp); | |
| 207 | g_free(tmp); | |
| 208 | return tmp2; | |
| 209 | } | |
| 210 | else { | |
| 211 | /* We're passed in a username of the form user or user@foreign-realm */ | |
| 212 | return tmp; | |
| 213 | } | |
| 214 | } | |
| 2086 | 215 | |
| 216 | /* this is so bad, and if Zephyr weren't so fucked up to begin with I | |
| 217 | * wouldn't do this. but it is so i will. */ | |
| 9610 | 218 | |
| 9328 | 219 | /* just for debugging */ |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
220 | static void handle_unknown(ZNotice_t *notice) |
| 2086 | 221 | { |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
222 | purple_debug_error("zephyr","z_packet: %s\n", notice->z_packet); |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
223 | purple_debug_error("zephyr","z_version: %s\n", notice->z_version); |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
224 | purple_debug_error("zephyr","z_kind: %d\n", (int)(notice->z_kind)); |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
225 | purple_debug_error("zephyr","z_class: %s\n", notice->z_class); |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
226 | purple_debug_error("zephyr","z_class_inst: %s\n", notice->z_class_inst); |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
227 | purple_debug_error("zephyr","z_opcode: %s\n", notice->z_opcode); |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
228 | purple_debug_error("zephyr","z_sender: %s\n", notice->z_sender); |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
229 | purple_debug_error("zephyr","z_recipient: %s\n", notice->z_recipient); |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
230 | purple_debug_error("zephyr","z_message: %s\n", notice->z_message); |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
231 | purple_debug_error("zephyr","z_message_len: %d\n", notice->z_message_len); |
| 2086 | 232 | } |
| 9328 | 233 | |
| 2086 | 234 | |
| 9610 | 235 | static zephyr_triple *new_triple(zephyr_account *zephyr,const char *c, const char *i, const char *r) |
| 2086 | 236 | { |
| 237 | zephyr_triple *zt; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
238 | |
| 2086 | 239 | zt = g_new0(zephyr_triple, 1); |
| 240 | zt->class = g_strdup(c); | |
| 241 | zt->instance = g_strdup(i); | |
| 242 | zt->recipient = g_strdup(r); | |
| 9610 | 243 | zt->name = g_strdup_printf("%s,%s,%s", c, i?i:"", r?r:""); |
| 244 | zt->id = ++(zephyr->last_id); | |
| 2086 | 245 | zt->open = FALSE; |
| 246 | return zt; | |
| 247 | } | |
| 248 | ||
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
249 | static void free_triple(zephyr_triple * zt) |
| 2086 | 250 | { |
| 251 | g_free(zt->class); | |
| 252 | g_free(zt->instance); | |
| 253 | g_free(zt->recipient); | |
| 254 | g_free(zt->name); | |
| 255 | g_free(zt); | |
| 256 | } | |
| 257 | ||
| 9328 | 258 | /* returns true if zt1 is a subset of zt2. This function is used to |
| 259 | determine whether a zephyr sent to zt1 should be placed in the chat | |
| 260 | with triple zt2 | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
261 | |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
262 | zt1 is a subset of zt2 |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
263 | iff. the classnames are identical ignoring case |
| 9328 | 264 | AND. the instance names are identical (ignoring case), or zt2->instance is *. |
| 265 | AND. the recipient names are identical | |
| 266 | */ | |
| 267 | ||
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
268 | static gboolean triple_subset(zephyr_triple * zt1, zephyr_triple * zt2) |
| 2086 | 269 | { |
| 9896 | 270 | |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
271 | if (!zt2) { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
272 | purple_debug_error("zephyr","zt2 doesn't exist\n"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
273 | return FALSE; |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
274 | } |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
275 | if (!zt1) { |
| 15884 | 276 | purple_debug_error("zephyr","zt1 doesn't exist\n"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
277 | return FALSE; |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
278 | } |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
279 | if (!(zt1->class)) { |
| 15884 | 280 | purple_debug_error("zephyr","zt1c doesn't exist\n"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
281 | return FALSE; |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
282 | } |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
283 | if (!(zt1->instance)) { |
| 15884 | 284 | purple_debug_error("zephyr","zt1i doesn't exist\n"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
285 | return FALSE; |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
286 | } |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
287 | if (!(zt1->recipient)) { |
| 15884 | 288 | purple_debug_error("zephyr","zt1r doesn't exist\n"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
289 | return FALSE; |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
290 | } |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
291 | if (!(zt2->class)) { |
| 15884 | 292 | purple_debug_error("zephyr","zt2c doesn't exist\n"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
293 | return FALSE; |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
294 | } |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
295 | if (!(zt2->recipient)) { |
| 15884 | 296 | purple_debug_error("zephyr","zt2r doesn't exist\n"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
297 | return FALSE; |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
298 | } |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
299 | if (!(zt2->instance)) { |
| 15884 | 300 | purple_debug_error("zephyr","zt2i doesn't exist\n"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
301 | return FALSE; |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
302 | } |
| 9896 | 303 | |
| 9328 | 304 | if (g_ascii_strcasecmp(zt2->class, zt1->class)) { |
| 2086 | 305 | return FALSE; |
| 306 | } | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
307 | if (g_ascii_strcasecmp(zt2->instance, zt1->instance) && g_ascii_strcasecmp(zt2->instance, "*")) { |
| 2086 | 308 | return FALSE; |
| 309 | } | |
| 9328 | 310 | if (g_ascii_strcasecmp(zt2->recipient, zt1->recipient)) { |
| 2086 | 311 | return FALSE; |
| 312 | } | |
| 15884 | 313 | purple_debug_info("zephyr","<%s,%s,%s> is in <%s,%s,%s>\n",zt1->class,zt1->instance,zt1->recipient,zt2->class,zt2->instance,zt2->recipient); |
| 2086 | 314 | return TRUE; |
| 315 | } | |
| 316 | ||
| 9610 | 317 | static zephyr_triple *find_sub_by_triple(zephyr_account *zephyr,zephyr_triple * zt) |
| 2086 | 318 | { |
| 319 | zephyr_triple *curr_t; | |
| 9610 | 320 | GSList *curr = zephyr->subscrips; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
321 | |
| 2086 | 322 | while (curr) { |
| 323 | curr_t = curr->data; | |
| 324 | if (triple_subset(zt, curr_t)) | |
| 325 | return curr_t; | |
| 326 | curr = curr->next; | |
| 327 | } | |
| 328 | return NULL; | |
| 329 | } | |
| 330 | ||
| 9610 | 331 | static zephyr_triple *find_sub_by_id(zephyr_account *zephyr,int id) |
| 2086 | 332 | { |
| 333 | zephyr_triple *zt; | |
| 9610 | 334 | GSList *curr = zephyr->subscrips; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
335 | |
| 2086 | 336 | while (curr) { |
| 337 | zt = curr->data; | |
| 338 | if (zt->id == id) | |
| 339 | return zt; | |
| 340 | curr = curr->next; | |
| 341 | } | |
| 342 | return NULL; | |
| 343 | } | |
| 344 | ||
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
345 | /* |
| 9434 | 346 | Converts strings to utf-8 if necessary using user specified encoding |
| 9328 | 347 | */ |
| 348 | ||
|
24806
467284acbc0c
Remove the length parameter from zephyr_recv_convert(), because we were
Richard Laager <rlaager@pidgin.im>
parents:
24756
diff
changeset
|
349 | static gchar *zephyr_recv_convert(PurpleConnection *gc, gchar *string) |
| 8560 | 350 | { |
| 351 | gchar *utf8; | |
| 352 | GError *err = NULL; | |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
353 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 24808 | 354 | if (g_utf8_validate(string, -1, NULL)) { |
|
8568
66907b37ce85
[gaim-migrate @ 9316]
Mark Doliner <markdoliner@pidgin.im>
parents:
8562
diff
changeset
|
355 | return g_strdup(string); |
|
66907b37ce85
[gaim-migrate @ 9316]
Mark Doliner <markdoliner@pidgin.im>
parents:
8562
diff
changeset
|
356 | } else { |
|
24806
467284acbc0c
Remove the length parameter from zephyr_recv_convert(), because we were
Richard Laager <rlaager@pidgin.im>
parents:
24756
diff
changeset
|
357 | utf8 = g_convert(string, -1, "UTF-8", zephyr->encoding, NULL, NULL, &err); |
|
8568
66907b37ce85
[gaim-migrate @ 9316]
Mark Doliner <markdoliner@pidgin.im>
parents:
8562
diff
changeset
|
358 | if (err) { |
| 15884 | 359 | purple_debug_error("zephyr", "recv conversion error: %s\n", err->message); |
| 9896 | 360 | utf8 = g_strdup(_("(There was an error converting this message. Check the 'Encoding' option in the Account Editor)")); |
| 8954 | 361 | g_error_free(err); |
|
8568
66907b37ce85
[gaim-migrate @ 9316]
Mark Doliner <markdoliner@pidgin.im>
parents:
8562
diff
changeset
|
362 | } |
|
66907b37ce85
[gaim-migrate @ 9316]
Mark Doliner <markdoliner@pidgin.im>
parents:
8562
diff
changeset
|
363 | |
|
66907b37ce85
[gaim-migrate @ 9316]
Mark Doliner <markdoliner@pidgin.im>
parents:
8562
diff
changeset
|
364 | return utf8; |
|
66907b37ce85
[gaim-migrate @ 9316]
Mark Doliner <markdoliner@pidgin.im>
parents:
8562
diff
changeset
|
365 | } |
| 8560 | 366 | } |
| 367 | ||
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
368 | /* This parses HTML formatting (put out by one of the gtkimhtml widgets |
| 8451 | 369 | And converts it to zephyr formatting. |
| 370 | It currently deals properly with <b>, <br>, <i>, <font face=...>, <font color=...>, | |
| 371 | It ignores <font back=...> | |
| 372 | It does | |
| 373 | <font size = "1 or 2" -> @small | |
| 374 | 3 or 4 @medium() | |
| 375 | 5,6, or 7 @large() | |
| 14520 | 376 | <a href is dealt with by outputting "description <link>" or just "description" as appropriate |
| 8451 | 377 | */ |
| 378 | ||
| 379 | static char *html_to_zephyr(const char *message) | |
| 380 | { | |
| 14520 | 381 | zframe *frames, *new_f; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
382 | char *ret; |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
383 | |
| 14520 | 384 | if (*message == '\0') |
| 9478 | 385 | return g_strdup(""); |
| 386 | ||
| 14520 | 387 | frames = g_new(zframe, 1); |
| 388 | frames->text = g_string_new(""); | |
| 389 | frames->href = NULL; | |
| 390 | frames->is_href = FALSE; | |
| 391 | frames->enclosing = NULL; | |
| 392 | frames->closing = NULL; | |
| 393 | frames->env = ""; | |
| 394 | frames->has_closer = FALSE; | |
| 395 | frames->closer_mask = 15; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
396 | |
| 15884 | 397 | purple_debug_info("zephyr","html received %s\n",message); |
| 14520 | 398 | while (*message) { |
| 399 | if (frames->closing && !g_ascii_strncasecmp(message, frames->closing, strlen(frames->closing))) { | |
| 400 | zframe *popped; | |
| 401 | message += strlen(frames->closing); | |
| 402 | popped = frames; | |
| 403 | frames = frames->enclosing; | |
| 404 | if (popped->is_href) { | |
| 405 | frames->href = popped->text; | |
| 406 | } else { | |
| 407 | g_string_append(frames->text, popped->env); | |
| 408 | if (popped->has_closer) { | |
| 409 | g_string_append_c(frames->text, | |
| 410 | (popped->closer_mask & 1) ? '{' : | |
| 411 | (popped->closer_mask & 2) ? '[' : | |
| 412 | (popped->closer_mask & 4) ? '(' : | |
| 413 | '<'); | |
| 9896 | 414 | } |
| 14520 | 415 | g_string_append(frames->text, popped->text->str); |
| 416 | if (popped->href) | |
| 417 | { | |
| 418 | int text_len = strlen(popped->text->str), href_len = strlen(popped->href->str); | |
| 419 | if (!((text_len == href_len && !strncmp(popped->href->str, popped->text->str, text_len)) || | |
| 420 | (7 + text_len == href_len && !strncmp(popped->href->str, "http://", 7) && | |
| 421 | !strncmp(popped->href->str + 7, popped->text->str, text_len)) || | |
| 422 | (7 + text_len == href_len && !strncmp(popped->href->str, "mailto:", 7) && | |
| 423 | !strncmp(popped->href->str + 7, popped->text->str, text_len)))) { | |
| 424 | g_string_append(frames->text, " <"); | |
| 425 | g_string_append(frames->text, popped->href->str); | |
| 426 | if (popped->closer_mask & ~8) { | |
| 427 | g_string_append_c(frames->text, '>'); | |
| 428 | popped->closer_mask &= ~8; | |
| 429 | } else { | |
| 430 | g_string_append(frames->text, "@{>}"); | |
| 431 | } | |
| 432 | } | |
| 433 | g_string_free(popped->href, TRUE); | |
| 9896 | 434 | } |
| 14520 | 435 | if (popped->has_closer) { |
| 436 | g_string_append_c(frames->text, | |
| 437 | (popped->closer_mask & 1) ? '}' : | |
| 438 | (popped->closer_mask & 2) ? ']' : | |
| 439 | (popped->closer_mask & 4) ? ')' : | |
| 440 | '>'); | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
441 | } |
| 14520 | 442 | if (!popped->has_closer) |
| 443 | frames->closer_mask = popped->closer_mask; | |
| 444 | g_string_free(popped->text, TRUE); | |
| 445 | } | |
| 446 | g_free(popped); | |
| 447 | } else if (*message == '<') { | |
| 448 | if (!g_ascii_strncasecmp(message + 1, "i>", 2)) { | |
| 449 | new_f = g_new(zframe, 1); | |
| 450 | new_f->enclosing = frames; | |
| 451 | new_f->text = g_string_new(""); | |
| 452 | new_f->href = NULL; | |
| 453 | new_f->is_href = FALSE; | |
| 454 | new_f->closing = "</i>"; | |
| 455 | new_f->env = "@i"; | |
| 456 | new_f->has_closer = TRUE; | |
| 457 | new_f->closer_mask = 15; | |
| 458 | frames = new_f; | |
| 459 | message += 3; | |
| 460 | } else if (!g_ascii_strncasecmp(message + 1, "b>", 2)) { | |
| 461 | new_f = g_new(zframe, 1); | |
| 462 | new_f->enclosing = frames; | |
| 463 | new_f->text = g_string_new(""); | |
| 464 | new_f->href = NULL; | |
| 465 | new_f->is_href = FALSE; | |
| 466 | new_f->closing = "</b>"; | |
| 467 | new_f->env = "@b"; | |
| 468 | new_f->has_closer = TRUE; | |
| 469 | new_f->closer_mask = 15; | |
| 470 | frames = new_f; | |
| 471 | message += 3; | |
| 472 | } else if (!g_ascii_strncasecmp(message + 1, "br>", 3)) { | |
| 473 | g_string_append_c(frames->text, '\n'); | |
| 474 | message += 4; | |
| 475 | } else if (!g_ascii_strncasecmp(message + 1, "a href=\"", 8)) { | |
| 476 | message += 9; | |
| 477 | new_f = g_new(zframe, 1); | |
| 478 | new_f->enclosing = frames; | |
| 479 | new_f->text = g_string_new(""); | |
| 480 | new_f->href = NULL; | |
| 481 | new_f->is_href = FALSE; | |
| 482 | new_f->closing = "</a>"; | |
| 483 | new_f->env = ""; | |
| 484 | new_f->has_closer = FALSE; | |
| 485 | new_f->closer_mask = frames->closer_mask; | |
| 486 | frames = new_f; | |
| 487 | new_f = g_new(zframe, 1); | |
| 488 | new_f->enclosing = frames; | |
| 489 | new_f->text = g_string_new(""); | |
| 490 | new_f->href = NULL; | |
| 491 | new_f->is_href = TRUE; | |
| 492 | new_f->closing = "\">"; | |
| 493 | new_f->has_closer = FALSE; | |
| 494 | new_f->closer_mask = frames->closer_mask; | |
| 495 | frames = new_f; | |
| 496 | } else if (!g_ascii_strncasecmp(message + 1, "font", 4)) { | |
| 497 | new_f = g_new(zframe, 1); | |
| 498 | new_f->enclosing = frames; | |
| 499 | new_f->text = g_string_new(""); | |
| 500 | new_f->href = NULL; | |
| 501 | new_f->is_href = FALSE; | |
| 502 | new_f->closing = "</font>"; | |
| 503 | new_f->has_closer = TRUE; | |
| 504 | new_f->closer_mask = 15; | |
| 505 | message += 5; | |
| 506 | while (*message == ' ') | |
| 507 | message++; | |
| 508 | if (!g_ascii_strncasecmp(message, "color=\"", 7)) { | |
| 509 | message += 7; | |
| 510 | new_f->env = "@"; | |
| 511 | frames = new_f; | |
| 512 | new_f = g_new(zframe, 1); | |
| 513 | new_f->enclosing = frames; | |
| 514 | new_f->env = "@color"; | |
| 515 | new_f->text = g_string_new(""); | |
| 516 | new_f->href = NULL; | |
| 517 | new_f->is_href = FALSE; | |
| 518 | new_f->closing = "\">"; | |
| 519 | new_f->has_closer = TRUE; | |
| 520 | new_f->closer_mask = 15; | |
| 521 | } else if (!g_ascii_strncasecmp(message, "face=\"", 6)) { | |
| 522 | message += 6; | |
| 523 | new_f->env = "@"; | |
| 524 | frames = new_f; | |
| 525 | new_f = g_new(zframe, 1); | |
| 526 | new_f->enclosing = frames; | |
| 527 | new_f->env = "@font"; | |
| 528 | new_f->text = g_string_new(""); | |
| 529 | new_f->href = NULL; | |
| 530 | new_f->is_href = FALSE; | |
| 531 | new_f->closing = "\">"; | |
| 532 | new_f->has_closer = TRUE; | |
| 533 | new_f->closer_mask = 15; | |
| 534 | } else if (!g_ascii_strncasecmp(message, "size=\"", 6)) { | |
| 535 | message += 6; | |
| 536 | if ((*message == '1') || (*message == '2')) { | |
| 537 | new_f->env = "@small"; | |
| 538 | } else if ((*message == '3') | |
| 539 | || (*message == '4')) { | |
| 540 | new_f->env = "@medium"; | |
| 541 | } else if ((*message == '5') | |
| 542 | || (*message == '6') | |
| 543 | || (*message == '7')) { | |
| 544 | new_f->env = "@large"; | |
| 545 | } else { | |
| 546 | new_f->env = ""; | |
| 547 | new_f->has_closer = FALSE; | |
| 548 | new_f->closer_mask = frames->closer_mask; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
549 | } |
| 14520 | 550 | message += 3; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
551 | } else { |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
552 | /* Drop all unrecognized/misparsed font tags */ |
| 14520 | 553 | new_f->env = ""; |
| 554 | new_f->has_closer = FALSE; | |
| 555 | new_f->closer_mask = frames->closer_mask; | |
| 556 | while (g_ascii_strncasecmp(message, "\">", 2) != 0) { | |
| 557 | message++; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
558 | } |
| 14520 | 559 | if (*message != '\0') |
| 560 | message += 2; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
561 | } |
| 14520 | 562 | frames = new_f; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
563 | } else { |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
564 | /* Catch all for all unrecognized/misparsed <foo> tage */ |
| 14520 | 565 | g_string_append_c(frames->text, *message++); |
| 566 | } | |
| 567 | } else if (*message == '@') { | |
| 568 | g_string_append(frames->text, "@@"); | |
| 569 | message++; | |
| 570 | } else if (*message == '}') { | |
| 571 | if (frames->closer_mask & ~1) { | |
| 572 | frames->closer_mask &= ~1; | |
| 573 | g_string_append_c(frames->text, *message++); | |
| 574 | } else { | |
| 575 | g_string_append(frames->text, "@[}]"); | |
| 576 | message++; | |
| 577 | } | |
| 578 | } else if (*message == ']') { | |
| 579 | if (frames->closer_mask & ~2) { | |
| 580 | frames->closer_mask &= ~2; | |
| 581 | g_string_append_c(frames->text, *message++); | |
| 582 | } else { | |
| 583 | g_string_append(frames->text, "@{]}"); | |
| 584 | message++; | |
| 585 | } | |
| 586 | } else if (*message == ')') { | |
| 587 | if (frames->closer_mask & ~4) { | |
| 588 | frames->closer_mask &= ~4; | |
| 589 | g_string_append_c(frames->text, *message++); | |
| 590 | } else { | |
| 591 | g_string_append(frames->text, "@{)}"); | |
| 592 | message++; | |
| 593 | } | |
| 594 | } else if (!g_ascii_strncasecmp(message, ">", 4)) { | |
| 595 | if (frames->closer_mask & ~8) { | |
| 596 | frames->closer_mask &= ~8; | |
| 597 | g_string_append_c(frames->text, *message++); | |
| 598 | } else { | |
| 599 | g_string_append(frames->text, "@{>}"); | |
| 600 | message += 4; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
601 | } |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
602 | } else { |
| 14520 | 603 | g_string_append_c(frames->text, *message++); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
604 | } |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
605 | } |
| 14520 | 606 | ret = frames->text->str; |
| 607 | g_string_free(frames->text, FALSE); | |
| 608 | g_free(frames); | |
| 15884 | 609 | purple_debug_info("zephyr","zephyr outputted %s\n",ret); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
610 | return ret; |
| 8451 | 611 | } |
| 612 | ||
| 2086 | 613 | /* this parses zephyr formatting and converts it to html. For example, if |
| 614 | * you pass in "@{@color(blue)@i(hello)}" you should get out | |
| 615 | * "<font color=blue><i>hello</i></font>". */ | |
| 14520 | 616 | static char *zephyr_to_html(const char *message) |
| 2086 | 617 | { |
| 618 | zframe *frames, *curr; | |
| 619 | char *ret; | |
| 620 | ||
| 621 | frames = g_new(zframe, 1); | |
| 622 | frames->text = g_string_new(""); | |
| 623 | frames->enclosing = NULL; | |
| 624 | frames->closing = ""; | |
| 625 | frames->has_closer = FALSE; | |
| 14520 | 626 | frames->closer = NULL; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
627 | |
| 14520 | 628 | while (*message) { |
| 629 | if (*message == '@' && message[1] == '@') { | |
| 630 | g_string_append(frames->text, "@"); | |
| 631 | message += 2; | |
| 632 | } else if (*message == '@') { | |
| 633 | int end; | |
| 634 | for (end = 1; message[end] && (isalnum(message[end]) || message[end] == '_'); end++); | |
| 635 | if (message[end] && | |
| 636 | (message[end] == '{' || message[end] == '[' || message[end] == '(' || | |
| 637 | !g_ascii_strncasecmp(message + end, "<", 4))) { | |
| 638 | zframe *new_f; | |
| 639 | char *buf; | |
| 640 | buf = g_new0(char, end); | |
| 641 | g_snprintf(buf, end, "%s", message + 1); | |
| 642 | message += end; | |
| 8451 | 643 | new_f = g_new(zframe, 1); |
| 644 | new_f->enclosing = frames; | |
| 2086 | 645 | new_f->has_closer = TRUE; |
| 14520 | 646 | new_f->closer = (*message == '{' ? "}" : |
| 647 | *message == '[' ? "]" : | |
| 648 | *message == '(' ? ")" : | |
| 649 | ">"); | |
| 650 | message += (*message == '&' ? 4 : 1); | |
| 651 | if (!g_ascii_strcasecmp(buf, "italic") || !g_ascii_strcasecmp(buf, "i")) { | |
| 652 | new_f->text = g_string_new("<i>"); | |
| 653 | new_f->closing = "</i>"; | |
| 654 | } else if (!g_ascii_strcasecmp(buf, "small")) { | |
| 655 | new_f->text = g_string_new("<font size=\"1\">"); | |
| 656 | new_f->closing = "</font>"; | |
| 657 | } else if (!g_ascii_strcasecmp(buf, "medium")) { | |
| 658 | new_f->text = g_string_new("<font size=\"3\">"); | |
| 659 | new_f->closing = "</font>"; | |
| 660 | } else if (!g_ascii_strcasecmp(buf, "large")) { | |
| 661 | new_f->text = g_string_new("<font size=\"7\">"); | |
| 662 | new_f->closing = "</font>"; | |
| 663 | } else if (!g_ascii_strcasecmp(buf, "bold") | |
| 664 | || !g_ascii_strcasecmp(buf, "b")) { | |
| 665 | new_f->text = g_string_new("<b>"); | |
| 666 | new_f->closing = "</b>"; | |
| 667 | } else if (!g_ascii_strcasecmp(buf, "font")) { | |
| 668 | zframe *extra_f; | |
| 669 | extra_f = g_new(zframe, 1); | |
| 670 | extra_f->enclosing = frames; | |
| 671 | new_f->enclosing = extra_f; | |
| 672 | extra_f->text = g_string_new(""); | |
| 673 | extra_f->has_closer = FALSE; | |
| 674 | extra_f->closer = frames->closer; | |
| 675 | extra_f->closing = "</font>"; | |
| 676 | new_f->text = g_string_new("<font face=\""); | |
| 677 | new_f->closing = "\">"; | |
| 678 | } else if (!g_ascii_strcasecmp(buf, "color")) { | |
| 679 | zframe *extra_f; | |
| 680 | extra_f = g_new(zframe, 1); | |
| 681 | extra_f->enclosing = frames; | |
| 682 | new_f->enclosing = extra_f; | |
| 683 | extra_f->text = g_string_new(""); | |
| 684 | extra_f->has_closer = FALSE; | |
| 685 | extra_f->closer = frames->closer; | |
| 686 | extra_f->closing = "</font>"; | |
| 687 | new_f->text = g_string_new("<font color=\""); | |
| 688 | new_f->closing = "\">"; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
689 | } else { |
| 2086 | 690 | new_f->text = g_string_new(""); |
| 691 | new_f->closing = ""; | |
| 692 | } | |
| 14520 | 693 | frames = new_f; |
| 694 | } else { | |
| 695 | /* Not a formatting tag, add the character as normal. */ | |
| 696 | g_string_append_c(frames->text, *message++); | |
| 2086 | 697 | } |
| 14520 | 698 | } else if (frames->closer && !g_ascii_strncasecmp(message, frames->closer, strlen(frames->closer))) { |
| 2086 | 699 | zframe *popped; |
| 700 | gboolean last_had_closer; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
701 | |
| 14520 | 702 | message += strlen(frames->closer); |
|
36029
cd7db320cf5c
Fix coverity regression warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35993
diff
changeset
|
703 | if (frames->enclosing) { |
| 2086 | 704 | do { |
| 705 | popped = frames; | |
| 706 | frames = frames->enclosing; | |
| 707 | g_string_append(frames->text, popped->text->str); | |
| 708 | g_string_append(frames->text, popped->closing); | |
| 709 | g_string_free(popped->text, TRUE); | |
| 710 | last_had_closer = popped->has_closer; | |
| 711 | g_free(popped); | |
|
36029
cd7db320cf5c
Fix coverity regression warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35993
diff
changeset
|
712 | } while (frames->enclosing && !last_had_closer); |
| 2086 | 713 | } else { |
| 14520 | 714 | g_string_append_c(frames->text, *message); |
| 2086 | 715 | } |
| 14520 | 716 | } else if (*message == '\n') { |
| 2086 | 717 | g_string_append(frames->text, "<br>"); |
| 14520 | 718 | message++; |
| 2086 | 719 | } else { |
| 14520 | 720 | g_string_append_c(frames->text, *message++); |
| 2086 | 721 | } |
| 722 | } | |
| 723 | /* go through all the stuff that they didn't close */ | |
| 724 | while (frames->enclosing) { | |
| 725 | curr = frames; | |
| 726 | g_string_append(frames->enclosing->text, frames->text->str); | |
| 727 | g_string_append(frames->enclosing->text, frames->closing); | |
| 728 | g_string_free(frames->text, TRUE); | |
| 729 | frames = frames->enclosing; | |
| 730 | g_free(curr); | |
| 731 | } | |
| 732 | ret = frames->text->str; | |
| 733 | g_string_free(frames->text, FALSE); | |
| 734 | g_free(frames); | |
| 735 | return ret; | |
| 736 | } | |
| 737 | ||
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
738 | static gboolean pending_zloc(zephyr_account *zephyr, const char *who) |
| 2086 | 739 | { |
| 740 | GList *curr; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
741 | |
| 9610 | 742 | for (curr = zephyr->pending_zloc_names; curr != NULL; curr = curr->next) { |
| 9896 | 743 | char* normalized_who = local_zephyr_normalize(zephyr,who); |
| 9328 | 744 | if (!g_ascii_strcasecmp(normalized_who, (char *)curr->data)) { |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
745 | g_free((char *)curr->data); |
| 9610 | 746 | zephyr->pending_zloc_names = g_list_remove(zephyr->pending_zloc_names, curr->data); |
| 2086 | 747 | return TRUE; |
| 748 | } | |
| 749 | } | |
| 750 | return FALSE; | |
| 751 | } | |
| 752 | ||
| 9328 | 753 | /* Called when the server notifies us a message couldn't get sent */ |
| 754 | ||
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
755 | static void message_failed(PurpleConnection *gc, ZNotice_t *notice, struct sockaddr_in from) |
| 8559 | 756 | { |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
757 | if (g_ascii_strcasecmp(notice->z_class, "message")) { |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
758 | gchar* chat_failed = g_strdup_printf( |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
759 | _("Unable to send to chat %s,%s,%s"), |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
760 | notice->z_class, notice->z_class_inst, |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
761 | notice->z_recipient); |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34312
diff
changeset
|
762 | purple_notify_error(gc,"",chat_failed,NULL, |
|
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34312
diff
changeset
|
763 | purple_request_cpar_from_connection(gc)); |
| 9328 | 764 | g_free(chat_failed); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
765 | } else { |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
766 | purple_notify_error(gc, notice->z_recipient, |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34312
diff
changeset
|
767 | _("User is offline"), NULL, |
|
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34312
diff
changeset
|
768 | purple_request_cpar_from_connection(gc)); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
769 | } |
| 8559 | 770 | } |
| 771 | ||
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
772 | static void handle_message(PurpleConnection *gc, ZNotice_t *notice_p) |
| 2086 | 773 | { |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
774 | ZNotice_t notice; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
775 | zephyr_account* zephyr = purple_connection_get_protocol_data(gc); |
| 9896 | 776 | |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
777 | memcpy(¬ice, notice_p, sizeof(notice)); /* TODO - use pointer? */ |
|
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
778 | |
| 4793 | 779 | if (!g_ascii_strcasecmp(notice.z_class, LOGIN_CLASS)) { |
| 3277 | 780 | /* well, we'll be updating in 20 seconds anyway, might as well ignore this. */ |
| 4793 | 781 | } else if (!g_ascii_strcasecmp(notice.z_class, LOCATE_CLASS)) { |
| 782 | if (!g_ascii_strcasecmp(notice.z_opcode, LOCATE_LOCATE)) { | |
| 2086 | 783 | int nlocs; |
| 784 | char *user; | |
| 15884 | 785 | PurpleBuddy *b; |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
786 | const char *bname; |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
787 | |
| 9478 | 788 | /* XXX add real error reporting */ |
| 2086 | 789 | if (ZParseLocations(¬ice, NULL, &nlocs, &user) != ZERR_NONE) |
| 790 | return; | |
| 8435 | 791 | |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
792 | if ((b = purple_blist_find_buddy(purple_connection_get_account(gc), user)) == NULL) { |
| 9986 | 793 | char* stripped_user = zephyr_strip_local_realm(zephyr,user); |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
794 | b = purple_blist_find_buddy(purple_connection_get_account(gc),stripped_user); |
| 9986 | 795 | g_free(stripped_user); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
796 | } |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
797 | |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
798 | bname = b ? purple_buddy_get_name(b) : NULL; |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
799 | if ((b && pending_zloc(zephyr,bname)) || pending_zloc(zephyr,user)) { |
| 2086 | 800 | ZLocations_t locs; |
| 801 | int one = 1; | |
| 15884 | 802 | PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
803 | char *tmp; |
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24945
diff
changeset
|
804 | const char *balias; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
805 | |
|
32188
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
806 | /* TODO: Check whether it's correct to call add_pair_html, |
|
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
807 | or if we should be using add_pair_plaintext */ |
|
32191
a4668d9dc8d1
Rename purple_notify_user_info_add_pair to
Mark Doliner <markdoliner@pidgin.im>
parents:
32190
diff
changeset
|
808 | purple_notify_user_info_add_pair_html(user_info, _("User"), (b ? bname : user)); |
|
34717
b3e588adef5a
Global replace purple_buddy_get_local_buddy_alias() with purple_buddy_get_local_alias()
Ankit Vani <a@nevitus.org>
parents:
34699
diff
changeset
|
809 | balias = purple_buddy_get_local_alias(b); |
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24945
diff
changeset
|
810 | if (b && balias) |
|
32188
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
811 | purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
812 | |
| 2086 | 813 | if (!nlocs) { |
|
32188
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
814 | purple_notify_user_info_add_pair_plaintext(user_info, NULL, _("Hidden or not logged-in")); |
| 2086 | 815 | } |
| 816 | for (; nlocs > 0; nlocs--) { | |
| 9478 | 817 | /* XXX add real error reporting */ |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
818 | |
| 2086 | 819 | ZGetLocations(&locs, &one); |
|
32188
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
820 | /* TODO: Need to escape locs.host and locs.time? */ |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
821 | tmp = g_strdup_printf(_("<br>At %s since %s"), locs.host, locs.time); |
|
32191
a4668d9dc8d1
Rename purple_notify_user_info_add_pair to
Mark Doliner <markdoliner@pidgin.im>
parents:
32190
diff
changeset
|
822 | purple_notify_user_info_add_pair_html(user_info, _("Location"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
823 | g_free(tmp); |
| 2086 | 824 | } |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
825 | purple_notify_userinfo(gc, (b ? bname : user), |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
826 | user_info, NULL, NULL); |
| 15884 | 827 | purple_notify_user_info_destroy(user_info); |
| 9986 | 828 | } else { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
829 | if (nlocs>0) |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
830 | purple_protocol_got_user_status(purple_connection_get_account(gc), b ? bname : user, "available", NULL); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
831 | else |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
832 | purple_protocol_got_user_status(purple_connection_get_account(gc), b ? bname : user, "offline", NULL); |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
833 | } |
| 2086 | 834 | |
| 9434 | 835 | g_free(user); |
| 2086 | 836 | } |
| 837 | } else { | |
| 8560 | 838 | char *buf, *buf2, *buf3; |
| 2804 | 839 | char *send_inst; |
|
34622
753f46dd000f
Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents:
34578
diff
changeset
|
840 | PurpleChatConversation *gcc; |
|
12624
c1c92f08976b
[gaim-migrate @ 14960]
Christopher O'Brien <siege@pidgin.im>
parents:
12621
diff
changeset
|
841 | char *ptr = (char *) notice.z_message + (strlen(notice.z_message) + 1); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
842 | int len; |
|
24807
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
843 | char *stripped_sender; |
| 9478 | 844 | int signature_length = strlen(notice.z_message); |
| 15884 | 845 | PurpleMessageFlags flags = 0; |
| 9896 | 846 | gchar *tmpescape; |
| 8560 | 847 | |
| 9478 | 848 | /* Need to deal with 0 length messages to handle typing notification (OPCODE) ping messages */ |
| 15884 | 849 | /* One field zephyrs would have caused purple to crash */ |
| 9478 | 850 | if ( (notice.z_message_len == 0) || (signature_length >= notice.z_message_len - 1)) { |
| 851 | len = 0; | |
| 15884 | 852 | purple_debug_info("zephyr","message_size %d %d %d\n",len,notice.z_message_len,signature_length); |
| 9478 | 853 | buf3 = g_strdup(""); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
854 | |
| 9478 | 855 | } else { |
| 856 | len = notice.z_message_len - ( signature_length +1); | |
| 15884 | 857 | purple_debug_info("zephyr","message_size %d %d %d\n",len,notice.z_message_len,signature_length); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
858 | buf = g_malloc(len + 1); |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
859 | g_snprintf(buf, len + 1, "%s", ptr); |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
860 | g_strchomp(buf); |
|
10732
5e314ab498bf
[gaim-migrate @ 12334]
Richard Laager <rlaager@pidgin.im>
parents:
10690
diff
changeset
|
861 | tmpescape = g_markup_escape_text(buf, -1); |
| 9478 | 862 | g_free(buf); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
863 | buf2 = zephyr_to_html(tmpescape); |
|
24806
467284acbc0c
Remove the length parameter from zephyr_recv_convert(), because we were
Richard Laager <rlaager@pidgin.im>
parents:
24756
diff
changeset
|
864 | buf3 = zephyr_recv_convert(gc, buf2); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
865 | g_free(buf2); |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
866 | g_free(tmpescape); |
| 9478 | 867 | } |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
868 | |
|
24807
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
869 | stripped_sender = zephyr_strip_local_realm(zephyr,notice.z_sender); |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
870 | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
871 | if (!g_ascii_strcasecmp(notice.z_class, "MESSAGE") && !g_ascii_strcasecmp(notice.z_class_inst, "PERSONAL") |
| 9896 | 872 | && !g_ascii_strcasecmp(notice.z_recipient,zephyr->username)) { |
| 873 | if (!g_ascii_strcasecmp(notice.z_message, "Automated reply:")) | |
| 15884 | 874 | flags |= PURPLE_MESSAGE_AUTO_RESP; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
875 | |
| 9478 | 876 | if (!g_ascii_strcasecmp(notice.z_opcode,"PING")) |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
35005
diff
changeset
|
877 | purple_serv_got_typing(gc,stripped_sender,ZEPHYR_TYPING_RECV_TIMEOUT, PURPLE_IM_TYPING); |
|
22391
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
878 | else |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
35005
diff
changeset
|
879 | purple_serv_got_im(gc, stripped_sender, buf3, flags, time(NULL)); |
| 9896 | 880 | |
| 881 | } else { | |
| 882 | zephyr_triple *zt1, *zt2; | |
| 883 | gchar *send_inst_utf8; | |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
884 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
885 | zt1 = new_triple(zephyr,notice.z_class, notice.z_class_inst, notice.z_recipient); |
|
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
886 | zt2 = find_sub_by_triple(zephyr,zt1); |
| 9896 | 887 | if (!zt2) { |
| 888 | /* This is a server supplied subscription */ | |
| 889 | zephyr->subscrips = g_slist_append(zephyr->subscrips, new_triple(zephyr,zt1->class,zt1->instance,zt1->recipient)); | |
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
890 | zt2 = find_sub_by_triple(zephyr,zt1); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
891 | } |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
892 | |
| 9896 | 893 | if (!zt2->open) { |
| 894 | zt2->open = TRUE; | |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
35005
diff
changeset
|
895 | purple_serv_got_joined_chat(gc, zt2->id, zt2->name); |
| 9896 | 896 | zephyr_chat_set_topic(gc,zt2->id,notice.z_class_inst); |
| 897 | } | |
|
24807
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
898 | |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
899 | if (!g_ascii_strcasecmp(notice.z_class_inst,"PERSONAL")) |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
900 | send_inst_utf8 = g_strdup(stripped_sender); |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
901 | else { |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
902 | send_inst = g_strdup_printf("[%s] %s",notice.z_class_inst,stripped_sender); |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
903 | send_inst_utf8 = zephyr_recv_convert(gc,send_inst); |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
904 | g_free(send_inst); |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
905 | if (!send_inst_utf8) { |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
906 | purple_debug_error("zephyr","Failed to convert instance for sender %s.\n", stripped_sender); |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
907 | send_inst_utf8 = g_strdup(stripped_sender); |
|
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
908 | } |
| 2086 | 909 | } |
| 9912 | 910 | |
|
34643
e261a066d78d
Refactored zephyr protocol to use GObject conversation API
Ankit Vani <a@nevitus.org>
parents:
34625
diff
changeset
|
911 | gcc = purple_conversations_find_chat_with_account( |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
912 | zt2->name, purple_connection_get_account(gc)); |
|
23352
9714223ca7a7
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
23315
diff
changeset
|
913 | #ifndef INET_ADDRSTRLEN |
|
9714223ca7a7
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
23315
diff
changeset
|
914 | #define INET_ADDRSTRLEN 16 |
|
9714223ca7a7
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
23315
diff
changeset
|
915 | #endif |
|
34653
88ae47a7d595
Updated protocols for the API changes
Ankit Vani <a@nevitus.org>
parents:
34643
diff
changeset
|
916 | if (!purple_chat_conversation_has_user(gcc, stripped_sender)) { |
|
15369
9820bdea78a6
[gaim-migrate @ 18098]
Evan Schoenberg <evands@pidgin.im>
parents:
15205
diff
changeset
|
917 | gchar ipaddr[INET_ADDRSTRLEN]; |
|
23352
9714223ca7a7
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
23315
diff
changeset
|
918 | #ifdef HAVE_INET_NTOP |
|
15369
9820bdea78a6
[gaim-migrate @ 18098]
Evan Schoenberg <evands@pidgin.im>
parents:
15205
diff
changeset
|
919 | inet_ntop(AF_INET, ¬ice.z_sender_addr.s_addr, ipaddr, sizeof(ipaddr)); |
|
23352
9714223ca7a7
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
23315
diff
changeset
|
920 | #else |
|
9714223ca7a7
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
23315
diff
changeset
|
921 | memcpy(ipaddr,inet_ntoa(notice.z_sender_addr),sizeof(ipaddr)); |
|
9714223ca7a7
A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents:
23315
diff
changeset
|
922 | #endif |
|
34670
9bd5bd903dc7
Renamed chat buddies to chat users, and IM conversation typing state to IM typing state.
Ankit Vani <a@nevitus.org>
parents:
34653
diff
changeset
|
923 | purple_chat_conversation_add_user(gcc, stripped_sender, ipaddr, PURPLE_CHAT_USER_NONE, TRUE); |
| 9896 | 924 | } |
|
36092
cf0a11121049
Fix message flags
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36078
diff
changeset
|
925 | purple_serv_got_chat_in(gc, zt2->id, send_inst_utf8, |
|
cf0a11121049
Fix message flags
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36078
diff
changeset
|
926 | PURPLE_MESSAGE_RECV, buf3, time(NULL)); |
| 9896 | 927 | g_free(send_inst_utf8); |
|
24807
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
928 | |
| 9896 | 929 | free_triple(zt1); |
| 930 | } | |
|
24807
699a4dc72c49
A Warmenhoved patch from rwbarton to avoid showing the default instance
Richard Laager <rlaager@pidgin.im>
parents:
24806
diff
changeset
|
931 | g_free(stripped_sender); |
| 9896 | 932 | g_free(buf3); |
| 2086 | 933 | } |
| 934 | } | |
|
12424
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
12216
diff
changeset
|
935 | |
|
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
12216
diff
changeset
|
936 | static int free_parse_tree(parse_tree* tree) { |
| 9896 | 937 | if (!tree) { |
| 938 | return 0; | |
| 939 | } | |
| 940 | else { | |
| 941 | int i; | |
|
33787
eb88fd4cbced
Remove various array comparisons to NULL because they're silly
Daniel Atallah <datallah@pidgin.im>
parents:
33782
diff
changeset
|
942 | for(i=0;i<tree->num_children;i++){ |
|
eb88fd4cbced
Remove various array comparisons to NULL because they're silly
Daniel Atallah <datallah@pidgin.im>
parents:
33782
diff
changeset
|
943 | if (tree->children[i]) { |
|
eb88fd4cbced
Remove various array comparisons to NULL because they're silly
Daniel Atallah <datallah@pidgin.im>
parents:
33782
diff
changeset
|
944 | free_parse_tree(tree->children[i]); |
| 9896 | 945 | } |
| 946 | } | |
|
39464
e8cb99e0d91f
Fix some leaks in libpurple.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38433
diff
changeset
|
947 | if (tree != &null_parse_tree) { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
948 | g_free(tree->contents); |
|
39464
e8cb99e0d91f
Fix some leaks in libpurple.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38433
diff
changeset
|
949 | g_free(tree); |
|
e8cb99e0d91f
Fix some leaks in libpurple.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38433
diff
changeset
|
950 | } |
| 9896 | 951 | } |
| 952 | return 0; | |
| 953 | } | |
| 954 | ||
|
12424
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
12216
diff
changeset
|
955 | static parse_tree *tree_child(parse_tree* tree,int index) { |
| 9896 | 956 | if (index < tree->num_children) { |
| 957 | return tree->children[index]; | |
| 958 | } else { | |
| 959 | return &null_parse_tree; | |
| 960 | } | |
| 961 | } | |
| 962 | ||
|
12424
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
12216
diff
changeset
|
963 | static parse_tree *find_node(parse_tree* ptree,gchar* key) |
| 9896 | 964 | { |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
965 | gchar* tc; |
| 9896 | 966 | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
967 | if (!ptree || ! key) |
| 9896 | 968 | return &null_parse_tree; |
| 969 | ||
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
970 | tc = tree_child(ptree,0)->contents; |
|
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
971 | |
|
17156
6d4cc0f310d1
More strcasecmp() replacements.
Richard Laager <rlaager@pidgin.im>
parents:
16746
diff
changeset
|
972 | /* g_strcasecmp() is deprecated. What is the encoding here??? */ |
|
26726
b81bcec8f359
Updates for GTK+ 3.0. Remove some deprecated functions (someone should
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26337
diff
changeset
|
973 | if (ptree->num_children > 0 && tc && !g_ascii_strcasecmp(tc, key)) { |
| 9896 | 974 | return ptree; |
| 975 | } else { | |
| 976 | parse_tree *result = &null_parse_tree; | |
| 977 | int i; | |
| 978 | for(i = 0; i < ptree->num_children; i++) { | |
| 979 | result = find_node(ptree->children[i],key); | |
| 980 | if(result != &null_parse_tree) { | |
| 981 | break; | |
| 982 | } | |
| 983 | } | |
| 984 | return result; | |
| 985 | } | |
| 986 | } | |
| 987 | ||
|
12424
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
12216
diff
changeset
|
988 | static parse_tree *parse_buffer(gchar* source, gboolean do_parse) { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
989 | |
| 9896 | 990 | parse_tree *ptree = g_new0(parse_tree,1); |
| 991 | ptree->contents = NULL; | |
| 992 | ptree->num_children=0; | |
| 993 | if (do_parse) { | |
| 994 | unsigned int p = 0; | |
| 995 | while(p < strlen(source)) { | |
| 996 | unsigned int end; | |
| 9986 | 997 | gchar *newstr; |
| 9896 | 998 | |
| 999 | /* Eat white space: */ | |
| 1000 | if(g_ascii_isspace(source[p]) || source[p] == '\001') { | |
| 1001 | p++; | |
| 1002 | continue; | |
| 1003 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1004 | |
| 9896 | 1005 | /* Skip comments */ |
| 1006 | if(source[p] == ';') { | |
| 1007 | while(source[p] != '\n' && p < strlen(source)) { | |
| 1008 | p++; | |
| 1009 | } | |
| 1010 | continue; | |
| 1011 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1012 | |
| 9896 | 1013 | if(source[p] == '(') { |
| 1014 | int nesting = 0; | |
| 1015 | gboolean in_quote = FALSE; | |
| 1016 | gboolean escape_next = FALSE; | |
| 1017 | p++; | |
| 1018 | end = p; | |
| 1019 | while(!(source[end] == ')' && nesting == 0 && !in_quote) && end < strlen(source)) { | |
| 1020 | if(!escape_next) { | |
| 1021 | if(source[end] == '\\') { | |
| 1022 | escape_next = TRUE; | |
| 1023 | } | |
| 1024 | if(!in_quote) { | |
| 1025 | if(source[end] == '(') { | |
| 1026 | nesting++; | |
| 1027 | } | |
| 1028 | if(source[end] == ')') { | |
| 1029 | nesting--; | |
| 1030 | } | |
| 1031 | } | |
| 1032 | if(source[end] == '"') { | |
| 1033 | in_quote = !in_quote; | |
| 1034 | } | |
| 1035 | } else { | |
| 1036 | escape_next = FALSE; | |
| 1037 | } | |
| 1038 | end++; | |
| 1039 | } | |
| 1040 | do_parse = TRUE; | |
| 1041 | ||
| 1042 | } else { | |
| 1043 | gchar end_char; | |
| 1044 | if(source[p] == '"') { | |
| 1045 | end_char = '"'; | |
| 1046 | p++; | |
| 1047 | } else { | |
| 1048 | end_char = ' '; | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1049 | } |
| 9896 | 1050 | do_parse = FALSE; |
| 1051 | ||
| 1052 | end = p; | |
| 1053 | while(source[end] != end_char && end < strlen(source)) { | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1054 | if(source[end] == '\\') |
| 9896 | 1055 | end++; |
| 1056 | end++; | |
| 1057 | } | |
| 1058 | } | |
| 1059 | newstr = g_new0(gchar, end+1-p); | |
| 1060 | strncpy(newstr,source+p,end-p); | |
| 1061 | if (ptree->num_children < MAXCHILDREN) { | |
| 1062 | /* In case we surpass maxchildren, ignore this */ | |
| 1063 | ptree->children[ptree->num_children++] = parse_buffer( newstr, do_parse); | |
| 1064 | } else { | |
| 15884 | 1065 | purple_debug_error("zephyr","too many children in tzc output. skipping\n"); |
| 9896 | 1066 | } |
| 1067 | g_free(newstr); | |
| 1068 | p = end + 1; | |
| 1069 | } | |
| 1070 | return ptree; | |
| 1071 | } else { | |
| 1072 | /* XXX does this have to be strdup'd */ | |
| 1073 | ptree->contents = g_strdup(source); | |
| 1074 | return ptree; | |
| 1075 | } | |
| 1076 | } | |
| 1077 | ||
|
12424
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
12216
diff
changeset
|
1078 | static parse_tree *read_from_tzc(zephyr_account* zephyr){ |
| 9896 | 1079 | struct timeval tv; |
| 1080 | fd_set rfds; | |
| 1081 | int bufsize = 2048; | |
| 1082 | char *buf = (char *)calloc(bufsize, 1); | |
| 1083 | char *bufcur = buf; | |
| 1084 | int selected = 0; | |
| 9986 | 1085 | parse_tree *incoming_msg; |
| 9896 | 1086 | |
| 1087 | FD_ZERO(&rfds); | |
| 1088 | FD_SET(zephyr->fromtzc[ZEPHYR_FD_READ], &rfds); | |
| 1089 | tv.tv_sec = 0; | |
| 1090 | tv.tv_usec = 0; | |
| 9986 | 1091 | incoming_msg=NULL; |
| 9896 | 1092 | |
| 1093 | while (select(zephyr->fromtzc[ZEPHYR_FD_READ] + 1, &rfds, NULL, NULL, &tv)) { | |
| 1094 | selected = 1; | |
|
35518
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1095 | if (read(zephyr->fromtzc[ZEPHYR_FD_READ], bufcur, 1) != 1) { |
|
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1096 | purple_debug_error("zephyr", "couldn't read\n"); |
|
33892
ef97228bc5f0
Fix most of warnings for gtk2 and linux
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33796
diff
changeset
|
1097 | purple_connection_error(purple_account_get_connection(zephyr->account), PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "couldn't read"); |
|
35518
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1098 | free(buf); |
|
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1099 | return NULL; |
|
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1100 | } |
| 9896 | 1101 | bufcur++; |
| 1102 | if ((bufcur - buf) > (bufsize - 1)) { | |
| 1103 | if ((buf = realloc(buf, bufsize * 2)) == NULL) { | |
|
19832
84b69b21672b
Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19387
diff
changeset
|
1104 | purple_debug_error("zephyr","Ran out of memory\n"); |
| 9896 | 1105 | exit(-1); |
| 1106 | } else { | |
| 1107 | bufcur = buf + bufsize; | |
| 1108 | bufsize *= 2; | |
| 1109 | } | |
| 1110 | } | |
| 1111 | } | |
| 1112 | *bufcur = '\0'; | |
| 1113 | ||
| 1114 | if (selected) { | |
| 1115 | incoming_msg = parse_buffer(buf,TRUE); | |
| 1116 | } | |
| 1117 | free(buf); | |
| 1118 | return incoming_msg; | |
| 1119 | } | |
| 1120 | ||
| 1121 | static gint check_notify_tzc(gpointer data) | |
| 1122 | { | |
| 15884 | 1123 | PurpleConnection *gc = (PurpleConnection *)data; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
1124 | zephyr_account* zephyr = purple_connection_get_protocol_data(gc); |
| 9896 | 1125 | parse_tree *newparsetree = read_from_tzc(zephyr); |
| 1126 | if (newparsetree != NULL) { | |
| 1127 | gchar *spewtype; | |
| 1128 | if ( (spewtype = tree_child(find_node(newparsetree,"tzcspew"),2)->contents) ) { | |
| 1129 | if (!g_ascii_strncasecmp(spewtype,"message",7)) { | |
| 1130 | ZNotice_t notice; | |
| 1131 | parse_tree *msgnode = tree_child(find_node(newparsetree,"message"),2); | |
| 1132 | parse_tree *bodynode = tree_child(msgnode,1); | |
| 15884 | 1133 | /* char *zsig = g_strdup(" "); */ /* purple doesn't care about zsigs */ |
| 9896 | 1134 | char *msg = zephyr_tzc_deescape_str(bodynode->contents); |
| 1135 | size_t bufsize = strlen(msg) + 3; | |
| 1136 | char *buf = g_new0(char,bufsize); | |
| 1137 | g_snprintf(buf,1+strlen(msg)+2," %c%s",'\0',msg); | |
|
19387
8dc4480381f3
bcopy and bzero shouldn't be used. This allows Alver to compile nat-pmp.c on one of his obscure systems (and I fixed some other stuff that I noticed at the same time).
Daniel Atallah <datallah@pidgin.im>
parents:
17156
diff
changeset
|
1138 | memset((char *)¬ice, 0, sizeof(notice)); |
| 9896 | 1139 | notice.z_kind = ACKED; |
| 1140 | notice.z_port = 0; | |
| 1141 | notice.z_opcode = tree_child(find_node(newparsetree,"opcode"),2)->contents; | |
| 1142 | notice.z_class = zephyr_tzc_deescape_str(tree_child(find_node(newparsetree,"class"),2)->contents); | |
| 1143 | notice.z_class_inst = tree_child(find_node(newparsetree,"instance"),2)->contents; | |
| 1144 | notice.z_recipient = local_zephyr_normalize(zephyr,tree_child(find_node(newparsetree,"recipient"),2)->contents); | |
| 1145 | notice.z_sender = local_zephyr_normalize(zephyr,tree_child(find_node(newparsetree,"sender"),2)->contents); | |
| 1146 | notice.z_default_format = "Class $class, Instance $instance:\n" "To: @bold($recipient) at $time $date\n" "From: @bold($1) <$sender>\n\n$2"; | |
| 1147 | notice.z_message_len = strlen(msg) + 3; | |
| 1148 | notice.z_message = buf; | |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
1149 | handle_message(gc, ¬ice); |
| 9896 | 1150 | g_free(msg); |
| 1151 | /* g_free(zsig); */ | |
| 1152 | g_free(buf); | |
| 1153 | /* free_parse_tree(msgnode); | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1154 | free_parse_tree(bodynode); |
| 9896 | 1155 | g_free(msg); |
| 1156 | g_free(zsig); | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1157 | g_free(buf); |
| 9896 | 1158 | */ |
| 1159 | } | |
| 1160 | else if (!g_ascii_strncasecmp(spewtype,"zlocation",9)) { | |
| 1161 | /* check_loc or zephyr_zloc respectively */ | |
| 1162 | /* XXX fix */ | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1163 | char *user; |
| 15884 | 1164 | PurpleBuddy *b; |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1165 | const char *bname; |
| 9896 | 1166 | int nlocs = 0; |
| 9912 | 1167 | parse_tree *locations; |
| 1168 | gchar *locval; | |
| 9896 | 1169 | user = tree_child(find_node(newparsetree,"user"),2)->contents; |
| 1170 | ||
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
1171 | if ((b = purple_blist_find_buddy(purple_connection_get_account(gc), user)) == NULL) { |
| 9986 | 1172 | gchar *stripped_user = zephyr_strip_local_realm(zephyr,user); |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
1173 | b = purple_blist_find_buddy(purple_connection_get_account(gc), stripped_user); |
| 9986 | 1174 | g_free(stripped_user); |
| 9896 | 1175 | } |
| 1176 | locations = find_node(newparsetree,"locations"); | |
| 1177 | locval = tree_child(tree_child(tree_child(tree_child(locations,2),0),0),2)->contents; | |
| 1178 | ||
|
32190
7881925d0929
Don't use strlen() when you're just checking whether a string is
Mark Doliner <markdoliner@pidgin.im>
parents:
32189
diff
changeset
|
1179 | if (!locval || !g_ascii_strcasecmp(locval," ") || !*locval) { |
| 9896 | 1180 | nlocs = 0; |
| 1181 | } else { | |
| 1182 | nlocs = 1; | |
| 1183 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1184 | |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1185 | bname = b ? purple_buddy_get_name(b) : NULL; |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1186 | if ((b && pending_zloc(zephyr,bname)) || pending_zloc(zephyr,user) || pending_zloc(zephyr,local_zephyr_normalize(zephyr,user))){ |
| 15884 | 1187 | PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
1188 | char *tmp; |
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24945
diff
changeset
|
1189 | const char *balias; |
| 9896 | 1190 | |
|
32188
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
1191 | /* TODO: Check whether it's correct to call add_pair_html, |
|
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
1192 | or if we should be using add_pair_plaintext */ |
|
32191
a4668d9dc8d1
Rename purple_notify_user_info_add_pair to
Mark Doliner <markdoliner@pidgin.im>
parents:
32190
diff
changeset
|
1193 | purple_notify_user_info_add_pair_html(user_info, _("User"), (b ? bname : user)); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
1194 | |
|
34717
b3e588adef5a
Global replace purple_buddy_get_local_buddy_alias() with purple_buddy_get_local_alias()
Ankit Vani <a@nevitus.org>
parents:
34699
diff
changeset
|
1195 | balias = b ? purple_buddy_get_local_alias(b) : NULL; |
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24945
diff
changeset
|
1196 | if (balias) |
|
32188
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
1197 | purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias); |
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24945
diff
changeset
|
1198 | |
| 9896 | 1199 | if (!nlocs) { |
|
32188
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
1200 | purple_notify_user_info_add_pair_plaintext(user_info, NULL, _("Hidden or not logged-in")); |
| 9896 | 1201 | } else { |
|
32188
cb9cad610bc6
I went through all our calls to purple_notify_user_info_add_pair() and
Mark Doliner <markdoliner@pidgin.im>
parents:
32157
diff
changeset
|
1202 | /* TODO: Need to escape the two strings that make up tmp? */ |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
1203 | tmp = g_strdup_printf(_("<br>At %s since %s"), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
1204 | tree_child(tree_child(tree_child(tree_child(locations,2),0),0),2)->contents, |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
1205 | tree_child(tree_child(tree_child(tree_child(locations,2),0),2),2)->contents); |
|
32191
a4668d9dc8d1
Rename purple_notify_user_info_add_pair to
Mark Doliner <markdoliner@pidgin.im>
parents:
32190
diff
changeset
|
1206 | purple_notify_user_info_add_pair_html(user_info, _("Location"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
1207 | g_free(tmp); |
| 9896 | 1208 | } |
| 1209 | ||
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1210 | purple_notify_userinfo(gc, b ? bname : user, |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15185
diff
changeset
|
1211 | user_info, NULL, NULL); |
| 15884 | 1212 | purple_notify_user_info_destroy(user_info); |
| 9896 | 1213 | } else { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1214 | if (nlocs>0) |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
1215 | purple_protocol_got_user_status(purple_connection_get_account(gc), b ? bname : user, "available", NULL); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1216 | else |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
1217 | purple_protocol_got_user_status(purple_connection_get_account(gc), b ? bname : user, "offline", NULL); |
| 9896 | 1218 | } |
| 1219 | } | |
| 1220 | else if (!g_ascii_strncasecmp(spewtype,"subscribed",10)) { | |
| 1221 | } | |
| 1222 | else if (!g_ascii_strncasecmp(spewtype,"start",5)) { | |
| 1223 | } | |
| 1224 | else if (!g_ascii_strncasecmp(spewtype,"error",5)) { | |
| 1225 | /* XXX handle */ | |
| 1226 | } | |
| 1227 | } else { | |
| 1228 | } | |
| 1229 | } else { | |
| 1230 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1231 | |
| 9896 | 1232 | free_parse_tree(newparsetree); |
| 1233 | return TRUE; | |
| 1234 | } | |
| 1235 | ||
| 1236 | static gint check_notify_zeph02(gpointer data) | |
| 2086 | 1237 | { |
| 9478 | 1238 | /* XXX add real error reporting */ |
| 15884 | 1239 | PurpleConnection *gc = (PurpleConnection*) data; |
| 2086 | 1240 | while (ZPending()) { |
| 1241 | ZNotice_t notice; | |
| 1242 | struct sockaddr_in from; | |
| 9478 | 1243 | /* XXX add real error reporting */ |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1244 | |
| 2086 | 1245 | z_call_r(ZReceiveNotice(¬ice, &from)); |
| 1246 | ||
| 1247 | switch (notice.z_kind) { | |
| 1248 | case UNSAFE: | |
| 1249 | case UNACKED: | |
| 1250 | case ACKED: | |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
1251 | handle_message(gc, ¬ice); |
| 2086 | 1252 | break; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1253 | case SERVACK: |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1254 | if (!(g_ascii_strcasecmp(notice.z_message, ZSRVACK_NOTSENT))) { |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
1255 | message_failed(gc, ¬ice, from); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1256 | } |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1257 | break; |
| 9328 | 1258 | case CLIENTACK: |
| 15884 | 1259 | purple_debug_error("zephyr", "Client ack received\n"); |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
1260 | handle_unknown(¬ice); /* XXX: is it really unknown? */ |
|
35966
d603bfb42fd9
Fix some coverity CWE-484 issues
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35518
diff
changeset
|
1261 | break; |
| 2086 | 1262 | default: |
| 1263 | /* we'll just ignore things for now */ | |
|
35993
bd0a2508b477
Fix some other coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35966
diff
changeset
|
1264 | handle_unknown(¬ice); |
| 15884 | 1265 | purple_debug_error("zephyr", "Unhandled notice.\n"); |
| 2086 | 1266 | break; |
| 1267 | } | |
| 9478 | 1268 | /* XXX add real error reporting */ |
| 2086 | 1269 | ZFreeNotice(¬ice); |
| 1270 | } | |
| 1271 | ||
| 1272 | return TRUE; | |
| 1273 | } | |
| 1274 | ||
| 10867 | 1275 | #ifdef WIN32 |
| 1276 | ||
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1277 | static gint check_loc(gpointer data) |
| 10867 | 1278 | { |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1279 | GSList *buddies; |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1280 | ZLocations_t locations; |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1281 | PurpleConnection *gc = data; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
1282 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1283 | PurpleAccount *account = purple_connection_get_account(gc); |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1284 | int numlocs; |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1285 | int one = 1; |
| 10867 | 1286 | |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
1287 | for (buddies = purple_blist_find_buddies(account, NULL); buddies; |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1288 | buddies = g_slist_delete_link(buddies, buddies)) { |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1289 | PurpleBuddy *b = buddies->data; |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1290 | char *chk; |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1291 | const char *bname = purple_buddy_get_name(b); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1292 | chk = local_zephyr_normalize(bname); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1293 | ZLocateUser(chk,&numlocs, ZAUTH); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1294 | if (numlocs) { |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1295 | int i; |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1296 | for(i=0;i<numlocs;i++) { |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1297 | ZGetLocations(&locations,&one); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1298 | serv_got_update(zgc,bname,1,0,0,0,0); |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1299 | } |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1300 | } |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1301 | } |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1302 | |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1303 | return TRUE; |
| 10867 | 1304 | } |
| 1305 | ||
| 1306 | #else | |
| 1307 | ||
| 2086 | 1308 | static gint check_loc(gpointer data) |
| 1309 | { | |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1310 | GSList *buddies; |
| 2086 | 1311 | ZAsyncLocateData_t ald; |
| 15884 | 1312 | PurpleConnection *gc = (PurpleConnection *)data; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
1313 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1314 | PurpleAccount *account = purple_connection_get_account(gc); |
| 2086 | 1315 | |
| 9896 | 1316 | if (use_zeph02(zephyr)) { |
| 1317 | ald.user = NULL; | |
| 1318 | memset(&(ald.uid), 0, sizeof(ZUnique_Id_t)); | |
| 1319 | ald.version = NULL; | |
| 1320 | } | |
| 2086 | 1321 | |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
1322 | for (buddies = purple_blist_find_buddies(account, NULL); buddies; |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1323 | buddies = g_slist_delete_link(buddies, buddies)) { |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1324 | PurpleBuddy *b = buddies->data; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1325 | |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1326 | const char *chk; |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1327 | const char *name = purple_buddy_get_name(b); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1328 | |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1329 | chk = local_zephyr_normalize(zephyr,name); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1330 | purple_debug_info("zephyr","chk: %s b->name %s\n",chk,name); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1331 | /* XXX add real error reporting */ |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1332 | /* doesn't matter if this fails or not; we'll just move on to the next one */ |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1333 | if (use_zeph02(zephyr)) { |
| 9896 | 1334 | #ifdef WIN32 |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1335 | int numlocs; |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1336 | int one=1; |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1337 | ZLocateUser(chk,&numlocs,ZAUTH); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1338 | if (numlocs) { |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1339 | int i; |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1340 | for(i=0;i<numlocs;i++) { |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1341 | ZGetLocations(&locations,&one); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1342 | if (nlocs>0) |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
1343 | purple_protocol_got_user_status(account,name,"available",NULL); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1344 | else |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
1345 | purple_protocol_got_user_status(account,name,"offline",NULL); |
| 6695 | 1346 | } |
| 4349 | 1347 | } |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1348 | #else |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1349 | ZRequestLocations(chk, &ald, UNACKED, ZAUTH); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1350 | g_free(ald.user); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1351 | g_free(ald.version); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1352 | #endif /* WIN32 */ |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1353 | } else |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1354 | if (use_tzc(zephyr)) { |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1355 | gchar *zlocstr = g_strdup_printf("((tzcfodder . zlocate) \"%s\")\n",chk); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1356 | size_t len = strlen(zlocstr); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1357 | size_t result = write(zephyr->totzc[ZEPHYR_FD_WRITE],zlocstr,len); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1358 | if (result != len) { |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1359 | purple_debug_error("zephyr", "Unable to write a message: %s\n", g_strerror(errno)); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1360 | } |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1361 | g_free(zlocstr); |
|
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1362 | } |
| 2086 | 1363 | } |
|
27198
da6e03d6f9d6
Convert zephyr to use purple_find_buddies.
Paul Aurich <darkrain42@pidgin.im>
parents:
26752
diff
changeset
|
1364 | |
| 2086 | 1365 | return TRUE; |
| 1366 | } | |
| 1367 | ||
| 10867 | 1368 | #endif /* WIN32 */ |
| 1369 | ||
|
22104
56970903b8e9
Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents:
20288
diff
changeset
|
1370 | static char *get_exposure_level(void) |
| 2086 | 1371 | { |
| 9478 | 1372 | /* XXX add real error reporting */ |
| 2086 | 1373 | char *exposure = ZGetVariable("exposure"); |
| 1374 | ||
| 1375 | if (!exposure) | |
| 1376 | return EXPOSE_REALMVIS; | |
| 4793 | 1377 | if (!g_ascii_strcasecmp(exposure, EXPOSE_NONE)) |
| 2086 | 1378 | return EXPOSE_NONE; |
| 4793 | 1379 | if (!g_ascii_strcasecmp(exposure, EXPOSE_OPSTAFF)) |
| 2086 | 1380 | return EXPOSE_OPSTAFF; |
| 4793 | 1381 | if (!g_ascii_strcasecmp(exposure, EXPOSE_REALMANN)) |
| 2086 | 1382 | return EXPOSE_REALMANN; |
| 4793 | 1383 | if (!g_ascii_strcasecmp(exposure, EXPOSE_NETVIS)) |
| 2086 | 1384 | return EXPOSE_NETVIS; |
| 4793 | 1385 | if (!g_ascii_strcasecmp(exposure, EXPOSE_NETANN)) |
| 2086 | 1386 | return EXPOSE_NETANN; |
| 1387 | return EXPOSE_REALMVIS; | |
| 1388 | } | |
| 1389 | ||
| 1390 | static void strip_comments(char *str) | |
| 1391 | { | |
| 1392 | char *tmp = strchr(str, '#'); | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1393 | |
| 2086 | 1394 | if (tmp) |
| 1395 | *tmp = '\0'; | |
| 1396 | g_strchug(str); | |
| 1397 | g_strchomp(str); | |
| 1398 | } | |
| 1399 | ||
| 9896 | 1400 | static void zephyr_inithosts(zephyr_account *zephyr) |
| 9478 | 1401 | { |
| 1402 | /* XXX This code may not be Win32 clean */ | |
| 1403 | struct hostent *hent; | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1404 | |
|
9802
5de715c25c22
[gaim-migrate @ 10670]
Mark Doliner <markdoliner@pidgin.im>
parents:
9797
diff
changeset
|
1405 | if (gethostname(zephyr->ourhost, sizeof(zephyr->ourhost)) == -1) { |
| 15884 | 1406 | purple_debug_error("zephyr", "unable to retrieve hostname, %%host%% and %%canon%% will be wrong in subscriptions and have been set to unknown\n"); |
|
9802
5de715c25c22
[gaim-migrate @ 10670]
Mark Doliner <markdoliner@pidgin.im>
parents:
9797
diff
changeset
|
1407 | g_strlcpy(zephyr->ourhost, "unknown", sizeof(zephyr->ourhost)); |
|
9803
3bf25f940805
[gaim-migrate @ 10671]
Mark Doliner <markdoliner@pidgin.im>
parents:
9802
diff
changeset
|
1408 | g_strlcpy(zephyr->ourhostcanon, "unknown", sizeof(zephyr->ourhostcanon)); |
| 9478 | 1409 | return; |
| 1410 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1411 | |
| 9610 | 1412 | if (!(hent = gethostbyname(zephyr->ourhost))) { |
| 15884 | 1413 | purple_debug_error("zephyr", "unable to resolve hostname, %%canon%% will be wrong in subscriptions.and has been set to the value of %%host%%, %s\n",zephyr->ourhost); |
|
9803
3bf25f940805
[gaim-migrate @ 10671]
Mark Doliner <markdoliner@pidgin.im>
parents:
9802
diff
changeset
|
1414 | g_strlcpy(zephyr->ourhostcanon, zephyr->ourhost, sizeof(zephyr->ourhostcanon)); |
| 9478 | 1415 | return; |
| 1416 | } | |
|
9802
5de715c25c22
[gaim-migrate @ 10670]
Mark Doliner <markdoliner@pidgin.im>
parents:
9797
diff
changeset
|
1417 | |
|
5de715c25c22
[gaim-migrate @ 10670]
Mark Doliner <markdoliner@pidgin.im>
parents:
9797
diff
changeset
|
1418 | g_strlcpy(zephyr->ourhostcanon, hent->h_name, sizeof(zephyr->ourhostcanon)); |
|
5de715c25c22
[gaim-migrate @ 10670]
Mark Doliner <markdoliner@pidgin.im>
parents:
9797
diff
changeset
|
1419 | |
| 9478 | 1420 | return; |
| 1421 | } | |
| 1422 | ||
| 9610 | 1423 | static void process_zsubs(zephyr_account *zephyr) |
| 2086 | 1424 | { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1425 | /* Loads zephyr chats "(subscriptions) from ~/.zephyr.subs, and |
|
9802
5de715c25c22
[gaim-migrate @ 10670]
Mark Doliner <markdoliner@pidgin.im>
parents:
9797
diff
changeset
|
1426 | registers (subscribes to) them on the server */ |
| 9434 | 1427 | |
|
9802
5de715c25c22
[gaim-migrate @ 10670]
Mark Doliner <markdoliner@pidgin.im>
parents:
9797
diff
changeset
|
1428 | /* XXX deal with unsubscriptions */ |
|
5de715c25c22
[gaim-migrate @ 10670]
Mark Doliner <markdoliner@pidgin.im>
parents:
9797
diff
changeset
|
1429 | /* XXX deal with punts */ |
| 9434 | 1430 | |
| 2086 | 1431 | FILE *f; |
| 1432 | gchar *fname; | |
| 1433 | gchar buff[BUFSIZ]; | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1434 | |
| 15884 | 1435 | fname = g_strdup_printf("%s/.zephyr.subs", purple_home_dir()); |
|
10589
4e10236e06d4
[gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents:
10401
diff
changeset
|
1436 | f = g_fopen(fname, "r"); |
| 2086 | 1437 | if (f) { |
| 1438 | char **triple; | |
| 1439 | char *recip; | |
| 9478 | 1440 | char *z_class; |
| 1441 | char *z_instance; | |
| 9896 | 1442 | char *z_galaxy = NULL; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1443 | |
| 2086 | 1444 | while (fgets(buff, BUFSIZ, f)) { |
| 1445 | strip_comments(buff); | |
| 1446 | if (buff[0]) { | |
| 1447 | triple = g_strsplit(buff, ",", 3); | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1448 | if (triple[0] && triple[1]) { |
| 9896 | 1449 | char *tmp = g_strdup_printf("%s", zephyr->username); |
| 2804 | 1450 | char *atptr; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1451 | |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1452 | if (triple[2] == NULL) { |
| 3277 | 1453 | recip = g_malloc0(1); |
| 4793 | 1454 | } else if (!g_ascii_strcasecmp(triple[2], "%me%")) { |
| 9896 | 1455 | recip = g_strdup_printf("%s", zephyr->username); |
| 4793 | 1456 | } else if (!g_ascii_strcasecmp(triple[2], "*")) { |
| 2804 | 1457 | /* wildcard |
| 1458 | * form of class,instance,* */ | |
| 1459 | recip = g_malloc0(1); | |
| 4793 | 1460 | } else if (!g_ascii_strcasecmp(triple[2], tmp)) { |
| 2804 | 1461 | /* form of class,instance,aatharuv@ATHENA.MIT.EDU */ |
| 1462 | recip = g_strdup(triple[2]); | |
| 1463 | } else if ((atptr = strchr(triple[2], '@')) != NULL) { | |
| 1464 | /* form of class,instance,*@ANDREW.CMU.EDU | |
| 1465 | * class,instance,@ANDREW.CMU.EDU | |
| 1466 | * If realm is local realm, blank recipient, else | |
| 1467 | * @REALM-NAME | |
| 1468 | */ | |
| 9896 | 1469 | char *realmat = g_strdup_printf("@%s",zephyr->realm); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1470 | |
| 4793 | 1471 | if (!g_ascii_strcasecmp(atptr, realmat)) |
| 2804 | 1472 | recip = g_malloc0(1); |
| 1473 | else | |
| 1474 | recip = g_strdup(atptr); | |
| 1475 | g_free(realmat); | |
| 2086 | 1476 | } else { |
| 1477 | recip = g_strdup(triple[2]); | |
| 1478 | } | |
| 2804 | 1479 | g_free(tmp); |
| 9478 | 1480 | |
| 1481 | if (!g_ascii_strcasecmp(triple[0],"%host%")) { | |
| 9610 | 1482 | z_class = g_strdup(zephyr->ourhost); |
| 9478 | 1483 | } else if (!g_ascii_strcasecmp(triple[0],"%canon%")) { |
| 9610 | 1484 | z_class = g_strdup(zephyr->ourhostcanon); |
| 9478 | 1485 | } else { |
| 1486 | z_class = g_strdup(triple[0]); | |
| 1487 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1488 | |
| 9478 | 1489 | if (!g_ascii_strcasecmp(triple[1],"%host%")) { |
| 9610 | 1490 | z_instance = g_strdup(zephyr->ourhost); |
| 9478 | 1491 | } else if (!g_ascii_strcasecmp(triple[1],"%canon%")) { |
| 9610 | 1492 | z_instance = g_strdup(zephyr->ourhostcanon); |
| 9478 | 1493 | } else { |
| 1494 | z_instance = g_strdup(triple[1]); | |
| 1495 | } | |
| 1496 | ||
| 1497 | /* There should be some sort of error report listing classes that couldn't be subbed to. | |
| 1498 | Not important right now though */ | |
| 1499 | ||
| 9896 | 1500 | if (zephyr_subscribe_to(zephyr,z_class, z_instance, recip,z_galaxy) != ZERR_NONE) { |
| 9478 | 1501 | |
| 15884 | 1502 | purple_debug_error("zephyr", "Couldn't subscribe to %s, %s, %s\n", z_class,z_instance,recip); |
| 2086 | 1503 | } |
| 9478 | 1504 | |
| 9896 | 1505 | zephyr->subscrips = g_slist_append(zephyr->subscrips, new_triple(zephyr,z_class,z_instance,recip)); |
| 9478 | 1506 | /* g_hash_table_destroy(sub_hash_table); */ |
| 1507 | g_free(z_instance); | |
| 1508 | g_free(z_class); | |
| 2086 | 1509 | g_free(recip); |
| 1510 | } | |
| 1511 | g_strfreev(triple); | |
| 1512 | } | |
| 1513 | } | |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1514 | fclose(f); |
| 2086 | 1515 | } |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
1516 | g_free(fname); |
| 2086 | 1517 | } |
| 1518 | ||
| 15884 | 1519 | static void process_anyone(PurpleConnection *gc) |
| 2086 | 1520 | { |
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
1521 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 2086 | 1522 | FILE *fd; |
| 1523 | gchar buff[BUFSIZ], *filename; | |
| 15884 | 1524 | PurpleGroup *g; |
| 1525 | PurpleBuddy *b; | |
|
4775
239cb803fb1d
[gaim-migrate @ 5095]
Mark Doliner <markdoliner@pidgin.im>
parents:
4770
diff
changeset
|
1526 | |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
1527 | if (!(g = purple_blist_find_group(_("Anyone")))) { |
| 15884 | 1528 | g = purple_group_new(_("Anyone")); |
| 1529 | purple_blist_add_group(g, NULL); | |
|
4775
239cb803fb1d
[gaim-migrate @ 5095]
Mark Doliner <markdoliner@pidgin.im>
parents:
4770
diff
changeset
|
1530 | } |
| 6695 | 1531 | |
| 15884 | 1532 | filename = g_strconcat(purple_home_dir(), "/.anyone", NULL); |
|
10589
4e10236e06d4
[gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents:
10401
diff
changeset
|
1533 | if ((fd = g_fopen(filename, "r")) != NULL) { |
| 2086 | 1534 | while (fgets(buff, BUFSIZ, fd)) { |
| 1535 | strip_comments(buff); | |
| 4687 | 1536 | if (buff[0]) { |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
1537 | if (!purple_blist_find_buddy(purple_connection_get_account(gc), buff)) { |
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
1538 | char *stripped_user = zephyr_strip_local_realm(zephyr,buff); |
| 15884 | 1539 | purple_debug_info("zephyr","stripped_user %s\n",stripped_user); |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
1540 | if (!purple_blist_find_buddy(purple_connection_get_account(gc),stripped_user)) { |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1541 | b = purple_buddy_new(purple_connection_get_account(gc), stripped_user, NULL); |
| 15884 | 1542 | purple_blist_add_buddy(b, NULL, g, NULL); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1543 | } |
| 9986 | 1544 | g_free(stripped_user); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1545 | } |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1546 | } |
| 2086 | 1547 | } |
| 1548 | fclose(fd); | |
| 1549 | } | |
| 1550 | g_free(filename); | |
| 1551 | } | |
| 1552 | ||
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1553 | static char* normalize_zephyr_exposure(const char* exposure) { |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1554 | char *exp2 = g_strstrip(g_ascii_strup(exposure,-1)); |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1555 | |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1556 | if (!exp2) |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1557 | return EXPOSE_REALMVIS; |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1558 | if (!g_ascii_strcasecmp(exp2, EXPOSE_NONE)) |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1559 | return EXPOSE_NONE; |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1560 | if (!g_ascii_strcasecmp(exp2, EXPOSE_OPSTAFF)) |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1561 | return EXPOSE_OPSTAFF; |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1562 | if (!g_ascii_strcasecmp(exp2, EXPOSE_REALMANN)) |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1563 | return EXPOSE_REALMANN; |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1564 | if (!g_ascii_strcasecmp(exp2, EXPOSE_NETVIS)) |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1565 | return EXPOSE_NETVIS; |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1566 | if (!g_ascii_strcasecmp(exp2, EXPOSE_NETANN)) |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1567 | return EXPOSE_NETANN; |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1568 | return EXPOSE_REALMVIS; |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1569 | } |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1570 | |
| 15884 | 1571 | static void zephyr_login(PurpleAccount * account) |
| 2086 | 1572 | { |
| 15884 | 1573 | PurpleConnection *gc; |
| 9896 | 1574 | zephyr_account *zephyr; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1575 | gboolean read_anyone; |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1576 | gboolean read_zsubs; |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1577 | gchar *exposure; |
| 9427 | 1578 | |
| 15884 | 1579 | gc = purple_account_get_connection(account); |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1580 | read_anyone = purple_account_get_bool(purple_connection_get_account(gc),"read_anyone",TRUE); |
|
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1581 | read_zsubs = purple_account_get_bool(purple_connection_get_account(gc),"read_zsubs",TRUE); |
|
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1582 | exposure = (gchar *)purple_account_get_string(purple_connection_get_account(gc), "exposure_level", EXPOSE_REALMVIS); |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1583 | |
| 10867 | 1584 | #ifdef WIN32 |
| 15884 | 1585 | username = purple_account_get_username(account); |
| 10867 | 1586 | #endif |
|
36055
33978dc8ef6f
Remove redundant OPT_PROTO_IM_IMAGE (use \!PURPLE_CONNECTION_FLAG_NO_IMAGES instead)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36031
diff
changeset
|
1587 | purple_connection_set_flags(gc, PURPLE_CONNECTION_FLAG_AUTO_RESP | |
|
33978dc8ef6f
Remove redundant OPT_PROTO_IM_IMAGE (use \!PURPLE_CONNECTION_FLAG_NO_IMAGES instead)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36031
diff
changeset
|
1588 | PURPLE_CONNECTION_FLAG_HTML | PURPLE_CONNECTION_FLAG_NO_BGCOLOR | |
|
33978dc8ef6f
Remove redundant OPT_PROTO_IM_IMAGE (use \!PURPLE_CONNECTION_FLAG_NO_IMAGES instead)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36031
diff
changeset
|
1589 | PURPLE_CONNECTION_FLAG_NO_URLDESC | PURPLE_CONNECTION_FLAG_NO_IMAGES); |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
1590 | zephyr = g_new0(zephyr_account, 1); |
|
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
1591 | purple_connection_set_protocol_data(gc, zephyr); |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1592 | |
| 9896 | 1593 | zephyr->account = account; |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1594 | |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1595 | /* Make sure that the exposure (visibility) is set to a sane value */ |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1596 | zephyr->exposure=g_strdup(normalize_zephyr_exposure(exposure)); |
| 2086 | 1597 | |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1598 | if (purple_account_get_bool(purple_connection_get_account(gc),"use_tzc",0)) { |
| 15884 | 1599 | zephyr->connection_type = PURPLE_ZEPHYR_TZC; |
| 9896 | 1600 | } else { |
| 15884 | 1601 | zephyr->connection_type = PURPLE_ZEPHYR_KRB4; |
| 9896 | 1602 | } |
| 1603 | ||
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1604 | zephyr->encoding = (char *)purple_account_get_string(purple_connection_get_account(gc), "encoding", ZEPHYR_FALLBACK_CHARSET); |
| 15884 | 1605 | purple_connection_update_progress(gc, _("Connecting"), 0, 8); |
| 9478 | 1606 | |
| 1607 | /* XXX z_call_s should actually try to report the com_err determined error */ | |
| 9896 | 1608 | if (use_tzc(zephyr)) { |
| 1609 | pid_t pid; | |
|
32157
39ba2e2492ee
Rename purple_connection_error_reason to purple_connection_error
Mark Doliner <markdoliner@pidgin.im>
parents:
32154
diff
changeset
|
1610 | /* purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "tzc not supported yet"); */ |
| 9896 | 1611 | if ((pipe(zephyr->totzc) != 0) || (pipe(zephyr->fromtzc) != 0)) { |
| 15884 | 1612 | purple_debug_error("zephyr", "pipe creation failed. killing\n"); |
| 9896 | 1613 | exit(-1); |
| 1614 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1615 | |
| 9896 | 1616 | pid = fork(); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1617 | |
| 9896 | 1618 | if (pid == -1) { |
| 15884 | 1619 | purple_debug_error("zephyr", "forking failed\n"); |
| 9896 | 1620 | exit(-1); |
| 1621 | } | |
| 1622 | if (pid == 0) { | |
| 1623 | unsigned int i=0; | |
| 1624 | gboolean found_ps = FALSE; | |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1625 | gchar ** tzc_cmd_array = g_strsplit(purple_account_get_string(purple_connection_get_account(gc),"tzc_command","/usr/bin/tzc -e %s")," ",0); |
| 9896 | 1626 | if (close(1) == -1) { |
| 1627 | exit(-1); | |
| 1628 | } | |
| 1629 | if (dup2(zephyr->fromtzc[1], 1) == -1) { | |
| 1630 | exit(-1); | |
| 1631 | } | |
| 1632 | if (close(zephyr->fromtzc[1]) == -1) { | |
| 1633 | exit(-1); | |
| 1634 | } | |
| 1635 | if (close(0) == -1) { | |
| 1636 | exit(-1); | |
| 1637 | } | |
| 1638 | if (dup2(zephyr->totzc[0], 0) == -1) { | |
| 1639 | exit(-1); | |
| 1640 | } | |
| 1641 | if (close(zephyr->totzc[0]) == -1) { | |
| 1642 | exit(-1); | |
| 1643 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1644 | /* tzc_command should really be of the form |
| 9896 | 1645 | path/to/tzc -e %s |
| 1646 | or | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1647 | ssh username@hostname pathtotzc -e %s |
| 9896 | 1648 | -- this should not require a password, and ideally should be kerberized ssh -- |
| 1649 | or | |
| 1650 | fsh username@hostname pathtotzc -e %s | |
| 1651 | */ | |
| 1652 | while(tzc_cmd_array[i] != NULL){ | |
| 12621 | 1653 | if (!g_ascii_strncasecmp(tzc_cmd_array[i],"%s",2)) { |
| 9986 | 1654 | /* fprintf(stderr,"replacing %%s with %s\n",zephyr->exposure); */ |
| 9896 | 1655 | tzc_cmd_array[i] = g_strdup(zephyr->exposure); |
| 1656 | found_ps = TRUE; | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1657 | |
| 9896 | 1658 | } else { |
| 9986 | 1659 | /* fprintf(stderr,"keeping %s\n",tzc_cmd_array[i]); */ |
| 9896 | 1660 | } |
| 1661 | i++; | |
| 1662 | } | |
|
8645
8446e0a232e0
[gaim-migrate @ 9397]
Mark Doliner <markdoliner@pidgin.im>
parents:
8644
diff
changeset
|
1663 | |
| 9896 | 1664 | if (!found_ps) { |
|
25080
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1665 | exit(-1); |
| 9896 | 1666 | } |
| 1667 | ||
| 1668 | execvp(tzc_cmd_array[0], tzc_cmd_array); | |
|
25080
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1669 | exit(-1); |
| 9896 | 1670 | } |
| 1671 | else { | |
| 1672 | fd_set rfds; | |
| 1673 | int bufsize = 2048; | |
| 1674 | char *buf = (char *)calloc(bufsize, 1); | |
| 1675 | char *bufcur = buf; | |
| 1676 | struct timeval tv; | |
| 1677 | char *ptr; | |
| 1678 | int parenlevel=0; | |
| 1679 | char* tempstr; | |
| 1680 | int tempstridx; | |
|
25080
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1681 | int select_status; |
| 9896 | 1682 | |
| 9986 | 1683 | zephyr->tzc_pid = pid; |
| 9896 | 1684 | /* wait till we have data to read from ssh */ |
| 1685 | FD_ZERO(&rfds); | |
| 1686 | FD_SET(zephyr->fromtzc[ZEPHYR_FD_READ], &rfds); | |
| 1687 | ||
| 1688 | tv.tv_sec = 10; | |
| 1689 | tv.tv_usec = 0; | |
| 1690 | ||
| 15884 | 1691 | purple_debug_info("zephyr", "about to read from tzc\n"); |
| 9896 | 1692 | |
|
25085
1f1e715da7b9
Sadrul pointed out that I'm less than bright today and let a // comment slip in.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
25080
diff
changeset
|
1693 | if (waitpid(pid, NULL, WNOHANG) == 0) { /* Only select if tzc is still running */ |
|
25080
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1694 | purple_debug_info("zephyr", "about to read from tzc\n"); |
|
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1695 | select_status = select(zephyr->fromtzc[ZEPHYR_FD_READ] + 1, &rfds, NULL, NULL, NULL); |
|
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1696 | } |
|
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1697 | else { |
|
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1698 | purple_debug_info("zephyr", "tzc exited early\n"); |
|
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1699 | select_status = -1; |
|
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1700 | } |
| 9896 | 1701 | |
| 1702 | FD_ZERO(&rfds); | |
| 1703 | FD_SET(zephyr->fromtzc[ZEPHYR_FD_READ], &rfds); | |
|
25080
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1704 | while (select_status > 0 && |
|
fd2910516af3
Fix a Zephyr crash and 10-second delay that can happen when you have an account
Michael Terry <michael.terry@canonical.com>
parents:
24810
diff
changeset
|
1705 | select(zephyr->fromtzc[ZEPHYR_FD_READ] + 1, &rfds, NULL, NULL, &tv) > 0) { |
|
35518
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1706 | if (read(zephyr->fromtzc[ZEPHYR_FD_READ], bufcur, 1) != 1) { |
|
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1707 | purple_debug_error("zephyr", "couldn't read\n"); |
|
33892
ef97228bc5f0
Fix most of warnings for gtk2 and linux
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33796
diff
changeset
|
1708 | purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "couldn't read"); |
|
35518
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1709 | free(buf); |
|
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1710 | return; |
|
0e2608c5682d
Backport some warning fixes from default branch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
33787
diff
changeset
|
1711 | } |
| 9896 | 1712 | bufcur++; |
| 1713 | if ((bufcur - buf) > (bufsize - 1)) { | |
| 1714 | if ((buf = realloc(buf, bufsize * 2)) == NULL) { | |
| 1715 | exit(-1); | |
| 1716 | } else { | |
| 1717 | bufcur = buf + bufsize; | |
| 1718 | bufsize *= 2; | |
| 1719 | } | |
| 1720 | } | |
| 1721 | FD_ZERO(&rfds); | |
| 1722 | FD_SET(zephyr->fromtzc[ZEPHYR_FD_READ], &rfds); | |
| 1723 | tv.tv_sec = 10; | |
| 1724 | tv.tv_usec = 0; | |
| 2086 | 1725 | |
| 9896 | 1726 | } |
| 9986 | 1727 | /* fprintf(stderr, "read from tzc\n"); */ |
| 9896 | 1728 | *bufcur = '\0'; |
| 1729 | ptr = buf; | |
| 1730 | ||
| 1731 | /* ignore all tzcoutput till we've received the first (*/ | |
| 1732 | while (ptr < bufcur && (*ptr !='(')) { | |
| 1733 | ptr++; | |
| 1734 | } | |
| 1735 | if (ptr >=bufcur) { | |
|
32157
39ba2e2492ee
Rename purple_connection_error_reason to purple_connection_error
Mark Doliner <markdoliner@pidgin.im>
parents:
32154
diff
changeset
|
1736 | purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "invalid output by tzc (or bad parsing code)"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1737 | free(buf); |
| 9896 | 1738 | return; |
| 1739 | } | |
| 9427 | 1740 | |
| 9896 | 1741 | while(ptr < bufcur) { |
| 1742 | if (*ptr == '(') { | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1743 | parenlevel++; |
| 9896 | 1744 | } |
| 1745 | else if (*ptr == ')') { | |
| 1746 | parenlevel--; | |
| 1747 | } | |
| 15884 | 1748 | purple_debug_info("zephyr","tzc parenlevel is %d\n",parenlevel); |
| 9896 | 1749 | switch (parenlevel) { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1750 | case 0: |
| 9896 | 1751 | break; |
| 1752 | case 1: | |
| 1753 | /* Search for next beginning (, or for the ending */ | |
| 1754 | ptr++; | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1755 | while((*ptr != '(') && (*ptr != ')') && (ptr <bufcur)) |
| 9896 | 1756 | ptr++; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1757 | if (ptr >= bufcur) |
| 15884 | 1758 | purple_debug_error("zephyr","tzc parsing error\n"); |
| 9896 | 1759 | break; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1760 | case 2: |
| 9896 | 1761 | /* You are probably at |
| 1762 | (foo . bar ) or (foo . "bar") or (foo . chars) or (foo . numbers) or (foo . () ) | |
| 1763 | Parse all the data between the first and last f, and move past ) | |
| 1764 | */ | |
| 1765 | tempstr = g_malloc0(20000); | |
| 1766 | tempstridx=0; | |
| 1767 | while(parenlevel >1) { | |
| 1768 | ptr++; | |
| 1769 | if (*ptr == '(') | |
| 1770 | parenlevel++; | |
| 1771 | if (*ptr == ')') | |
| 1772 | parenlevel--; | |
| 1773 | if (parenlevel > 1) { | |
| 1774 | tempstr[tempstridx++]=*ptr; | |
| 1775 | } else { | |
| 1776 | ptr++; | |
| 1777 | } | |
| 1778 | } | |
| 15884 | 1779 | purple_debug_info("zephyr","tempstr parsed\n"); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1780 | /* tempstr should now be a tempstridx length string containing all characters |
| 9896 | 1781 | from that after the first ( to the one before the last paren ). */ |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1782 | /* We should have the following possible lisp strings but we don't care |
| 9896 | 1783 | (tzcspew . start) (version . "something") (pid . number)*/ |
| 1784 | /* We care about 'zephyrid . "username@REALM.NAME"' and 'exposure . "SOMETHING"' */ | |
| 1785 | tempstridx=0; | |
| 1786 | if (!g_ascii_strncasecmp(tempstr,"zephyrid",8)) { | |
| 1787 | gchar* username = g_malloc0(100); | |
| 1788 | int username_idx=0; | |
| 1789 | char *realm; | |
| 15884 | 1790 | purple_debug_info("zephyr","zephyrid found\n"); |
| 9896 | 1791 | tempstridx+=8; |
| 1792 | while(tempstr[tempstridx] !='"' && tempstridx < 20000) | |
| 1793 | tempstridx++; | |
| 1794 | tempstridx++; | |
| 1795 | while(tempstr[tempstridx] !='"' && tempstridx < 20000) | |
| 1796 | username[username_idx++]=tempstr[tempstridx++]; | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1797 | |
| 9896 | 1798 | zephyr->username = g_strdup_printf("%s",username); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1799 | if ((realm = strchr(username,'@'))) |
| 9896 | 1800 | zephyr->realm = g_strdup_printf("%s",realm+1); |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1801 | else { |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1802 | realm = (gchar *)purple_account_get_string(purple_connection_get_account(gc),"realm",""); |
| 12621 | 1803 | if (!*realm) { |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1804 | realm = "local-realm"; |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1805 | } |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1806 | zephyr->realm = g_strdup(realm); |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1807 | g_strlcpy(__Zephyr_realm, (const char*)zephyr->realm, REALM_SZ-1); |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1808 | } |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1809 | /* else { |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1810 | zephyr->realm = g_strdup("local-realm"); |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1811 | }*/ |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1812 | |
| 9896 | 1813 | g_free(username); |
| 1814 | } else { | |
| 15884 | 1815 | purple_debug_info("zephyr", "something that's not zephyr id found %s\n",tempstr); |
| 9896 | 1816 | } |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1817 | |
| 9896 | 1818 | /* We don't care about anything else yet */ |
| 1819 | g_free(tempstr); | |
| 1820 | break; | |
| 1821 | default: | |
| 15884 | 1822 | purple_debug_info("zephyr","parenlevel is not 1 or 2\n"); |
| 9896 | 1823 | /* This shouldn't be happening */ |
| 1824 | break; | |
| 1825 | } | |
| 1826 | if (parenlevel==0) | |
| 1827 | break; | |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1828 | } /* while (ptr < bufcur) */ |
| 15884 | 1829 | purple_debug_info("zephyr", "tzc startup done\n"); |
|
13454
10592212bb27
[gaim-migrate @ 15828]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1830 | free(buf); |
| 9896 | 1831 | } |
| 1832 | } | |
| 1833 | else if ( use_zeph02(zephyr)) { | |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1834 | gchar* realm; |
| 9896 | 1835 | z_call_s(ZInitialize(), "Couldn't initialize zephyr"); |
| 1836 | z_call_s(ZOpenPort(&(zephyr->port)), "Couldn't open port"); | |
| 1837 | z_call_s(ZSetLocation((char *)zephyr->exposure), "Couldn't set location"); | |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1838 | |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1839 | realm = (gchar *)purple_account_get_string(purple_connection_get_account(gc),"realm",""); |
| 12621 | 1840 | if (!*realm) { |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1841 | realm = ZGetRealm(); |
| 12621 | 1842 | } |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1843 | zephyr->realm = g_strdup(realm); |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1844 | g_strlcpy(__Zephyr_realm, (const char*)zephyr->realm, REALM_SZ-1); |
| 9896 | 1845 | zephyr->username = g_strdup(ZGetSender()); |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1846 | |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1847 | /* zephyr->realm = g_strdup(ZGetRealm()); */ |
| 15884 | 1848 | purple_debug_info("zephyr","realm: %s\n",zephyr->realm); |
| 12621 | 1849 | } |
| 9896 | 1850 | else { |
|
32157
39ba2e2492ee
Rename purple_connection_error_reason to purple_connection_error
Mark Doliner <markdoliner@pidgin.im>
parents:
32154
diff
changeset
|
1851 | purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "Only ZEPH0.2 supported currently"); |
| 9896 | 1852 | return; |
| 1853 | } | |
| 15884 | 1854 | purple_debug_info("zephyr","does it get here\n"); |
| 1855 | purple_debug_info("zephyr"," realm: %s username:%s\n", zephyr->realm, zephyr->username); | |
| 9896 | 1856 | |
| 1857 | /* For now */ | |
| 1858 | zephyr->galaxy = NULL; | |
| 1859 | zephyr->krbtkfile = NULL; | |
| 1860 | zephyr_inithosts(zephyr); | |
| 1861 | ||
| 1862 | if (zephyr_subscribe_to(zephyr,"MESSAGE","PERSONAL",zephyr->username,NULL) != ZERR_NONE) { | |
| 9478 | 1863 | /* XXX don't translate this yet. It could be written better */ |
| 1864 | /* XXX error messages could be handled with more detail */ | |
|
32624
f957ad287bcc
Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents:
32613
diff
changeset
|
1865 | purple_notify_error(purple_account_get_connection(account), NULL, |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34312
diff
changeset
|
1866 | "Unable to subscribe to messages", "Unable to subscribe to initial messages", |
|
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34312
diff
changeset
|
1867 | purple_request_cpar_from_connection(gc)); |
| 9478 | 1868 | return; |
| 2086 | 1869 | } |
| 1870 | ||
|
34746
dc9c911dbd35
Started GObjectification of PurpleConnection.
Ankit Vani <a@nevitus.org>
parents:
34728
diff
changeset
|
1871 | purple_connection_set_state(gc, PURPLE_CONNECTION_CONNECTED); |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1872 | |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1873 | if (read_anyone) |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1874 | process_anyone(gc); |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1875 | if (read_zsubs) |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1876 | process_zsubs(zephyr); |
|
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
1877 | |
| 9896 | 1878 | if (use_zeph02(zephyr)) { |
|
38433
361c801c4536
Remove purple_timeout_* function usage
Mike Ruprecht <cmaiku@gmail.com>
parents:
37523
diff
changeset
|
1879 | zephyr->nottimer = g_timeout_add(100, check_notify_zeph02, gc); |
| 9896 | 1880 | } else if (use_tzc(zephyr)) { |
|
38433
361c801c4536
Remove purple_timeout_* function usage
Mike Ruprecht <cmaiku@gmail.com>
parents:
37523
diff
changeset
|
1881 | zephyr->nottimer = g_timeout_add(100, check_notify_tzc, gc); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1882 | } |
|
38433
361c801c4536
Remove purple_timeout_* function usage
Mike Ruprecht <cmaiku@gmail.com>
parents:
37523
diff
changeset
|
1883 | zephyr->loctimer = g_timeout_add_seconds(20, check_loc, gc); |
| 2086 | 1884 | |
| 1885 | } | |
| 1886 | ||
| 9610 | 1887 | static void write_zsubs(zephyr_account *zephyr) |
| 2086 | 1888 | { |
| 9896 | 1889 | /* Exports subscription (chat) list back to |
| 1890 | * .zephyr.subs | |
| 1891 | * XXX deal with %host%, %canon%, unsubscriptions, and negative subscriptions (punts?) | |
| 1892 | */ | |
| 9434 | 1893 | |
| 9610 | 1894 | GSList *s = zephyr->subscrips; |
| 2086 | 1895 | zephyr_triple *zt; |
| 1896 | FILE *fd; | |
| 1897 | char *fname; | |
| 1898 | ||
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1899 | char **triple; |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1900 | |
| 15884 | 1901 | fname = g_strdup_printf("%s/.zephyr.subs", purple_home_dir()); |
|
10589
4e10236e06d4
[gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents:
10401
diff
changeset
|
1902 | fd = g_fopen(fname, "w"); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1903 | |
| 2086 | 1904 | if (!fd) { |
| 1905 | g_free(fname); | |
| 1906 | return; | |
| 1907 | } | |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1908 | |
| 2086 | 1909 | while (s) { |
| 9478 | 1910 | char *zclass, *zinst, *zrecip; |
| 2086 | 1911 | zt = s->data; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1912 | triple = g_strsplit(zt->name, ",", 3); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1913 | |
| 9478 | 1914 | /* deal with classes */ |
| 9610 | 1915 | if (!g_ascii_strcasecmp(triple[0],zephyr->ourhost)) { |
|
9775
e3a3555b0621
[gaim-migrate @ 10643]
Daniel Atallah <datallah@pidgin.im>
parents:
9754
diff
changeset
|
1916 | zclass = g_strdup("%host%"); |
| 9610 | 1917 | } else if (!g_ascii_strcasecmp(triple[0],zephyr->ourhostcanon)) { |
|
9775
e3a3555b0621
[gaim-migrate @ 10643]
Daniel Atallah <datallah@pidgin.im>
parents:
9754
diff
changeset
|
1918 | zclass = g_strdup("%canon%"); |
| 9478 | 1919 | } else { |
| 1920 | zclass = g_strdup(triple[0]); | |
| 1921 | } | |
| 1922 | ||
| 1923 | /* deal with instances */ | |
| 1924 | ||
| 9610 | 1925 | if (!g_ascii_strcasecmp(triple[1],zephyr->ourhost)) { |
|
9775
e3a3555b0621
[gaim-migrate @ 10643]
Daniel Atallah <datallah@pidgin.im>
parents:
9754
diff
changeset
|
1926 | zinst = g_strdup("%host%"); |
| 9610 | 1927 | } else if (!g_ascii_strcasecmp(triple[1],zephyr->ourhostcanon)) { |
| 9896 | 1928 | zinst = g_strdup("%canon%");; |
| 1929 | } else { | |
| 9478 | 1930 | zinst = g_strdup(triple[1]); |
| 9896 | 1931 | } |
| 9478 | 1932 | |
| 1933 | /* deal with recipients */ | |
| 1934 | if (triple[2] == NULL) { | |
| 1935 | zrecip = g_strdup("*"); | |
| 1936 | } else if (!g_ascii_strcasecmp(triple[2],"")){ | |
| 1937 | zrecip = g_strdup("*"); | |
| 9896 | 1938 | } else if (!g_ascii_strcasecmp(triple[2], zephyr->username)) { |
| 9478 | 1939 | zrecip = g_strdup("%me%"); |
| 3277 | 1940 | } else { |
| 9478 | 1941 | zrecip = g_strdup(triple[2]); |
| 3277 | 1942 | } |
| 9478 | 1943 | |
| 1944 | fprintf(fd, "%s,%s,%s\n",zclass,zinst,zrecip); | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
1945 | |
| 9478 | 1946 | g_free(zclass); |
| 1947 | g_free(zinst); | |
| 1948 | g_free(zrecip); | |
| 3277 | 1949 | g_free(triple); |
| 2086 | 1950 | s = s->next; |
| 1951 | } | |
| 1952 | g_free(fname); | |
| 1953 | fclose(fd); | |
| 1954 | } | |
| 1955 | ||
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
1956 | static void write_anyone(zephyr_account *zephyr) |
| 2086 | 1957 | { |
|
27199
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
27198
diff
changeset
|
1958 | GSList *buddies; |
| 9912 | 1959 | char *fname; |
| 2086 | 1960 | FILE *fd; |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
1961 | PurpleAccount *account; |
| 15884 | 1962 | fname = g_strdup_printf("%s/.anyone", purple_home_dir()); |
|
10589
4e10236e06d4
[gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents:
10401
diff
changeset
|
1963 | fd = g_fopen(fname, "w"); |
| 2086 | 1964 | if (!fd) { |
| 1965 | g_free(fname); | |
| 1966 | return; | |
| 1967 | } | |
| 1968 | ||
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
1969 | account = zephyr->account; |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34717
diff
changeset
|
1970 | for (buddies = purple_blist_find_buddies(account, NULL); buddies; |
|
27199
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
27198
diff
changeset
|
1971 | buddies = g_slist_delete_link(buddies, buddies)) { |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
27198
diff
changeset
|
1972 | PurpleBuddy *b = buddies->data; |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
27198
diff
changeset
|
1973 | gchar *stripped_user = zephyr_strip_local_realm(zephyr, purple_buddy_get_name(b)); |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
27198
diff
changeset
|
1974 | fprintf(fd, "%s\n", stripped_user); |
|
ab2af9d15cba
Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents:
27198
diff
changeset
|
1975 | g_free(stripped_user); |
| 2086 | 1976 | } |
| 1977 | ||
| 1978 | fclose(fd); | |
| 1979 | g_free(fname); | |
| 1980 | } | |
| 1981 | ||
| 15884 | 1982 | static void zephyr_close(PurpleConnection * gc) |
| 2086 | 1983 | { |
| 1984 | GList *l; | |
| 1985 | GSList *s; | |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
1986 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 9986 | 1987 | pid_t tzc_pid = zephyr->tzc_pid; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1988 | |
| 9610 | 1989 | l = zephyr->pending_zloc_names; |
| 2086 | 1990 | while (l) { |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1991 | g_free((char *)l->data); |
| 2086 | 1992 | l = l->next; |
| 1993 | } | |
| 9610 | 1994 | g_list_free(zephyr->pending_zloc_names); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1995 | |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1996 | if (purple_account_get_bool(purple_connection_get_account(gc), "write_anyone", FALSE)) |
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
1997 | write_anyone(zephyr); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
1998 | |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
1999 | if (purple_account_get_bool(purple_connection_get_account(gc), "write_zsubs", FALSE)) |
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
2000 | write_zsubs(zephyr); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2001 | |
| 9610 | 2002 | s = zephyr->subscrips; |
| 2086 | 2003 | while (s) { |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2004 | free_triple((zephyr_triple *) s->data); |
| 2086 | 2005 | s = s->next; |
| 2006 | } | |
| 9610 | 2007 | g_slist_free(zephyr->subscrips); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2008 | |
| 9610 | 2009 | if (zephyr->nottimer) |
|
38433
361c801c4536
Remove purple_timeout_* function usage
Mike Ruprecht <cmaiku@gmail.com>
parents:
37523
diff
changeset
|
2010 | g_source_remove(zephyr->nottimer); |
| 9610 | 2011 | zephyr->nottimer = 0; |
| 2012 | if (zephyr->loctimer) | |
|
38433
361c801c4536
Remove purple_timeout_* function usage
Mike Ruprecht <cmaiku@gmail.com>
parents:
37523
diff
changeset
|
2013 | g_source_remove(zephyr->loctimer); |
| 9610 | 2014 | zephyr->loctimer = 0; |
| 2015 | gc = NULL; | |
| 9896 | 2016 | if (use_zeph02(zephyr)) { |
| 2017 | z_call(ZCancelSubscriptions(0)); | |
| 2018 | z_call(ZUnsetLocation()); | |
| 2019 | z_call(ZClosePort()); | |
| 2020 | } else { | |
| 2021 | /* assume tzc */ | |
| 9986 | 2022 | if (kill(tzc_pid,SIGTERM) == -1) { |
| 2023 | int err=errno; | |
| 2024 | if (err==EINVAL) { | |
| 15884 | 2025 | purple_debug_error("zephyr","An invalid signal was specified when killing tzc\n"); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2026 | } |
| 9986 | 2027 | else if (err==ESRCH) { |
| 15884 | 2028 | purple_debug_error("zephyr","Tzc's pid didn't exist while killing tzc\n"); |
| 9986 | 2029 | } |
| 2030 | else if (err==EPERM) { | |
| 15884 | 2031 | purple_debug_error("zephyr","purple didn't have permission to kill tzc\n"); |
| 9986 | 2032 | } |
| 2033 | else { | |
| 15884 | 2034 | purple_debug_error("zephyr","miscellaneous error while attempting to close tzc\n"); |
| 9986 | 2035 | } |
| 2036 | } | |
| 9896 | 2037 | } |
| 2086 | 2038 | } |
| 2039 | ||
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2040 | static int zephyr_send_message(zephyr_account *zephyr,char* zclass, char* instance, char* recipient, const char *im, |
| 9478 | 2041 | const char *sig, char *opcode) ; |
| 9434 | 2042 | |
|
22104
56970903b8e9
Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents:
20288
diff
changeset
|
2043 | static const char * zephyr_get_signature(void) |
| 9434 | 2044 | { |
| 9478 | 2045 | /* XXX add zephyr error reporting */ |
| 2046 | const char * sig =ZGetVariable("zwrite-signature"); | |
| 9896 | 2047 | if (!sig) { |
| 2048 | sig = g_get_real_name(); | |
| 2049 | } | |
| 2050 | return sig; | |
| 9434 | 2051 | } |
| 2052 | ||
|
36077
b7328f4317c7
Switch purple_serv_chat_send to PurpleMessage
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36076
diff
changeset
|
2053 | static int zephyr_chat_send(PurpleConnection * gc, int id, PurpleMessage *msg) |
| 2086 | 2054 | { |
| 2055 | zephyr_triple *zt; | |
| 2056 | const char *sig; | |
|
34622
753f46dd000f
Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents:
34578
diff
changeset
|
2057 | PurpleChatConversation *gcc; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2058 | char *inst; |
| 9896 | 2059 | char *recipient; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2060 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 2086 | 2061 | |
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
2062 | zt = find_sub_by_id(zephyr,id); |
| 2086 | 2063 | if (!zt) |
| 2064 | /* this should never happen. */ | |
|
2167
cbb558585911
[gaim-migrate @ 2177]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2162
diff
changeset
|
2065 | return -EINVAL; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2066 | |
| 9896 | 2067 | sig = zephyr_get_signature(); |
| 2086 | 2068 | |
|
34643
e261a066d78d
Refactored zephyr protocol to use GObject conversation API
Ankit Vani <a@nevitus.org>
parents:
34625
diff
changeset
|
2069 | gcc = purple_conversations_find_chat_with_account(zt->name, |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
2070 | purple_connection_get_account(gc)); |
| 8212 | 2071 | |
|
34622
753f46dd000f
Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents:
34578
diff
changeset
|
2072 | if (!(inst = (char *)purple_chat_conversation_get_topic(gcc))) |
| 9434 | 2073 | inst = g_strdup("PERSONAL"); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2074 | |
| 4793 | 2075 | if (!g_ascii_strcasecmp(zt->recipient, "*")) |
| 9896 | 2076 | recipient = local_zephyr_normalize(zephyr,""); |
| 2086 | 2077 | else |
| 9896 | 2078 | recipient = local_zephyr_normalize(zephyr,zt->recipient); |
| 8451 | 2079 | |
|
36077
b7328f4317c7
Switch purple_serv_chat_send to PurpleMessage
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36076
diff
changeset
|
2080 | zephyr_send_message(zephyr, zt->class, inst, recipient, |
|
b7328f4317c7
Switch purple_serv_chat_send to PurpleMessage
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36076
diff
changeset
|
2081 | purple_message_get_contents(msg), sig, ""); |
|
2167
cbb558585911
[gaim-migrate @ 2177]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2162
diff
changeset
|
2082 | return 0; |
| 2086 | 2083 | } |
| 2084 | ||
| 9434 | 2085 | |
|
36076
a0e5b68ff4ef
Switch purple_serv_send_im to PurpleMessage
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36055
diff
changeset
|
2086 | static int zephyr_send_im(PurpleConnection *gc, PurpleMessage *msg) |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2087 | { |
| 2086 | 2088 | const char *sig; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2089 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
|
36076
a0e5b68ff4ef
Switch purple_serv_send_im to PurpleMessage
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36055
diff
changeset
|
2090 | |
|
a0e5b68ff4ef
Switch purple_serv_send_im to PurpleMessage
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36055
diff
changeset
|
2091 | if (purple_message_get_flags(msg) & PURPLE_MESSAGE_AUTO_RESP) { |
| 2086 | 2092 | sig = "Automated reply:"; |
|
36076
a0e5b68ff4ef
Switch purple_serv_send_im to PurpleMessage
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36055
diff
changeset
|
2093 | } else { |
| 9434 | 2094 | sig = zephyr_get_signature(); |
| 2086 | 2095 | } |
|
36076
a0e5b68ff4ef
Switch purple_serv_send_im to PurpleMessage
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36055
diff
changeset
|
2096 | zephyr_send_message(zephyr, "MESSAGE", "PERSONAL", |
|
36098
4951752ad038
Split PurpleMessage into incoming, outgoing and system
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36092
diff
changeset
|
2097 | local_zephyr_normalize(zephyr, purple_message_get_recipient(msg)), |
|
36076
a0e5b68ff4ef
Switch purple_serv_send_im to PurpleMessage
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36055
diff
changeset
|
2098 | purple_message_get_contents(msg), sig, ""); |
| 9434 | 2099 | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2100 | return 1; |
| 9434 | 2101 | } |
| 2086 | 2102 | |
| 9896 | 2103 | /* Munge the outgoing zephyr so that any quotes or backslashes are |
| 2104 | escaped and do not confuse tzc: */ | |
| 2105 | ||
|
12424
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
12216
diff
changeset
|
2106 | static char* zephyr_tzc_escape_msg(const char *message) |
| 9896 | 2107 | { |
|
36256
a437550a9308
Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
36029
diff
changeset
|
2108 | gsize pos = 0, pos2 = 0; |
| 9896 | 2109 | char *newmsg; |
| 2110 | ||
|
32189
3af8d41121b6
Don't use strlen() when all you're trying to do is check if the string
Mark Doliner <markdoliner@pidgin.im>
parents:
32188
diff
changeset
|
2111 | if (message && *message) { |
| 9896 | 2112 | newmsg = g_new0(char,1+strlen(message)*2); |
| 2113 | while(pos < strlen(message)) { | |
| 2114 | if (message[pos]=='\\') { | |
| 2115 | newmsg[pos2]='\\'; | |
| 2116 | newmsg[pos2+1]='\\'; | |
| 2117 | pos2+=2; | |
| 2118 | } | |
| 2119 | else if (message[pos]=='"') { | |
| 2120 | newmsg[pos2]='\\'; | |
| 2121 | newmsg[pos2+1]='"'; | |
| 2122 | pos2+=2; | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2123 | } |
| 9896 | 2124 | else { |
| 2125 | newmsg[pos2] = message[pos]; | |
| 2126 | pos2++; | |
| 2127 | } | |
| 2128 | pos++; | |
| 2129 | } | |
| 2130 | } else { | |
| 2131 | newmsg = g_strdup(""); | |
| 2132 | } | |
| 9986 | 2133 | /* fprintf(stderr,"newmsg %s message %s\n",newmsg,message); */ |
| 9896 | 2134 | return newmsg; |
| 2135 | } | |
| 2136 | ||
| 2137 | char* zephyr_tzc_deescape_str(const char *message) | |
| 2138 | { | |
|
36256
a437550a9308
Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
36029
diff
changeset
|
2139 | gsize pos = 0, pos2 = 0; |
| 9896 | 2140 | char *newmsg; |
| 2141 | ||
|
32189
3af8d41121b6
Don't use strlen() when all you're trying to do is check if the string
Mark Doliner <markdoliner@pidgin.im>
parents:
32188
diff
changeset
|
2142 | if (message && *message) { |
| 9896 | 2143 | newmsg = g_new0(char,strlen(message)+1); |
| 2144 | while(pos < strlen(message)) { | |
| 2145 | if (message[pos]=='\\') { | |
| 2146 | pos++; | |
| 2147 | } | |
| 2148 | newmsg[pos2] = message[pos]; | |
| 2149 | pos++;pos2++; | |
| 2150 | } | |
| 2151 | newmsg[pos2]='\0'; | |
| 2152 | } else { | |
| 2153 | newmsg = g_strdup(""); | |
| 2154 | } | |
| 2155 | ||
| 2156 | return newmsg; | |
| 2157 | } | |
| 2158 | ||
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2159 | static int zephyr_send_message(zephyr_account *zephyr,char* zclass, char* instance, char* recipient, const char *im, |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2160 | const char *sig, char *opcode) |
| 9434 | 2161 | { |
| 8451 | 2162 | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2163 | /* (From the tzc source) |
| 9896 | 2164 | * emacs sends something of the form: |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2165 | * ((class . "MESSAGE") |
| 9896 | 2166 | * (auth . t) |
| 2167 | * (recipients ("PERSONAL" . "bovik") ("test" . "")) | |
| 2168 | * (sender . "bovik") | |
| 2169 | * (message . ("Harry Bovik" "my zgram")) | |
| 2170 | * ) | |
| 2171 | */ | |
| 2172 | char *html_buf; | |
| 2173 | char *html_buf2; | |
| 2174 | html_buf = html_to_zephyr(im); | |
| 15884 | 2175 | html_buf2 = purple_unescape_html(html_buf); |
| 9434 | 2176 | |
| 9896 | 2177 | if(use_tzc(zephyr)) { |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2178 | size_t len; |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2179 | size_t result; |
| 9896 | 2180 | char* zsendstr; |
| 2181 | /* CMU cclub tzc doesn't grok opcodes for now */ | |
| 2182 | char* tzc_sig = zephyr_tzc_escape_msg(sig); | |
| 2183 | char *tzc_body = zephyr_tzc_escape_msg(html_buf2); | |
| 2184 | zsendstr = g_strdup_printf("((tzcfodder . send) (class . \"%s\") (auth . t) (recipients (\"%s\" . \"%s\")) (message . (\"%s\" \"%s\")) ) \n", | |
| 9986 | 2185 | zclass, instance, recipient, tzc_sig, tzc_body); |
| 2186 | /* fprintf(stderr,"zsendstr = %s\n",zsendstr); */ | |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2187 | len = strlen(zsendstr); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2188 | result = write(zephyr->totzc[ZEPHYR_FD_WRITE], zsendstr, len); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2189 | if (result != len) { |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2190 | g_free(tzc_sig); |
|
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2191 | g_free(tzc_body); |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2192 | g_free(zsendstr); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2193 | g_free(html_buf2); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2194 | g_free(html_buf); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2195 | return errno; |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2196 | } |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2197 | g_free(tzc_sig); |
|
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2198 | g_free(tzc_body); |
| 9896 | 2199 | g_free(zsendstr); |
| 2200 | } else if (use_zeph02(zephyr)) { | |
| 2201 | ZNotice_t notice; | |
| 2202 | char *buf = g_strdup_printf("%s%c%s", sig, '\0', html_buf2); | |
|
19387
8dc4480381f3
bcopy and bzero shouldn't be used. This allows Alver to compile nat-pmp.c on one of his obscure systems (and I fixed some other stuff that I noticed at the same time).
Daniel Atallah <datallah@pidgin.im>
parents:
17156
diff
changeset
|
2203 | memset((char *)¬ice, 0, sizeof(notice)); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2204 | |
| 9896 | 2205 | notice.z_kind = ACKED; |
| 2206 | notice.z_port = 0; | |
| 2207 | notice.z_opcode = ""; | |
| 2208 | notice.z_class = zclass; | |
| 2209 | notice.z_class_inst = instance; | |
| 2210 | notice.z_recipient = recipient; | |
| 2211 | notice.z_sender = 0; | |
| 2212 | notice.z_default_format = "Class $class, Instance $instance:\n" "To: @bold($recipient) at $time $date\n" "From: @bold($1) <$sender>\n\n$2"; | |
| 2213 | notice.z_message_len = strlen(html_buf2) + strlen(sig) + 2; | |
| 2214 | notice.z_message = buf; | |
| 2215 | notice.z_opcode = g_strdup(opcode); | |
|
19832
84b69b21672b
Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19387
diff
changeset
|
2216 | purple_debug_info("zephyr","About to send notice\n"); |
| 9896 | 2217 | if (! ZSendNotice(¬ice, ZAUTH) == ZERR_NONE) { |
| 2218 | /* XXX handle errors here */ | |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2219 | g_free(buf); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2220 | g_free(html_buf2); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2221 | g_free(html_buf); |
| 9896 | 2222 | return 0; |
| 2223 | } | |
|
19832
84b69b21672b
Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19387
diff
changeset
|
2224 | purple_debug_info("zephyr","notice sent\n"); |
| 9896 | 2225 | g_free(buf); |
| 9478 | 2226 | } |
| 2227 | ||
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2228 | g_free(html_buf2); |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2229 | g_free(html_buf); |
| 8451 | 2230 | |
| 9896 | 2231 | return 1; |
| 2086 | 2232 | } |
| 2233 | ||
| 9896 | 2234 | char *local_zephyr_normalize(zephyr_account *zephyr,const char *orig) |
| 8354 | 2235 | { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2236 | /* |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2237 | Basically the inverse of zephyr_strip_local_realm |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2238 | */ |
| 9896 | 2239 | char* buf; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2240 | |
| 8354 | 2241 | if (!g_ascii_strcasecmp(orig, "")) { |
| 9896 | 2242 | return g_strdup(""); |
| 7126 | 2243 | } |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2244 | |
| 9896 | 2245 | if (strchr(orig,'@')) { |
| 2246 | buf = g_strdup_printf("%s",orig); | |
| 2086 | 2247 | } else { |
| 9896 | 2248 | buf = g_strdup_printf("%s@%s",orig,zephyr->realm); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2249 | } |
| 2086 | 2250 | return buf; |
| 2251 | } | |
| 2252 | ||
|
22391
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2253 | static const char *zephyr_normalize(const PurpleAccount *account, const char *who) |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2254 | { |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2255 | static char buf[BUF_LEN]; |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2256 | PurpleConnection *gc; |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2257 | char *tmp; |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2258 | |
|
35853
700097e7206b
Zephyr: fix username validation
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35692
diff
changeset
|
2259 | if (account == NULL) { |
|
700097e7206b
Zephyr: fix username validation
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35692
diff
changeset
|
2260 | if (strlen(who) >= sizeof(buf)) |
|
700097e7206b
Zephyr: fix username validation
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35692
diff
changeset
|
2261 | return NULL; |
|
700097e7206b
Zephyr: fix username validation
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35692
diff
changeset
|
2262 | return who; |
|
700097e7206b
Zephyr: fix username validation
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35692
diff
changeset
|
2263 | } |
|
700097e7206b
Zephyr: fix username validation
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35692
diff
changeset
|
2264 | |
|
22391
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2265 | gc = purple_account_get_connection(account); |
|
22543
a73c80f1b40d
Fix a crash in the zephyr normalize function that I added when gc is
Mark Doliner <markdoliner@pidgin.im>
parents:
22391
diff
changeset
|
2266 | if (gc == NULL) |
|
a73c80f1b40d
Fix a crash in the zephyr normalize function that I added when gc is
Mark Doliner <markdoliner@pidgin.im>
parents:
22391
diff
changeset
|
2267 | return NULL; |
|
a73c80f1b40d
Fix a crash in the zephyr normalize function that I added when gc is
Mark Doliner <markdoliner@pidgin.im>
parents:
22391
diff
changeset
|
2268 | |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2269 | tmp = local_zephyr_normalize(purple_connection_get_protocol_data(gc), who); |
|
22391
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2270 | |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2271 | if (strlen(tmp) >= sizeof(buf)) { |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2272 | g_free(tmp); |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2273 | return NULL; |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2274 | } |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2275 | |
|
31954
e5631d5590cc
Replace numerous strcpy() invocations with strlcpy() in Zephyr.
Ethan Blanton <elb@pidgin.im>
parents:
31595
diff
changeset
|
2276 | g_strlcpy(buf, tmp, sizeof(buf)); |
|
22391
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2277 | g_free(tmp); |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2278 | |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2279 | return buf; |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2280 | } |
|
823ac1e9cfbb
Get rid of some privacy checking code from zephyr that is done in
Mark Doliner <markdoliner@pidgin.im>
parents:
22389
diff
changeset
|
2281 | |
| 15884 | 2282 | static void zephyr_zloc(PurpleConnection *gc, const char *who) |
| 2086 | 2283 | { |
| 2284 | ZAsyncLocateData_t ald; | |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2285 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 9896 | 2286 | gchar* normalized_who = local_zephyr_normalize(zephyr,who); |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2287 | |
| 9896 | 2288 | if (use_zeph02(zephyr)) { |
| 2289 | if (ZRequestLocations(normalized_who, &ald, UNACKED, ZAUTH) == ZERR_NONE) { | |
| 2290 | zephyr->pending_zloc_names = g_list_append(zephyr->pending_zloc_names, | |
| 2291 | g_strdup(normalized_who)); | |
| 2292 | } else { | |
| 2293 | /* XXX deal with errors somehow */ | |
| 2294 | } | |
| 2295 | } else if (use_tzc(zephyr)) { | |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2296 | size_t len; |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2297 | size_t result; |
| 9896 | 2298 | char* zlocstr = g_strdup_printf("((tzcfodder . zlocate) \"%s\")\n",normalized_who); |
| 2299 | zephyr->pending_zloc_names = g_list_append(zephyr->pending_zloc_names, g_strdup(normalized_who)); | |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2300 | len = strlen(zlocstr); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2301 | result = write(zephyr->totzc[ZEPHYR_FD_WRITE],zlocstr,len); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2302 | if (result != len) { |
|
22257
dd49963fe3f6
Use g_strerror() instead of strerror() in a few places.
Richard Laager <rlaager@pidgin.im>
parents:
22197
diff
changeset
|
2303 | purple_debug_error("zephyr", "Unable to write a message: %s\n", g_strerror(errno)); |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2304 | } |
| 9896 | 2305 | g_free(zlocstr); |
| 2086 | 2306 | } |
| 2307 | } | |
| 2308 | ||
| 15884 | 2309 | static void zephyr_set_status(PurpleAccount *account, PurpleStatus *status) { |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2310 | size_t len; |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2311 | size_t result; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2312 | PurpleConnection *gc = purple_account_get_connection(account); |
|
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2313 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
|
34855
9c289149eed4
Global replaces according to GObject status API
Ankit Vani <a@nevitus.org>
parents:
34811
diff
changeset
|
2314 | PurpleStatusPrimitive primitive = purple_status_type_get_primitive(purple_status_get_status_type(status)); |
| 9986 | 2315 | |
|
37426
6fd4989b77e4
The last of the NULL-checks before free()
Michael McConville <mmcco@mykolab.com>
parents:
37163
diff
changeset
|
2316 | g_free(zephyr->away); |
|
6fd4989b77e4
The last of the NULL-checks before free()
Michael McConville <mmcco@mykolab.com>
parents:
37163
diff
changeset
|
2317 | zephyr->away = NULL; |
|
4111
93b27900416e
[gaim-migrate @ 4326]
Robert McQueen <robot101@debian.org>
parents:
3867
diff
changeset
|
2318 | |
| 15884 | 2319 | if (primitive == PURPLE_STATUS_AWAY) { |
| 2320 | zephyr->away = g_strdup(purple_status_get_attr_string(status,"message")); | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2321 | } |
| 15884 | 2322 | else if (primitive == PURPLE_STATUS_AVAILABLE) { |
| 9986 | 2323 | if (use_zeph02(zephyr)) { |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
2324 | ZSetLocation(zephyr->exposure); |
| 9986 | 2325 | } |
| 2326 | else { | |
| 2327 | char *zexpstr = g_strdup_printf("((tzcfodder . set-location) (hostname . \"%s\") (exposure . \"%s\"))\n",zephyr->ourhost,zephyr->exposure); | |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2328 | len = strlen(zexpstr); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2329 | result = write(zephyr->totzc[ZEPHYR_FD_WRITE],zexpstr,len); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2330 | if (result != len) { |
|
22257
dd49963fe3f6
Use g_strerror() instead of strerror() in a few places.
Richard Laager <rlaager@pidgin.im>
parents:
22197
diff
changeset
|
2331 | purple_debug_error("zephyr", "Unable to write message: %s\n", g_strerror(errno)); |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2332 | } |
| 9986 | 2333 | g_free(zexpstr); |
| 2334 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2335 | } |
| 15884 | 2336 | else if (primitive == PURPLE_STATUS_INVISIBLE) { |
| 9478 | 2337 | /* XXX handle errors */ |
| 9896 | 2338 | if (use_zeph02(zephyr)) { |
| 2339 | ZSetLocation(EXPOSE_OPSTAFF); | |
| 2340 | } else { | |
| 2341 | char *zexpstr = g_strdup_printf("((tzcfodder . set-location) (hostname . \"%s\") (exposure . \"%s\"))\n",zephyr->ourhost,EXPOSE_OPSTAFF); | |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2342 | len = strlen(zexpstr); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2343 | result = write(zephyr->totzc[ZEPHYR_FD_WRITE],zexpstr,len); |
|
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2344 | if (result != len) { |
|
22257
dd49963fe3f6
Use g_strerror() instead of strerror() in a few places.
Richard Laager <rlaager@pidgin.im>
parents:
22197
diff
changeset
|
2345 | purple_debug_error("zephyr", "Unable to write message: %s\n", g_strerror(errno)); |
|
22197
853f77cffbbd
Part of a large patch from o_sukhodolsky to fix some build warnings.
Richard Laager <rlaager@pidgin.im>
parents:
22104
diff
changeset
|
2346 | } |
| 9896 | 2347 | g_free(zexpstr); |
| 2348 | } | |
| 9478 | 2349 | } |
| 2086 | 2350 | } |
| 2351 | ||
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2352 | static GList *zephyr_status_types(PurpleAccount *account) |
| 2086 | 2353 | { |
| 15884 | 2354 | PurpleStatusType *type; |
| 9986 | 2355 | GList *types = NULL; |
| 2356 | ||
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2357 | /* zephyr has several exposures |
| 9986 | 2358 | NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong) |
| 2359 | OPSTAFF "hidden" | |
| 2360 | REALM-VISIBLE visible to people in local realm | |
| 2361 | REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*> | |
| 2362 | NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm | |
| 2363 | NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced to <login,username,*> | |
|
12658
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12645
diff
changeset
|
2364 | |
| 9986 | 2365 | Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE), |
| 2366 | Hidden, will set the user's exposure to OPSTAFF | |
| 2086 | 2367 | |
| 9986 | 2368 | Away won't change their exposure but will set an auto away message (for IMs only) |
| 2369 | */ | |
|
12658
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12645
diff
changeset
|
2370 | |
| 15884 | 2371 | type = purple_status_type_new(PURPLE_STATUS_AVAILABLE, NULL, NULL, TRUE); |
| 9986 | 2372 | types = g_list_append(types,type); |
| 2086 | 2373 | |
| 15884 | 2374 | type = purple_status_type_new(PURPLE_STATUS_INVISIBLE, NULL, NULL, TRUE); |
| 9986 | 2375 | types = g_list_append(types,type); |
| 2376 | ||
| 15884 | 2377 | type = purple_status_type_new_with_attrs( |
| 2378 | PURPLE_STATUS_AWAY, NULL, NULL, TRUE, TRUE, FALSE, | |
|
35005
bff56dfca65d
Renamed purple_g_value_* to purple_value_*
Ankit Vani <a@nevitus.org>
parents:
34955
diff
changeset
|
2379 | "message", _("Message"), purple_value_new(G_TYPE_STRING), |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12467
diff
changeset
|
2380 | NULL); |
| 9986 | 2381 | types = g_list_append(types, type); |
| 2382 | ||
| 15884 | 2383 | type = purple_status_type_new(PURPLE_STATUS_OFFLINE, NULL, NULL, TRUE); |
|
12658
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12645
diff
changeset
|
2384 | types = g_list_append(types,type); |
|
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12645
diff
changeset
|
2385 | |
| 9986 | 2386 | return types; |
| 2086 | 2387 | } |
| 2388 | ||
| 15884 | 2389 | static GList *zephyr_chat_info(PurpleConnection * gc) |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2390 | { |
|
2205
68c42ce8eba6
[gaim-migrate @ 2215]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
2391 | GList *m = NULL; |
|
36555
fc17a4351e63
Replaced struct proto_chat_entry with PurpleProtocolChatEntry
Ankit Vani <a@nevitus.org>
parents:
36545
diff
changeset
|
2392 | PurpleProtocolChatEntry *pce; |
|
fc17a4351e63
Replaced struct proto_chat_entry with PurpleProtocolChatEntry
Ankit Vani <a@nevitus.org>
parents:
36545
diff
changeset
|
2393 | |
|
fc17a4351e63
Replaced struct proto_chat_entry with PurpleProtocolChatEntry
Ankit Vani <a@nevitus.org>
parents:
36545
diff
changeset
|
2394 | pce = g_new0(PurpleProtocolChatEntry, 1); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2395 | |
|
7841
0000a4c68bf8
[gaim-migrate @ 8494]
Mark Doliner <markdoliner@pidgin.im>
parents:
7475
diff
changeset
|
2396 | pce->label = _("_Class:"); |
| 5234 | 2397 | pce->identifier = "class"; |
| 3158 | 2398 | m = g_list_append(m, pce); |
| 2086 | 2399 | |
|
36555
fc17a4351e63
Replaced struct proto_chat_entry with PurpleProtocolChatEntry
Ankit Vani <a@nevitus.org>
parents:
36545
diff
changeset
|
2400 | pce = g_new0(PurpleProtocolChatEntry, 1); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2401 | |
|
7841
0000a4c68bf8
[gaim-migrate @ 8494]
Mark Doliner <markdoliner@pidgin.im>
parents:
7475
diff
changeset
|
2402 | pce->label = _("_Instance:"); |
| 5234 | 2403 | pce->identifier = "instance"; |
| 3158 | 2404 | m = g_list_append(m, pce); |
| 2086 | 2405 | |
|
36555
fc17a4351e63
Replaced struct proto_chat_entry with PurpleProtocolChatEntry
Ankit Vani <a@nevitus.org>
parents:
36545
diff
changeset
|
2406 | pce = g_new0(PurpleProtocolChatEntry, 1); |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2407 | |
|
7841
0000a4c68bf8
[gaim-migrate @ 8494]
Mark Doliner <markdoliner@pidgin.im>
parents:
7475
diff
changeset
|
2408 | pce->label = _("_Recipient:"); |
| 5234 | 2409 | pce->identifier = "recipient"; |
| 3158 | 2410 | m = g_list_append(m, pce); |
| 2086 | 2411 | |
|
2205
68c42ce8eba6
[gaim-migrate @ 2215]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
2412 | return m; |
| 2086 | 2413 | } |
| 2414 | ||
| 9478 | 2415 | /* Called when the server notifies us a message couldn't get sent */ |
| 2416 | ||
| 15884 | 2417 | static void zephyr_subscribe_failed(PurpleConnection *gc,char * z_class, char *z_instance, char * z_recipient, char* z_galaxy) |
| 9478 | 2418 | { |
| 9896 | 2419 | gchar* subscribe_failed = g_strdup_printf(_("Attempt to subscribe to %s,%s,%s failed"), z_class, z_instance,z_recipient); |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34312
diff
changeset
|
2420 | purple_notify_error(gc,"", subscribe_failed, NULL, purple_request_cpar_from_connection(gc)); |
| 9478 | 2421 | g_free(subscribe_failed); |
| 2422 | } | |
| 2423 | ||
|
9921
f38d288f6617
[gaim-migrate @ 10813]
Daniel Atallah <datallah@pidgin.im>
parents:
9917
diff
changeset
|
2424 | static char *zephyr_get_chat_name(GHashTable *data) { |
| 9922 | 2425 | gchar* zclass = g_hash_table_lookup(data,"class"); |
| 2426 | gchar* inst = g_hash_table_lookup(data,"instance"); | |
| 2427 | gchar* recipient = g_hash_table_lookup(data, "recipient"); | |
| 2428 | if (!zclass) /* This should never happen */ | |
| 2429 | zclass = ""; | |
| 2430 | if (!inst) | |
| 2431 | inst = "*"; | |
| 2432 | if (!recipient) | |
| 2433 | recipient = ""; | |
| 2434 | return g_strdup_printf("%s,%s,%s",zclass,inst,recipient); | |
|
9917
2fbb3c9fab2b
[gaim-migrate @ 10809]
Daniel Atallah <datallah@pidgin.im>
parents:
9912
diff
changeset
|
2435 | } |
|
2fbb3c9fab2b
[gaim-migrate @ 10809]
Daniel Atallah <datallah@pidgin.im>
parents:
9912
diff
changeset
|
2436 | |
| 9922 | 2437 | |
| 15884 | 2438 | static void zephyr_join_chat(PurpleConnection * gc, GHashTable * data) |
| 2086 | 2439 | { |
| 9896 | 2440 | /* ZSubscription_t sub; */ |
| 2086 | 2441 | zephyr_triple *zt1, *zt2; |
| 2442 | const char *classname; | |
| 2443 | const char *instname; | |
| 2444 | const char *recip; | |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2445 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 5234 | 2446 | classname = g_hash_table_lookup(data, "class"); |
| 2447 | instname = g_hash_table_lookup(data, "instance"); | |
| 2448 | recip = g_hash_table_lookup(data, "recipient"); | |
| 2449 | ||
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2450 | |
| 9328 | 2451 | if (!classname) |
|
2205
68c42ce8eba6
[gaim-migrate @ 2215]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
2452 | return; |
| 9478 | 2453 | |
| 2454 | if (!g_ascii_strcasecmp(classname,"%host%")) | |
| 9896 | 2455 | classname = g_strdup(zephyr->ourhost); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2456 | if (!g_ascii_strcasecmp(classname,"%canon%")) |
| 9896 | 2457 | classname = g_strdup(zephyr->ourhostcanon); |
| 9478 | 2458 | |
|
37523
02346b6472b3
Simplify checks for empty strings
Michael McConville <mmcconville@mykolab.com>
parents:
37426
diff
changeset
|
2459 | if (!instname || *instname == '\0') |
| 9328 | 2460 | instname = "*"; |
| 9478 | 2461 | |
| 2462 | if (!g_ascii_strcasecmp(instname,"%host%")) | |
| 9896 | 2463 | instname = g_strdup(zephyr->ourhost); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2464 | if (!g_ascii_strcasecmp(instname,"%canon%")) |
| 9896 | 2465 | instname = g_strdup(zephyr->ourhostcanon); |
| 9478 | 2466 | |
| 9328 | 2467 | if (!recip || (*recip == '*')) |
| 2468 | recip = ""; | |
| 4793 | 2469 | if (!g_ascii_strcasecmp(recip, "%me%")) |
| 9896 | 2470 | recip = zephyr->username; |
| 2086 | 2471 | |
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
2472 | zt1 = new_triple(zephyr,classname, instname, recip); |
|
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
2473 | zt2 = find_sub_by_triple(zephyr,zt1); |
| 2086 | 2474 | if (zt2) { |
| 2475 | free_triple(zt1); | |
| 9328 | 2476 | if (!zt2->open) { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2477 | if (!g_ascii_strcasecmp(instname,"*")) |
| 9328 | 2478 | instname = "PERSONAL"; |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
35005
diff
changeset
|
2479 | purple_serv_got_joined_chat(gc, zt2->id, zt2->name); |
| 9896 | 2480 | zephyr_chat_set_topic(gc,zt2->id,instname); |
| 9328 | 2481 | zt2->open = TRUE; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2482 | } |
| 2086 | 2483 | return; |
| 2484 | } | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2485 | |
| 9896 | 2486 | /* sub.zsub_class = zt1->class; |
| 2487 | sub.zsub_classinst = zt1->instance; | |
| 2488 | sub.zsub_recipient = zt1->recipient; */ | |
| 2489 | ||
| 2490 | if (zephyr_subscribe_to(zephyr,zt1->class,zt1->instance,zt1->recipient,NULL) != ZERR_NONE) { | |
| 9478 | 2491 | /* XXX output better subscription information */ |
| 9896 | 2492 | zephyr_subscribe_failed(gc,zt1->class,zt1->instance,zt1->recipient,NULL); |
| 2086 | 2493 | free_triple(zt1); |
| 2494 | return; | |
| 2495 | } | |
| 2496 | ||
| 9610 | 2497 | zephyr->subscrips = g_slist_append(zephyr->subscrips, zt1); |
| 2086 | 2498 | zt1->open = TRUE; |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
35005
diff
changeset
|
2499 | purple_serv_got_joined_chat(gc, zt1->id, zt1->name); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2500 | if (!g_ascii_strcasecmp(instname,"*")) |
| 9328 | 2501 | instname = "PERSONAL"; |
| 9896 | 2502 | zephyr_chat_set_topic(gc,zt1->id,instname); |
| 2086 | 2503 | } |
| 2504 | ||
| 15884 | 2505 | static void zephyr_chat_leave(PurpleConnection * gc, int id) |
| 2086 | 2506 | { |
| 2507 | zephyr_triple *zt; | |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2508 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 9610 | 2509 | zt = find_sub_by_id(zephyr,id); |
| 9896 | 2510 | |
| 2086 | 2511 | if (zt) { |
| 2512 | zt->open = FALSE; | |
| 9610 | 2513 | zt->id = ++(zephyr->last_id); |
| 2086 | 2514 | } |
| 2515 | } | |
| 2516 | ||
| 15884 | 2517 | static PurpleChat *zephyr_find_blist_chat(PurpleAccount *account, const char *name) |
| 9478 | 2518 | { |
| 15884 | 2519 | PurpleBlistNode *gnode, *cnode; |
| 9478 | 2520 | |
| 2521 | /* XXX needs to be %host%,%canon%, and %me% clean */ | |
|
24945
6678a8c83797
Some more struct hiding.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
2522 | for(gnode = purple_blist_get_root(); gnode; |
|
6678a8c83797
Some more struct hiding.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
2523 | gnode = purple_blist_node_get_sibling_next(gnode)) { |
|
6678a8c83797
Some more struct hiding.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
2524 | for(cnode = purple_blist_node_get_first_child(gnode); |
|
6678a8c83797
Some more struct hiding.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
2525 | cnode; |
|
6678a8c83797
Some more struct hiding.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24398
diff
changeset
|
2526 | cnode = purple_blist_node_get_sibling_next(cnode)) { |
| 15884 | 2527 | PurpleChat *chat = (PurpleChat*)cnode; |
| 9478 | 2528 | char *zclass, *inst, *recip; |
| 2529 | char** triple; | |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
2530 | GHashTable *components; |
|
34696
6e0d13978666
Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents:
34670
diff
changeset
|
2531 | if(!PURPLE_IS_CHAT(cnode)) |
| 9478 | 2532 | continue; |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
2533 | if(purple_chat_get_account(chat) != account) |
| 9478 | 2534 | continue; |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
2535 | components = purple_chat_get_components(chat); |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
2536 | if(!(zclass = g_hash_table_lookup(components, "class"))) |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
2537 | continue; |
|
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
2538 | if(!(inst = g_hash_table_lookup(components, "instance"))) |
| 9478 | 2539 | inst = g_strdup(""); |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
2540 | if(!(recip = g_hash_table_lookup(components, "recipient"))) |
| 9478 | 2541 | recip = g_strdup(""); |
| 15884 | 2542 | /* purple_debug_info("zephyr","in zephyr_find_blist_chat name: %s\n",name?name:""); */ |
| 9478 | 2543 | triple = g_strsplit(name,",",3); |
| 2544 | if (!g_ascii_strcasecmp(triple[0],zclass) && !g_ascii_strcasecmp(triple[1],inst) && !g_ascii_strcasecmp(triple[2],recip)) | |
| 2545 | return chat; | |
|
24398
4865c2ee6ea8
Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23352
diff
changeset
|
2546 | |
| 9478 | 2547 | } |
| 2548 | } | |
| 2549 | return NULL; | |
| 2550 | } | |
| 15884 | 2551 | static const char *zephyr_list_icon(PurpleAccount * a, PurpleBuddy * b) |
|
5202
2c78987f497b
[gaim-migrate @ 5568]
Mark Doliner <markdoliner@pidgin.im>
parents:
5136
diff
changeset
|
2552 | { |
|
2c78987f497b
[gaim-migrate @ 5568]
Mark Doliner <markdoliner@pidgin.im>
parents:
5136
diff
changeset
|
2553 | return "zephyr"; |
|
2c78987f497b
[gaim-migrate @ 5568]
Mark Doliner <markdoliner@pidgin.im>
parents:
5136
diff
changeset
|
2554 | } |
|
2c78987f497b
[gaim-migrate @ 5568]
Mark Doliner <markdoliner@pidgin.im>
parents:
5136
diff
changeset
|
2555 | |
|
34670
9bd5bd903dc7
Renamed chat buddies to chat users, and IM conversation typing state to IM typing state.
Ankit Vani <a@nevitus.org>
parents:
34653
diff
changeset
|
2556 | static unsigned int zephyr_send_typing(PurpleConnection *gc, const char *who, PurpleIMTypingState state) { |
| 9478 | 2557 | gchar *recipient; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2558 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2559 | if (use_tzc(zephyr)) |
| 9896 | 2560 | return 0; |
| 2561 | ||
|
34670
9bd5bd903dc7
Renamed chat buddies to chat users, and IM conversation typing state to IM typing state.
Ankit Vani <a@nevitus.org>
parents:
34653
diff
changeset
|
2562 | if (state == PURPLE_IM_NOT_TYPING) |
| 9478 | 2563 | return 0; |
|
13844
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13548
diff
changeset
|
2564 | |
| 9478 | 2565 | /* XXX We probably should care if this fails. Or maybe we don't want to */ |
| 2566 | if (!who) { | |
| 15884 | 2567 | purple_debug_info("zephyr", "who is null\n"); |
| 9896 | 2568 | recipient = local_zephyr_normalize(zephyr,""); |
| 9478 | 2569 | } else { |
| 10111 | 2570 | char *comma = strrchr(who, ','); |
| 9896 | 2571 | /* Don't ping broadcast (chat) recipients */ |
| 2572 | /* The strrchr case finds a realm-stripped broadcast subscription | |
| 2573 | e.g. comma is the last character in the string */ | |
| 10111 | 2574 | if (comma && ( (*(comma+1) == '\0') || (*(comma+1) == '@'))) |
| 9896 | 2575 | return 0; |
| 10111 | 2576 | |
| 9896 | 2577 | recipient = local_zephyr_normalize(zephyr,who); |
| 9478 | 2578 | } |
| 2579 | ||
| 15884 | 2580 | purple_debug_info("zephyr","about to send typing notification to %s\n",recipient); |
| 9896 | 2581 | zephyr_send_message(zephyr,"MESSAGE","PERSONAL",recipient,"","","PING"); |
| 15884 | 2582 | purple_debug_info("zephyr","sent typing notification\n"); |
|
13844
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13548
diff
changeset
|
2583 | |
|
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13548
diff
changeset
|
2584 | /* |
|
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13548
diff
changeset
|
2585 | * TODO: Is this correct? It means we will call |
|
35499
c4c5e0a670b1
Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents:
35005
diff
changeset
|
2586 | * purple_serv_send_typing(gc, who, PURPLE_IM_TYPING) once every 15 seconds |
| 15884 | 2587 | * until the Purple user stops typing. |
|
13844
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13548
diff
changeset
|
2588 | */ |
| 9478 | 2589 | return ZEPHYR_TYPING_SEND_TIMEOUT; |
| 2590 | } | |
| 8212 | 2591 | |
| 9434 | 2592 | |
| 2593 | ||
| 15884 | 2594 | static void zephyr_chat_set_topic(PurpleConnection * gc, int id, const char *topic) |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2595 | { |
|
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2596 | zephyr_triple *zt; |
|
34622
753f46dd000f
Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents:
34578
diff
changeset
|
2597 | PurpleChatConversation *gcc; |
| 9896 | 2598 | gchar *topic_utf8; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2599 | zephyr_account* zephyr = purple_connection_get_protocol_data(gc); |
| 9896 | 2600 | char *sender = (char *)zephyr->username; |
| 8212 | 2601 | |
|
31352
7f6c8c77ead0
Use convenience variables.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31294
diff
changeset
|
2602 | zt = find_sub_by_id(zephyr,id); |
| 9986 | 2603 | /* find_sub_by_id can return NULL */ |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2604 | if (!zt) |
| 9986 | 2605 | return; |
|
34643
e261a066d78d
Refactored zephyr protocol to use GObject conversation API
Ankit Vani <a@nevitus.org>
parents:
34625
diff
changeset
|
2606 | gcc = purple_conversations_find_chat_with_account(zt->name, |
|
32678
01f6312a4a7b
On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents:
32624
diff
changeset
|
2607 | purple_connection_get_account(gc)); |
| 9434 | 2608 | |
|
24806
467284acbc0c
Remove the length parameter from zephyr_recv_convert(), because we were
Richard Laager <rlaager@pidgin.im>
parents:
24756
diff
changeset
|
2609 | topic_utf8 = zephyr_recv_convert(gc,(gchar *)topic); |
|
34622
753f46dd000f
Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents:
34578
diff
changeset
|
2610 | purple_chat_conversation_set_topic(gcc,sender,topic_utf8); |
| 9896 | 2611 | g_free(topic_utf8); |
| 2612 | return; | |
| 9434 | 2613 | } |
| 2614 | ||
| 2615 | /* commands */ | |
| 2616 | ||
| 15884 | 2617 | static PurpleCmdRet zephyr_purple_cmd_msg(PurpleConversation *conv, |
| 9896 | 2618 | const char *cmd, char **args, char **error, void *data) |
| 9434 | 2619 | { |
| 9896 | 2620 | char *recipient; |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2621 | PurpleCmdRet ret; |
|
32698
154e4a2a6287
Our API really shouldn't have a 'gc' in it anymore.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32678
diff
changeset
|
2622 | PurpleConnection *gc = purple_conversation_get_connection(conv); |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2623 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc);; |
| 9896 | 2624 | if (!g_ascii_strcasecmp(args[0],"*")) |
| 15884 | 2625 | return PURPLE_CMD_RET_FAILED; /* "*" is not a valid argument */ |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2626 | else |
| 9896 | 2627 | recipient = local_zephyr_normalize(zephyr,args[0]); |
| 9434 | 2628 | |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2629 | if (strlen(recipient) < 1) { |
|
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2630 | g_free(recipient); |
| 15884 | 2631 | return PURPLE_CMD_RET_FAILED; /* a null recipient is a chat message, not an IM */ |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2632 | } |
| 9478 | 2633 | |
| 9896 | 2634 | if (zephyr_send_message(zephyr,"MESSAGE","PERSONAL",recipient,args[1],zephyr_get_signature(),"")) |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2635 | ret = PURPLE_CMD_RET_OK; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2636 | else |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2637 | ret = PURPLE_CMD_RET_FAILED; |
|
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2638 | g_free(recipient); |
|
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2639 | return ret; |
| 9434 | 2640 | } |
| 2641 | ||
| 15884 | 2642 | static PurpleCmdRet zephyr_purple_cmd_zlocate(PurpleConversation *conv, |
| 9896 | 2643 | const char *cmd, char **args, char **error, void *data) |
| 9434 | 2644 | { |
|
32698
154e4a2a6287
Our API really shouldn't have a 'gc' in it anymore.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32678
diff
changeset
|
2645 | zephyr_zloc(purple_conversation_get_connection(conv),args[0]); |
| 15884 | 2646 | return PURPLE_CMD_RET_OK; |
| 9434 | 2647 | } |
| 2648 | ||
| 15884 | 2649 | static PurpleCmdRet zephyr_purple_cmd_instance(PurpleConversation *conv, |
| 9896 | 2650 | const char *cmd, char **args, char **error, void *data) |
| 9434 | 2651 | { |
| 9896 | 2652 | /* Currently it sets the instance with leading spaces and |
| 2653 | * all. This might not be the best thing to do, though having | |
| 2654 | * one word isn't ideal either. */ | |
| 9434 | 2655 | |
| 9896 | 2656 | const char* instance = args[0]; |
|
34643
e261a066d78d
Refactored zephyr protocol to use GObject conversation API
Ankit Vani <a@nevitus.org>
parents:
34625
diff
changeset
|
2657 | zephyr_chat_set_topic(purple_conversation_get_connection(conv), |
|
e261a066d78d
Refactored zephyr protocol to use GObject conversation API
Ankit Vani <a@nevitus.org>
parents:
34625
diff
changeset
|
2658 | purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(conv)),instance); |
| 15884 | 2659 | return PURPLE_CMD_RET_OK; |
| 9434 | 2660 | } |
| 2661 | ||
| 15884 | 2662 | static PurpleCmdRet zephyr_purple_cmd_joinchat_cir(PurpleConversation *conv, |
| 9896 | 2663 | const char *cmd, char **args, char **error, void *data) |
| 9434 | 2664 | { |
| 9896 | 2665 | /* Join a new zephyr chat */ |
| 2666 | GHashTable *triple = g_hash_table_new(NULL,NULL); | |
| 2667 | g_hash_table_insert(triple,"class",args[0]); | |
| 2668 | g_hash_table_insert(triple,"instance",args[1]); | |
| 2669 | g_hash_table_insert(triple,"recipient",args[2]); | |
|
32698
154e4a2a6287
Our API really shouldn't have a 'gc' in it anymore.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32678
diff
changeset
|
2670 | zephyr_join_chat(purple_conversation_get_connection(conv),triple); |
| 15884 | 2671 | return PURPLE_CMD_RET_OK; |
| 9434 | 2672 | } |
| 2673 | ||
| 15884 | 2674 | static PurpleCmdRet zephyr_purple_cmd_zi(PurpleConversation *conv, |
| 9896 | 2675 | const char *cmd, char **args, char **error, void *data) |
| 9434 | 2676 | { |
| 9896 | 2677 | /* args = instance, message */ |
|
32698
154e4a2a6287
Our API really shouldn't have a 'gc' in it anymore.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32678
diff
changeset
|
2678 | PurpleConnection *gc = purple_conversation_get_connection(conv); |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2679 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 9896 | 2680 | if ( zephyr_send_message(zephyr,"message",args[0],"",args[1],zephyr_get_signature(),"")) |
| 15884 | 2681 | return PURPLE_CMD_RET_OK; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2682 | else |
| 15884 | 2683 | return PURPLE_CMD_RET_FAILED; |
| 9434 | 2684 | } |
| 2685 | ||
| 15884 | 2686 | static PurpleCmdRet zephyr_purple_cmd_zci(PurpleConversation *conv, |
| 9896 | 2687 | const char *cmd, char **args, char **error, void *data) |
| 9434 | 2688 | { |
| 9896 | 2689 | /* args = class, instance, message */ |
|
32698
154e4a2a6287
Our API really shouldn't have a 'gc' in it anymore.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32678
diff
changeset
|
2690 | PurpleConnection *gc = purple_conversation_get_connection(conv); |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2691 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 9896 | 2692 | if ( zephyr_send_message(zephyr,args[0],args[1],"",args[2],zephyr_get_signature(),"")) |
| 15884 | 2693 | return PURPLE_CMD_RET_OK; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2694 | else |
| 15884 | 2695 | return PURPLE_CMD_RET_FAILED; |
| 9434 | 2696 | } |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2697 | |
| 15884 | 2698 | static PurpleCmdRet zephyr_purple_cmd_zcir(PurpleConversation *conv, |
| 9896 | 2699 | const char *cmd, char **args, char **error, void *data) |
| 9434 | 2700 | { |
| 9896 | 2701 | /* args = class, instance, recipient, message */ |
|
32698
154e4a2a6287
Our API really shouldn't have a 'gc' in it anymore.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32678
diff
changeset
|
2702 | PurpleConnection *gc = purple_conversation_get_connection(conv); |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2703 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2704 | if ( zephyr_send_message(zephyr,args[0],args[1],args[2],args[3],zephyr_get_signature(),"")) |
| 15884 | 2705 | return PURPLE_CMD_RET_OK; |
| 9896 | 2706 | else |
| 15884 | 2707 | return PURPLE_CMD_RET_FAILED; |
| 8212 | 2708 | } |
| 2709 | ||
| 15884 | 2710 | static PurpleCmdRet zephyr_purple_cmd_zir(PurpleConversation *conv, |
| 9896 | 2711 | const char *cmd, char **args, char **error, void *data) |
| 9434 | 2712 | { |
| 9896 | 2713 | /* args = instance, recipient, message */ |
|
32698
154e4a2a6287
Our API really shouldn't have a 'gc' in it anymore.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32678
diff
changeset
|
2714 | PurpleConnection *gc = purple_conversation_get_connection(conv); |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2715 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2716 | if ( zephyr_send_message(zephyr,"message",args[0],args[1],args[2],zephyr_get_signature(),"")) |
| 15884 | 2717 | return PURPLE_CMD_RET_OK; |
| 9896 | 2718 | else |
| 15884 | 2719 | return PURPLE_CMD_RET_FAILED; |
| 9434 | 2720 | } |
| 2721 | ||
| 15884 | 2722 | static PurpleCmdRet zephyr_purple_cmd_zc(PurpleConversation *conv, |
| 9896 | 2723 | const char *cmd, char **args, char **error, void *data) |
| 9434 | 2724 | { |
| 9896 | 2725 | /* args = class, message */ |
|
32698
154e4a2a6287
Our API really shouldn't have a 'gc' in it anymore.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32678
diff
changeset
|
2726 | PurpleConnection *gc = purple_conversation_get_connection(conv); |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2727 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2728 | if ( zephyr_send_message(zephyr,args[0],"PERSONAL","",args[1],zephyr_get_signature(),"")) |
| 15884 | 2729 | return PURPLE_CMD_RET_OK; |
| 9896 | 2730 | else |
| 15884 | 2731 | return PURPLE_CMD_RET_FAILED; |
| 9434 | 2732 | } |
| 2733 | ||
|
22104
56970903b8e9
Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents:
20288
diff
changeset
|
2734 | static void zephyr_register_slash_commands(void) |
| 9434 | 2735 | { |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2736 | PurpleCmdId id; |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2737 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2738 | id = purple_cmd_register("msg","ws", PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2739 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2740 | "prpl-zephyr", |
| 15884 | 2741 | zephyr_purple_cmd_msg, _("msg <nick> <message>: Send a private message to a user"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2742 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2743 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2744 | id = purple_cmd_register("zlocate","w", PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2745 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2746 | "prpl-zephyr", |
| 15884 | 2747 | zephyr_purple_cmd_zlocate, _("zlocate <nick>: Locate user"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2748 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2749 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2750 | id = purple_cmd_register("zl","w", PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2751 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2752 | "prpl-zephyr", |
| 15884 | 2753 | zephyr_purple_cmd_zlocate, _("zl <nick>: Locate user"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2754 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2755 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2756 | id = purple_cmd_register("instance","s", PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2757 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2758 | "prpl-zephyr", |
| 15884 | 2759 | zephyr_purple_cmd_instance, _("instance <instance>: Set the instance to be used on this class"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2760 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2761 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2762 | id = purple_cmd_register("inst","s", PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2763 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2764 | "prpl-zephyr", |
| 15884 | 2765 | zephyr_purple_cmd_instance, _("inst <instance>: Set the instance to be used on this class"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2766 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2767 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2768 | id = purple_cmd_register("topic","s", PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2769 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
|
10038
3589c2eed81c
[gaim-migrate @ 10997]
Luke Schierer <lschiere@pidgin.im>
parents:
10009
diff
changeset
|
2770 | "prpl-zephyr", |
| 15884 | 2771 | zephyr_purple_cmd_instance, _("topic <instance>: Set the instance to be used on this class"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2772 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2773 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2774 | id = purple_cmd_register("sub", "www", PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2775 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2776 | "prpl-zephyr", |
| 15884 | 2777 | zephyr_purple_cmd_joinchat_cir, |
| 9896 | 2778 | _("sub <class> <instance> <recipient>: Join a new chat"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2779 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2780 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2781 | id = purple_cmd_register("zi","ws", PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2782 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2783 | "prpl-zephyr", |
| 15884 | 2784 | zephyr_purple_cmd_zi, _("zi <instance>: Send a message to <message,<i>instance</i>,*>"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2785 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2786 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2787 | id = purple_cmd_register("zci","wws",PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2788 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2789 | "prpl-zephyr", |
| 15884 | 2790 | zephyr_purple_cmd_zci, |
| 9896 | 2791 | _("zci <class> <instance>: Send a message to <<i>class</i>,<i>instance</i>,*>"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2792 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2793 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2794 | id = purple_cmd_register("zcir","wwws",PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2795 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2796 | "prpl-zephyr", |
| 15884 | 2797 | zephyr_purple_cmd_zcir, |
| 9896 | 2798 | _("zcir <class> <instance> <recipient>: Send a message to <<i>class</i>,<i>instance</i>,<i>recipient</i>>"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2799 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2800 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2801 | id = purple_cmd_register("zir","wws",PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2802 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2803 | "prpl-zephyr", |
| 15884 | 2804 | zephyr_purple_cmd_zir, |
| 9896 | 2805 | _("zir <instance> <recipient>: Send a message to <MESSAGE,<i>instance</i>,<i>recipient</i>>"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2806 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2807 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2808 | id = purple_cmd_register("zc","ws", PURPLE_CMD_P_PROTOCOL, |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2809 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, |
| 9896 | 2810 | "prpl-zephyr", |
| 15884 | 2811 | zephyr_purple_cmd_zc, _("zc <class>: Send a message to <<i>class</i>,PERSONAL,*>"), NULL); |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2812 | cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2813 | } |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2814 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2815 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2816 | static void zephyr_unregister_slash_commands(void) |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2817 | { |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2818 | while (cmds) { |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2819 | PurpleCmdId id = GPOINTER_TO_UINT(cmds->data); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2820 | purple_cmd_unregister(id); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2821 | cmds = g_slist_delete_link(cmds, cmds); |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2822 | } |
| 9434 | 2823 | } |
| 2824 | ||
| 2825 | ||
| 15884 | 2826 | static int zephyr_resubscribe(PurpleConnection *gc) |
| 9427 | 2827 | { |
| 9896 | 2828 | /* Resubscribe to the in-memory list of subscriptions and also |
| 2829 | unsubscriptions*/ | |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2830 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 9896 | 2831 | GSList *s = zephyr->subscrips; |
| 2832 | zephyr_triple *zt; | |
| 2833 | while (s) { | |
| 2834 | zt = s->data; | |
| 2835 | /* XXX We really should care if this fails */ | |
| 2836 | zephyr_subscribe_to(zephyr,zt->class,zt->instance,zt->recipient,NULL); | |
| 2837 | s = s->next; | |
| 2838 | } | |
| 2839 | /* XXX handle unsubscriptions */ | |
| 2840 | return 1; | |
| 9427 | 2841 | } |
| 2842 | ||
| 9434 | 2843 | |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
2844 | static void zephyr_action_resubscribe(PurpleProtocolAction *action) |
| 9427 | 2845 | { |
| 2846 | ||
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
2847 | PurpleConnection *gc = action->connection; |
| 9896 | 2848 | zephyr_resubscribe(gc); |
| 9427 | 2849 | } |
| 2850 | ||
| 2851 | ||
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
2852 | static void zephyr_action_get_subs_from_server(PurpleProtocolAction *action) |
| 9478 | 2853 | { |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
2854 | PurpleConnection *gc = action->connection; |
|
32265
8007f413c665
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
32191
diff
changeset
|
2855 | zephyr_account *zephyr = purple_connection_get_protocol_data(gc); |
| 9478 | 2856 | gchar *title; |
| 2857 | int retval, nsubs, one,i; | |
| 2858 | ZSubscription_t subs; | |
| 9896 | 2859 | if (use_zeph02(zephyr)) { |
| 2860 | GString* subout = g_string_new("Subscription list<br>"); | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2861 | |
| 9896 | 2862 | title = g_strdup_printf("Server subscriptions for %s", zephyr->username); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2863 | |
| 9896 | 2864 | if (zephyr->port == 0) { |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2865 | g_free(title); |
|
19832
84b69b21672b
Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19387
diff
changeset
|
2866 | purple_debug_error("zephyr", "error while retrieving port\n"); |
| 9896 | 2867 | return; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2868 | } |
| 9896 | 2869 | if ((retval = ZRetrieveSubscriptions(zephyr->port,&nsubs)) != ZERR_NONE) { |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2870 | g_free(title); |
| 9478 | 2871 | /* XXX better error handling */ |
|
19832
84b69b21672b
Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19387
diff
changeset
|
2872 | purple_debug_error("zephyr", "error while retrieving subscriptions from server\n"); |
| 9478 | 2873 | return; |
| 2874 | } | |
| 9896 | 2875 | for(i=0;i<nsubs;i++) { |
| 2876 | one = 1; | |
| 2877 | if ((retval = ZGetSubscriptions(&subs,&one)) != ZERR_NONE) { | |
| 2878 | /* XXX better error handling */ | |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2879 | g_free(title); |
|
19832
84b69b21672b
Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19387
diff
changeset
|
2880 | purple_debug_error("zephyr", "error while retrieving individual subscription\n"); |
| 9896 | 2881 | return; |
| 2882 | } | |
| 2883 | g_string_append_printf(subout, "Class %s Instance %s Recipient %s<br>", | |
| 2884 | subs.zsub_class, subs.zsub_classinst, | |
| 2885 | subs.zsub_recipient); | |
| 2886 | } | |
| 15884 | 2887 | purple_notify_formatted(gc, title, title, NULL, subout->str, NULL, NULL); |
|
33694
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2888 | g_free(title); |
|
dabb189b6ac9
zephyr.c: Fix multiple leaks
Niels Thykier <niels@thykier.net>
parents:
32698
diff
changeset
|
2889 | g_string_free(subout, TRUE); |
| 9896 | 2890 | } else { |
| 2891 | /* XXX fix */ | |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34312
diff
changeset
|
2892 | purple_notify_error(gc, "", "tzc doesn't support this action", |
|
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34312
diff
changeset
|
2893 | NULL, purple_request_cpar_from_connection(gc)); |
| 9478 | 2894 | } |
| 2895 | } | |
| 2896 | ||
| 2897 | ||
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
2898 | static GList *zephyr_get_actions(PurpleConnection *gc) |
| 9427 | 2899 | { |
| 2900 | GList *list = NULL; | |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
2901 | PurpleProtocolAction *act = NULL; |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
2902 | |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
2903 | act = purple_protocol_action_new(_("Resubscribe"), zephyr_action_resubscribe); |
| 9427 | 2904 | list = g_list_append(list, act); |
| 2905 | ||
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
2906 | act = purple_protocol_action_new(_("Retrieve subscriptions from server"), zephyr_action_get_subs_from_server); |
| 9478 | 2907 | list = g_list_append(list,act); |
| 2908 | ||
| 9427 | 2909 | return list; |
| 2910 | } | |
| 2911 | ||
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
2912 | |
|
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
2913 | static void |
|
36684
ecc74498e088
Refactored other protocols to use instance init
Ankit Vani <a@nevitus.org>
parents:
36678
diff
changeset
|
2914 | zephyr_protocol_init(PurpleProtocol *protocol) |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5202
diff
changeset
|
2915 | { |
| 15884 | 2916 | PurpleAccountOption *option; |
|
8644
ba37f1cc0006
[gaim-migrate @ 9396]
Mark Doliner <markdoliner@pidgin.im>
parents:
8641
diff
changeset
|
2917 | char *tmp = get_exposure_level(); |
| 11033 | 2918 | |
| 37004 | 2919 | protocol->id = "prpl-zephyr"; |
|
36684
ecc74498e088
Refactored other protocols to use instance init
Ankit Vani <a@nevitus.org>
parents:
36678
diff
changeset
|
2920 | protocol->name = "Zephyr"; |
|
ecc74498e088
Refactored other protocols to use instance init
Ankit Vani <a@nevitus.org>
parents:
36678
diff
changeset
|
2921 | protocol->options = OPT_PROTO_CHAT_TOPIC | OPT_PROTO_NO_PASSWORD; |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
2922 | |
| 15884 | 2923 | option = purple_account_option_bool_new(_("Use tzc"), "use_tzc", FALSE); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
37005
diff
changeset
|
2924 | protocol->account_options = g_list_append(protocol->account_options, option); |
| 9896 | 2925 | |
| 15884 | 2926 | option = purple_account_option_string_new(_("tzc command"), "tzc_command", "/usr/bin/tzc -e %s"); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
37005
diff
changeset
|
2927 | protocol->account_options = g_list_append(protocol->account_options, option); |
| 9896 | 2928 | |
| 15884 | 2929 | option = purple_account_option_bool_new(_("Export to .anyone"), "write_anyone", FALSE); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
37005
diff
changeset
|
2930 | protocol->account_options = g_list_append(protocol->account_options, option); |
| 8212 | 2931 | |
| 15884 | 2932 | option = purple_account_option_bool_new(_("Export to .zephyr.subs"), "write_zsubs", FALSE); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
37005
diff
changeset
|
2933 | protocol->account_options = g_list_append(protocol->account_options, option); |
| 8212 | 2934 | |
| 15884 | 2935 | option = purple_account_option_bool_new(_("Import from .anyone"), "read_anyone", TRUE); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
37005
diff
changeset
|
2936 | protocol->account_options = g_list_append(protocol->account_options, option); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2937 | |
| 15884 | 2938 | option = purple_account_option_bool_new(_("Import from .zephyr.subs"), "read_zsubs", TRUE); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
37005
diff
changeset
|
2939 | protocol->account_options = g_list_append(protocol->account_options, option); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2940 | |
| 15884 | 2941 | option = purple_account_option_string_new(_("Realm"), "realm", ""); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
37005
diff
changeset
|
2942 | protocol->account_options = g_list_append(protocol->account_options, option); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30138
diff
changeset
|
2943 | |
| 15884 | 2944 | option = purple_account_option_string_new(_("Exposure"), "exposure_level", tmp?tmp: EXPOSE_REALMVIS); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
37005
diff
changeset
|
2945 | protocol->account_options = g_list_append(protocol->account_options, option); |
| 8212 | 2946 | |
| 15884 | 2947 | option = purple_account_option_string_new(_("Encoding"), "encoding", ZEPHYR_FALLBACK_CHARSET); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
37005
diff
changeset
|
2948 | protocol->account_options = g_list_append(protocol->account_options, option); |
|
36684
ecc74498e088
Refactored other protocols to use instance init
Ankit Vani <a@nevitus.org>
parents:
36678
diff
changeset
|
2949 | } |
|
ecc74498e088
Refactored other protocols to use instance init
Ankit Vani <a@nevitus.org>
parents:
36678
diff
changeset
|
2950 | |
|
ecc74498e088
Refactored other protocols to use instance init
Ankit Vani <a@nevitus.org>
parents:
36678
diff
changeset
|
2951 | |
|
ecc74498e088
Refactored other protocols to use instance init
Ankit Vani <a@nevitus.org>
parents:
36678
diff
changeset
|
2952 | static void |
|
ecc74498e088
Refactored other protocols to use instance init
Ankit Vani <a@nevitus.org>
parents:
36678
diff
changeset
|
2953 | zephyr_protocol_class_init(PurpleProtocolClass *klass) |
|
ecc74498e088
Refactored other protocols to use instance init
Ankit Vani <a@nevitus.org>
parents:
36678
diff
changeset
|
2954 | { |
|
36737
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2955 | klass->login = zephyr_login; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2956 | klass->close = zephyr_close; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2957 | klass->status_types = zephyr_status_types; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2958 | klass->list_icon = zephyr_list_icon; |
|
36663
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2959 | } |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2960 | |
|
c61b6dbc1f03
Make protocols unregister their commands when being removed
Ankit Vani <a@nevitus.org>
parents:
36653
diff
changeset
|
2961 | |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
2962 | static void |
|
36729
7f9fac14ed60
Temporarily replaced PurpleProtocolInterface with PurpleProtocolClientIface in protocols
Ankit Vani <a@nevitus.org>
parents:
36716
diff
changeset
|
2963 | zephyr_protocol_client_iface_init(PurpleProtocolClientIface *client_iface) |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
2964 | { |
|
36737
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2965 | client_iface->get_actions = zephyr_get_actions; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2966 | client_iface->normalize = zephyr_normalize; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2967 | client_iface->find_blist_chat = zephyr_find_blist_chat; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2968 | } |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2969 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2970 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2971 | static void |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2972 | zephyr_protocol_server_iface_init(PurpleProtocolServerIface *server_iface) |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2973 | { |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2974 | server_iface->get_info = zephyr_zloc; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2975 | server_iface->set_status = zephyr_set_status; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2976 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2977 | server_iface->set_info = NULL; /* XXX Location? */ |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2978 | server_iface->set_buddy_icon = NULL; /* XXX */ |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2979 | } |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2980 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2981 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2982 | static void |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2983 | zephyr_protocol_im_iface_init(PurpleProtocolIMIface *im_iface) |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2984 | { |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2985 | im_iface->send = zephyr_send_im; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2986 | im_iface->send_typing = zephyr_send_typing; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2987 | } |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2988 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2989 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2990 | static void |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2991 | zephyr_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface) |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2992 | { |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2993 | chat_iface->info = zephyr_chat_info; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2994 | chat_iface->join = zephyr_join_chat; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2995 | chat_iface->get_name = zephyr_get_chat_name; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2996 | chat_iface->leave = zephyr_chat_leave; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2997 | chat_iface->send = zephyr_chat_send; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2998 | chat_iface->set_topic = zephyr_chat_set_topic; |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
2999 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3000 | chat_iface->get_user_real_name = NULL; /* XXX */ |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3001 | } |
|
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3002 | |
|
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3003 | |
|
36714
ec178f7d66da
Refactored protocols to use the new type definition macros
Ankit Vani <a@nevitus.org>
parents:
36684
diff
changeset
|
3004 | PURPLE_DEFINE_TYPE_EXTENDED( |
|
ec178f7d66da
Refactored protocols to use the new type definition macros
Ankit Vani <a@nevitus.org>
parents:
36684
diff
changeset
|
3005 | ZephyrProtocol, zephyr_protocol, PURPLE_TYPE_PROTOCOL, 0, |
|
36737
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3006 | |
|
36729
7f9fac14ed60
Temporarily replaced PurpleProtocolInterface with PurpleProtocolClientIface in protocols
Ankit Vani <a@nevitus.org>
parents:
36716
diff
changeset
|
3007 | PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_CLIENT_IFACE, |
|
36737
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3008 | zephyr_protocol_client_iface_init) |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3009 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3010 | PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_SERVER_IFACE, |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3011 | zephyr_protocol_server_iface_init) |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3012 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3013 | PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_IM_IFACE, |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3014 | zephyr_protocol_im_iface_init) |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3015 | |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3016 | PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_CHAT_IFACE, |
|
1ce884985d2d
Refactored yahoo, zephyr to use the new protocol interfaces
Ankit Vani <a@nevitus.org>
parents:
36729
diff
changeset
|
3017 | zephyr_protocol_chat_iface_init) |
|
36714
ec178f7d66da
Refactored protocols to use the new type definition macros
Ankit Vani <a@nevitus.org>
parents:
36684
diff
changeset
|
3018 | ); |
|
ec178f7d66da
Refactored protocols to use the new type definition macros
Ankit Vani <a@nevitus.org>
parents:
36684
diff
changeset
|
3019 | |
|
ec178f7d66da
Refactored protocols to use the new type definition macros
Ankit Vani <a@nevitus.org>
parents:
36684
diff
changeset
|
3020 | |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3021 | static PurplePluginInfo *plugin_query(GError **error) |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3022 | { |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3023 | return purple_plugin_info_new( |
|
36985
9faafe43603e
Rename protocol plugin IDs to prpl-*
Ankit Vani <a@nevitus.org>
parents:
36862
diff
changeset
|
3024 | "id", "prpl-zephyr", |
|
36638
5f6dcd83e8c1
Seperate plugin and protocol IDs. Protocol ID example: "msn". Plugin ID example: "protocol-msn".
Ankit Vani <a@nevitus.org>
parents:
36637
diff
changeset
|
3025 | "name", "Zephyr Protocol", |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3026 | "version", DISPLAY_VERSION, |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3027 | "category", N_("Protocol"), |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3028 | "summary", N_("Zephyr Protocol Plugin"), |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3029 | "description", N_("Zephyr Protocol Plugin"), |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3030 | "website", PURPLE_WEBSITE, |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3031 | "abi-version", PURPLE_ABI_VERSION, |
|
36653
4084c34c051d
Override gplugin info's "flags" property. Added PURPLE_PLUGIN_INFO_FLAGS_INTERNAL and PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD.
Ankit Vani <a@nevitus.org>
parents:
36638
diff
changeset
|
3032 | "flags", PURPLE_PLUGIN_INFO_FLAGS_INTERNAL | |
|
4084c34c051d
Override gplugin info's "flags" property. Added PURPLE_PLUGIN_INFO_FLAGS_INTERNAL and PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD.
Ankit Vani <a@nevitus.org>
parents:
36638
diff
changeset
|
3033 | PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD, |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3034 | NULL |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3035 | ); |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3036 | } |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3037 | |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3038 | |
|
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3039 | static gboolean |
|
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3040 | plugin_load(PurplePlugin *plugin, GError **error) |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5202
diff
changeset
|
3041 | { |
|
36714
ec178f7d66da
Refactored protocols to use the new type definition macros
Ankit Vani <a@nevitus.org>
parents:
36684
diff
changeset
|
3042 | zephyr_protocol_register_type(plugin); |
|
ec178f7d66da
Refactored protocols to use the new type definition macros
Ankit Vani <a@nevitus.org>
parents:
36684
diff
changeset
|
3043 | |
|
36628
3d43ca8d69ee
Refactored the protocols to use the error argument of purple_protocols_{add/remove}
Ankit Vani <a@nevitus.org>
parents:
36616
diff
changeset
|
3044 | my_protocol = purple_protocols_add(ZEPHYR_TYPE_PROTOCOL, error); |
|
3d43ca8d69ee
Refactored the protocols to use the error argument of purple_protocols_{add/remove}
Ankit Vani <a@nevitus.org>
parents:
36616
diff
changeset
|
3045 | if (!my_protocol) |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3046 | return FALSE; |
|
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3047 | |
| 9896 | 3048 | zephyr_register_slash_commands(); |
|
36677
081733748bbc
Only initialize/finalize protocol class data in *_base_init/finalize for protocols.
Ankit Vani <a@nevitus.org>
parents:
36663
diff
changeset
|
3049 | |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3050 | return TRUE; |
| 2086 | 3051 | } |
| 3052 | ||
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3053 | |
|
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3054 | static gboolean |
|
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3055 | plugin_unload(PurplePlugin *plugin, GError **error) |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3056 | { |
|
36677
081733748bbc
Only initialize/finalize protocol class data in *_base_init/finalize for protocols.
Ankit Vani <a@nevitus.org>
parents:
36663
diff
changeset
|
3057 | zephyr_unregister_slash_commands(); |
|
081733748bbc
Only initialize/finalize protocol class data in *_base_init/finalize for protocols.
Ankit Vani <a@nevitus.org>
parents:
36663
diff
changeset
|
3058 | |
|
36628
3d43ca8d69ee
Refactored the protocols to use the error argument of purple_protocols_{add/remove}
Ankit Vani <a@nevitus.org>
parents:
36616
diff
changeset
|
3059 | if (!purple_protocols_remove(my_protocol, error)) |
|
36600
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3060 | return FALSE; |
|
c7d2eee19333
Refactored zephyr to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36583
diff
changeset
|
3061 | |
|
36535
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3062 | return TRUE; |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3063 | } |
|
66c2fb23888f
Refactored zephye to use the new plugin API
Ankit Vani <a@nevitus.org>
parents:
34864
diff
changeset
|
3064 | |
|
36714
ec178f7d66da
Refactored protocols to use the new type definition macros
Ankit Vani <a@nevitus.org>
parents:
36684
diff
changeset
|
3065 | |
|
ec178f7d66da
Refactored protocols to use the new type definition macros
Ankit Vani <a@nevitus.org>
parents:
36684
diff
changeset
|
3066 | PURPLE_PLUGIN_INIT(zephyr, plugin_query, plugin_load, plugin_unload); |