Menu
▾
▴
[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.45,1.46 oscar.c,1.146,1.147 ssi.c,1.12,1.13
|
From: Sean E. <sea...@us...> - 2002-08-29 01:47:18
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv15635/src/protocols/oscar
Modified Files:
aim.h oscar.c ssi.c
Log Message:
some patches from some people.
Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- aim.h 28 Aug 2002 07:24:12 -0000 1.45
+++ aim.h 29 Aug 2002 01:47:15 -0000 1.46
@@ -1065,22 +1065,22 @@
/* These handle the local variables */
faim_export struct aim_ssi_item *aim_ssi_itemlist_find(struct aim_ssi_item *list, fu16_t gid, fu16_t bid);
-faim_export struct aim_ssi_item *aim_ssi_itemlist_finditem(struct aim_ssi_item *list, char *gn, char *sn, fu16_t type);
+faim_export struct aim_ssi_item *aim_ssi_itemlist_finditem(struct aim_ssi_item *list, const char *gn, const char *sn, fu16_t type);
faim_export struct aim_ssi_item *aim_ssi_itemlist_findparent(struct aim_ssi_item *list, char *sn);
faim_export int aim_ssi_getpermdeny(struct aim_ssi_item *list);
faim_export fu32_t aim_ssi_getpresence(struct aim_ssi_item *list);
faim_export int aim_ssi_cleanlist(aim_session_t *sess, aim_conn_t *conn);
-faim_export int aim_ssi_addbuddies(aim_session_t *sess, aim_conn_t *conn, char *gn, char **sn, unsigned int num);
+faim_export int aim_ssi_addbuddies(aim_session_t *sess, aim_conn_t *conn, const char *gn, const char **sn, unsigned int num);
faim_export int aim_ssi_addmastergroup(aim_session_t *sess, aim_conn_t *conn);
faim_export int aim_ssi_addgroups(aim_session_t *sess, aim_conn_t *conn, char **gn, unsigned int num);
-faim_export int aim_ssi_addpord(aim_session_t *sess, aim_conn_t *conn, char **sn, unsigned int num, fu16_t type);
+faim_export int aim_ssi_addpord(aim_session_t *sess, aim_conn_t *conn, const char **sn, unsigned int num, fu16_t type);
faim_export int aim_ssi_movebuddy(aim_session_t *sess, aim_conn_t *conn, char *oldgn, char *newgn, char *sn);
faim_export int aim_ssi_rename_group(aim_session_t *sess, aim_conn_t *conn, char *oldgn, char *newgn);
faim_export int aim_ssi_delbuddies(aim_session_t *sess, aim_conn_t *conn, char *gn, char **sn, unsigned int num);
faim_export int aim_ssi_delmastergroup(aim_session_t *sess, aim_conn_t *conn);
faim_export int aim_ssi_delgroups(aim_session_t *sess, aim_conn_t *conn, char **gn, unsigned int num);
faim_export int aim_ssi_deletelist(aim_session_t *sess, aim_conn_t *conn);
-faim_export int aim_ssi_delpord(aim_session_t *sess, aim_conn_t *conn, char **sn, unsigned int num, fu16_t type);
+faim_export int aim_ssi_delpord(aim_session_t *sess, aim_conn_t *conn, const char **sn, unsigned int num, fu16_t type);
faim_export int aim_ssi_setpermdeny(aim_session_t *sess, aim_conn_t *conn, fu8_t permdeny, fu32_t vismask);
faim_export int aim_ssi_setpresence(aim_session_t *sess, aim_conn_t *conn, fu32_t presence);
Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- oscar.c 28 Aug 2002 06:48:14 -0000 1.146
+++ oscar.c 29 Aug 2002 01:47:15 -0000 1.147
@@ -1818,7 +1818,7 @@
destn = va_arg(ap, char *);
va_end(ap);
- sprintf(buf, _("Your message to %s did not get sent: %s"), destn);
+ sprintf(buf, _("Your message to %s did not get sent:"), destn);
do_error_dialog(buf, (reason < msgerrreasonlen) ? msgerrreason[reason] : _("No reason was given."), GAIM_ERROR);
return 1;
@@ -1835,7 +1835,7 @@
destn = va_arg(ap, char *);
va_end(ap);
- sprintf(buf, _("User information for %s unavailable: %s"), destn);
+ sprintf(buf, _("User information for %s unavailable:"), destn);
do_error_dialog(buf, (reason < msgerrreasonlen) ? msgerrreason[reason] : _("No reason was given."), GAIM_ERROR);
return 1;
@@ -2843,8 +2843,8 @@
aim_getinfo(odata->sess, odata->conn, name, AIM_GETINFO_CAPABILITIES);
}
-static void oscar_set_dir(struct gaim_connection *g, char *first, char *middle, char *last,
- char *maiden, char *city, char *state, char *country, int web) {
+static void oscar_set_dir(struct gaim_connection *g, const char *first, const char *middle, const char *last,
+ const char *maiden, const char *city, const char *state, const char *country, int web) {
/* FIXME : some of these things are wrong, but i'm lazy */
struct oscar_data *odata = (struct oscar_data *)g->proto_data;
aim_setdirectoryinfo(odata->sess, odata->conn, first, middle, last,
@@ -2975,14 +2975,14 @@
aim_send_warning(odata->sess, odata->conn, name, anon ? AIM_WARN_ANON : 0);
}
-static void oscar_dir_search(struct gaim_connection *g, char *first, char *middle, char *last,
- char *maiden, char *city, char *state, char *country, char *email) {
+static void oscar_dir_search(struct gaim_connection *g, const char *first, const char *middle, const char *last,
+ const char *maiden, const char *city, const char *state, const char *country, const char *email) {
struct oscar_data *odata = (struct oscar_data *)g->proto_data;
if (strlen(email))
aim_usersearch_address(odata->sess, odata->conn, email);
}
-static void oscar_add_buddy(struct gaim_connection *g, char *name) {
+static void oscar_add_buddy(struct gaim_connection *g, const char *name) {
struct oscar_data *odata = (struct oscar_data *)g->proto_data;
if (odata->icq) {
aim_add_buddy(odata->sess, odata->conn, name);
@@ -3124,7 +3124,7 @@
struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
struct aim_ssi_item *curitem;
int tmp;
- char **sns;
+ const char **sns;
debug_printf("ssi: syncing local list and server list\n");
@@ -3218,7 +3218,7 @@
if (!aim_ssi_itemlist_finditem(sess->ssi.items, NULL, ((struct buddy*)curbud->data)->name, 0x0000))
tmp++;
if (tmp) {
- sns = (char **)malloc(tmp*sizeof(char*));
+ sns = malloc(tmp*sizeof(char*));
tmp = 0;
for (curbud=((struct group*)cur->data)->members; curbud; curbud=curbud->next)
if (!aim_ssi_itemlist_finditem(sess->ssi.items, NULL, ((struct buddy*)curbud->data)->name, 0x0000)) {
@@ -3239,7 +3239,7 @@
if (!aim_ssi_itemlist_finditem(sess->ssi.items, NULL, cur->data, 0x0002))
tmp++;
if (tmp) {
- sns = (char **)malloc(tmp*sizeof(char*));
+ sns = malloc(tmp*sizeof(char*));
tmp = 0;
for (cur=gc->permit; cur; cur=cur->next)
if (!aim_ssi_itemlist_finditem(sess->ssi.items, NULL, cur->data, 0x0002)) {
@@ -3259,7 +3259,7 @@
if (!aim_ssi_itemlist_finditem(sess->ssi.items, NULL, cur->data, 0x0003))
tmp++;
if (tmp) {
- sns = (char **)malloc(tmp*sizeof(char*));
+ sns = malloc(tmp*sizeof(char*));
tmp = 0;
for (cur=gc->deny; cur; cur=cur->next)
if (!aim_ssi_itemlist_finditem(sess->ssi.items, NULL, cur->data, 0x0003)) {
@@ -3340,7 +3340,7 @@
}
}
-static void oscar_chat_invite(struct gaim_connection *g, int id, char *message, char *name) {
+static void oscar_chat_invite(struct gaim_connection *g, int id, const char *message, const char *name) {
struct oscar_data *odata = (struct oscar_data *)g->proto_data;
struct chat_connection *ccon = find_oscar_chat(g, id);
@@ -3809,7 +3809,7 @@
} else {
debug_printf("ssi: About to add a permit\n");
if (od->sess->ssi.received_data)
- aim_ssi_addpord(od->sess, od->conn, &who, 1, AIM_SSI_TYPE_PERMIT);
+ aim_ssi_addpord(od->sess, od->conn, (const char **) &who, 1, AIM_SSI_TYPE_PERMIT);
}
}
@@ -3821,7 +3821,7 @@
} else {
debug_printf("ssi: About to add a deny\n");
if (od->sess->ssi.received_data)
- aim_ssi_addpord(od->sess, od->conn, &who, 1, AIM_SSI_TYPE_DENY);
+ aim_ssi_addpord(od->sess, od->conn, (const char **) &who, 1, AIM_SSI_TYPE_DENY);
}
}
@@ -3946,7 +3946,7 @@
return m;
}
-static void oscar_change_passwd(struct gaim_connection *gc, char *old, char *new)
+static void oscar_change_passwd(struct gaim_connection *gc, const char *old, const char *new)
{
struct oscar_data *od = gc->proto_data;
if (!aim_getconn_type(od->sess, AIM_CONN_TYPE_AUTH)) {
Index: ssi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ssi.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ssi.c 7 Jul 2002 14:31:57 -0000 1.12
+++ ssi.c 29 Aug 2002 01:47:15 -0000 1.13
@@ -36,7 +36,7 @@
* @param type The type of the item, 0x0001 for a contact, 0x0002 for a group, etc.
* @return The newly created item.
*/
-static struct aim_ssi_item *aim_ssi_itemlist_add(struct aim_ssi_item **list, struct aim_ssi_item *parent, char *name, fu16_t type)
+static struct aim_ssi_item *aim_ssi_itemlist_add(struct aim_ssi_item **list, struct aim_ssi_item *parent, const char *name, fu16_t type)
{
int i;
struct aim_ssi_item *cur, *newitem;
@@ -192,7 +192,7 @@
* @param type The type of the desired item.
* @return Return a pointer to the item if found, else return NULL;
*/
-faim_export struct aim_ssi_item *aim_ssi_itemlist_finditem(struct aim_ssi_item *list, char *gn, char *sn, fu16_t type)
+faim_export struct aim_ssi_item *aim_ssi_itemlist_finditem(struct aim_ssi_item *list, const char *gn, const char *sn, fu16_t type)
{
struct aim_ssi_item *cur;
if (!list)
@@ -490,7 +490,7 @@
* @param num The number of screen names you are adding (size of the sn array).
* @return Return 0 if no errors, otherwise return the error number.
*/
-faim_export int aim_ssi_addbuddies(aim_session_t *sess, aim_conn_t *conn, char *gn, char **sn, unsigned int num)
+faim_export int aim_ssi_addbuddies(aim_session_t *sess, aim_conn_t *conn, const char *gn, const char **sn, unsigned int num)
{
struct aim_ssi_item *parentgroup, **newitems;
fu16_t i;
@@ -644,7 +644,7 @@
* #defines in aim.h.
* @return Return 0 if no errors, otherwise return the error number.
*/
-faim_export int aim_ssi_addpord(aim_session_t *sess, aim_conn_t *conn, char **sn, unsigned int num, fu16_t type)
+faim_export int aim_ssi_addpord(aim_session_t *sess, aim_conn_t *conn, const char **sn, unsigned int num, fu16_t type)
{
struct aim_ssi_item **newitems;
fu16_t i;
@@ -992,7 +992,7 @@
* @param num The number of items you are deleting (size of the sn array).
* @return Return 0 if no errors, otherwise return the error number.
*/
-faim_export int aim_ssi_delpord(aim_session_t *sess, aim_conn_t *conn, char **sn, unsigned int num, fu16_t type) {
+faim_export int aim_ssi_delpord(aim_session_t *sess, aim_conn_t *conn, const char **sn, unsigned int num, fu16_t type) {
struct aim_ssi_item *cur, **delitems;
int i;
|
