Menu
▾
▴
[Gaim-commits] CVS: gaim/src away.c,1.65,1.66 buddy.c,1.267,1.268 buddy_chat.c,1.128,1.129 conversation.c,1.288,1.289 dialogs.c,1.278,1.279 html.c,1.23,1.24 list.c,1.7,1.8 module.c,1.12,1.13 multi.c,1.102,1.103 perl.c,1.63,1.64 prefs.c,1.194,1.195 prpl.c,1.45,1.46 server.c,1.205,1.206 ticker.c,1.17,1.18 util.c,1.110,1.111
|
From: Eric W. <war...@us...> - 2001-11-02 01:41:40
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv15499/src
Modified Files:
away.c buddy.c buddy_chat.c conversation.c dialogs.c html.c
list.c module.c multi.c perl.c prefs.c prpl.c server.c
ticker.c util.c
Log Message:
everything changed!
not really. actually to be quite honest nothing changed.
it's really bad that all of these files use prpl references. most of them shouldn't.
Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- away.c 2001/10/31 10:27:07 1.65
+++ away.c 2001/11/02 01:41:36 1.66
@@ -436,7 +436,7 @@
con = g_slist_next(con);
}
- tmp = msgs = (*gc->prpl->away_states)(gc);
+ tmp = msgs = gc->prpl->away_states(gc);
if ((g_list_length(msgs) == 1) && !strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
awy = away_messages;
@@ -503,7 +503,7 @@
}
g_snprintf(buf, sizeof(buf), "%s (%s)",
- gc->username, (*gc->prpl->name)());
+ gc->username, gc->prpl->name());
menuitem = gtk_menu_item_new_with_label(buf);
gtk_menu_append(GTK_MENU(awaymenu), menuitem);
gtk_widget_show(menuitem);
@@ -512,7 +512,7 @@
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
gtk_widget_show(submenu);
- tmp = msgs = (*gc->prpl->away_states)(gc);
+ tmp = msgs = gc->prpl->away_states(gc);
if ((g_list_length(msgs) == 1) &&
(!strcmp(msgs->data, GAIM_AWAY_CUSTOM))) {
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- buddy.c 2001/10/31 10:35:16 1.267
+++ buddy.c 2001/11/02 01:41:36 1.268
@@ -164,7 +164,7 @@
if ((bs = find_buddy_show(new_gs, b->name)) == NULL) {
if (g->gc->prpl->list_icon) {
bs = new_buddy_show(new_gs, b,
- (*g->gc->prpl->list_icon)(b->uc));
+ g->gc->prpl->list_icon(b->uc));
} else {
bs = new_buddy_show(new_gs, b, (char **)no_icon_xpm);
}
@@ -217,7 +217,7 @@
}
if (g->gc->prpl->list_icon) {
bs = new_buddy_show(new_gs, b,
- (*g->gc->prpl->list_icon)(b->uc));
+ g->gc->prpl->list_icon(b->uc));
} else {
bs = new_buddy_show(new_gs, b, (char **)no_icon_xpm);
}
@@ -640,7 +640,7 @@
while (cn) {
g = (struct gaim_connection *)cn->data;
if (g->prpl->buddy_menu) {
- GList *mo = (*g->prpl->buddy_menu)(g, b->name);
+ GList *mo = g->prpl->buddy_menu(g, b->name);
menuitem = gtk_menu_item_new_with_label(g->username);
gtk_menu_append(GTK_MENU(menu), menuitem);
@@ -669,7 +669,7 @@
} else {
g = (struct gaim_connection *)cn->data;
if (g->prpl->buddy_menu) {
- GList *mo = (*g->prpl->buddy_menu)(g, b->name);
+ GList *mo = g->prpl->buddy_menu(g, b->name);
while (mo) {
struct proto_buddy_menu *pbm = mo->data;
@@ -949,7 +949,7 @@
if (!bs) {
if (gc->prpl->list_icon)
bs = new_buddy_show(gs, b,
- (*gc->prpl->list_icon)(b->
+ gc->prpl->list_icon(b->
uc));
else
bs = new_buddy_show(gs, b, (char **)no_icon_xpm);
@@ -2082,7 +2082,7 @@
bs->sound = 2;
} else if (bs->log_timer == 0) {
if (gc->prpl->list_icon)
- xpm = (*gc->prpl->list_icon)(b->uc);
+ xpm = gc->prpl->list_icon(b->uc);
if (xpm == NULL)
xpm = (char **)no_icon_xpm;
pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm);
Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- buddy_chat.c 2001/10/29 06:47:49 1.128
+++ buddy_chat.c 2001/11/02 01:41:36 1.129
@@ -141,7 +141,7 @@
g_list_free(chatentries);
chatentries = NULL;
- tmp = list = (*joinchatgc->prpl->chat_info)(joinchatgc);
+ tmp = list = joinchatgc->prpl->chat_info(joinchatgc);
while (list) {
GtkWidget *label;
GtkWidget *rowbox;
@@ -217,7 +217,7 @@
continue;
if (!joinchatgc)
joinchatgc = g;
- g_snprintf(buf, sizeof buf, "%s (%s)", g->username, (*g->prpl->name)());
+ g_snprintf(buf, sizeof buf, "%s (%s)", g->username, g->prpl->name());
opt = gtk_menu_item_new_with_label(buf);
gtk_object_set_user_data(GTK_OBJECT(opt), g);
gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(joinchat_choose), g);
@@ -806,7 +806,7 @@
static void chat_press_info(GtkObject *obj, struct conversation *b)
{
if (b->gc)
- (*b->gc->prpl->get_info)(b->gc, gtk_object_get_user_data(obj));
+ b->gc->prpl->get_info(b->gc, gtk_object_get_user_data(obj));
}
static gint right_click_chat(GtkObject *obj, GdkEventButton *event, struct conversation *b)
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- conversation.c 2001/10/27 23:46:12 1.288
+++ conversation.c 2001/11/02 01:41:37 1.289
@@ -428,7 +428,7 @@
struct gaim_connection *gc = cn->data;
cn = cn->next;
if (gc->prpl->convo_closed)
- (*gc->prpl->convo_closed)(gc, c->name);
+ gc->prpl->convo_closed(gc, c->name);
}
remove_icon(c);
remove_checkbox(c);
@@ -1965,7 +1965,7 @@
while (g) {
c = (struct gaim_connection *)g->data;
- g_snprintf(buf, sizeof buf, "%s (%s)", c->username, (*c->prpl->name)());
+ g_snprintf(buf, sizeof buf, "%s (%s)", c->username, c->prpl->name());
opt = gtk_menu_item_new_with_label(buf);
gtk_object_set_user_data(GTK_OBJECT(opt), cnv);
gtk_signal_connect(GTK_OBJECT(opt), "activate",
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -d -r1.278 -r1.279
--- dialogs.c 2001/10/31 18:52:40 1.278
+++ dialogs.c 2001/11/02 01:41:37 1.279
@@ -830,7 +830,7 @@
while (g) {
c = (struct gaim_connection *)g->data;
g_snprintf(buf, sizeof(buf), "%s (%s)",
- c->username, (*c->prpl->name)());
+ c->username, c->prpl->name());
opt = gtk_menu_item_new_with_label(buf);
gtk_object_set_user_data(GTK_OBJECT(opt), b);
gtk_signal_connect(GTK_OBJECT(opt), "activate",
@@ -2724,7 +2724,7 @@
while (g) {
c = (struct gaim_connection *)g->data;
- g_snprintf(buf, sizeof buf, "%s (%s)", c->username, (*c->prpl->name)());
+ g_snprintf(buf, sizeof buf, "%s (%s)", c->username, c->prpl->name());
opt = gtk_menu_item_new_with_label(buf);
gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_import_gc), c);
gtk_widget_show(opt);
Index: html.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/html.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- html.c 2001/10/23 08:06:09 1.23
+++ html.c 2001/11/02 01:41:37 1.24
@@ -113,7 +113,7 @@
}
struct grab_url_data {
- void (*callback)(gpointer, char *);
+ void (* callback)(gpointer, char *);
gpointer data;
struct g_url *website;
char *url;
@@ -202,7 +202,7 @@
}
}
-void grab_url(char *url, gboolean full, void (*callback)(gpointer, char *), gpointer data)
+void grab_url(char *url, gboolean full, void callback(gpointer, char *), gpointer data)
{
int sock;
struct grab_url_data *gunk = g_new0(struct grab_url_data, 1);
Index: list.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/list.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- list.c 2001/10/24 10:23:48 1.7
+++ list.c 2001/11/02 01:41:37 1.8
@@ -126,7 +126,7 @@
b->present = 0;
if (gc->prpl->normalize)
- good = (*gc->prpl->normalize)(buddy);
+ good = gc->prpl->normalize(buddy);
else
good = buddy;
@@ -223,7 +223,7 @@
norm = gc->prpl->normalize;
else
norm = normalize;
- whoname = g_strdup((*norm)(who));
+ whoname = g_strdup(norm(who));
grp = gc->groups;
while (grp) {
g = (struct group *)grp->data;
@@ -231,7 +231,7 @@
mem = g->members;
while (mem) {
b = (struct buddy *)mem->data;
- if (!strcmp((*norm)(b->name), whoname)) {
+ if (!strcmp(norm(b->name), whoname)) {
g_free(whoname);
return g;
}
@@ -250,7 +250,7 @@
norm = z->prpl->normalize;
else
norm = normalize;
- whoname = g_strdup((*norm)(who));
+ whoname = g_strdup(norm(who));
grp = z->groups;
while (grp) {
g = (struct group *)grp->data;
@@ -258,7 +258,7 @@
mem = g->members;
while (mem) {
b = (struct buddy *)mem->data;
- if (!strcmp((*norm)(b->name), whoname)) {
+ if (!strcmp(norm(b->name), whoname)) {
g_free(whoname);
return g;
}
@@ -291,7 +291,7 @@
norm = gc->prpl->normalize;
else
norm = normalize;
- whoname = g_strdup((*norm)(who));
+ whoname = g_strdup(norm(who));
grp = gc->groups;
while (grp) {
g = (struct group *)grp->data;
@@ -299,7 +299,7 @@
mem = g->members;
while (mem) {
b = (struct buddy *)mem->data;
- if (!strcmp((*norm)(b->name), whoname)) {
+ if (!strcmp(norm(b->name), whoname)) {
g_free(whoname);
return b;
}
@@ -317,7 +317,7 @@
norm = z->prpl->normalize;
else
norm = normalize;
- whoname = g_strdup((*norm)(who));
+ whoname = g_strdup(norm(who));
grp = z->groups;
while (grp) {
g = (struct group *)grp->data;
@@ -325,7 +325,7 @@
mem = g->members;
while (mem) {
b = (struct buddy *)mem->data;
- if (!strcmp((*norm)(b->name), whoname)) {
+ if (!strcmp(norm(b->name), whoname)) {
g_free(whoname);
return b;
}
Index: module.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/module.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- module.c 2001/10/15 19:52:44 1.12
+++ module.c 2001/11/02 01:41:37 1.13
@@ -115,7 +115,7 @@
return NULL;
}
- retval = (*gaim_plugin_init)(plug->handle);
+ retval = gaim_plugin_init(plug->handle);
debug_printf("loaded plugin returned %s\n", retval ? retval : "NULL");
if (retval) {
plugin_remove_callbacks(plug->handle);
@@ -128,13 +128,13 @@
plugins = g_list_append(plugins, plug);
if (g_module_symbol(plug->handle, "name", (gpointer *)&cfunc)) {
- plug->name = (*cfunc)();
+ plug->name = cfunc();
} else {
plug->name = NULL;
}
if (g_module_symbol(plug->handle, "description", (gpointer *)&cfunc))
- plug->description = (*cfunc)();
+ plug->description = cfunc();
else
plug->description = NULL;
@@ -150,7 +150,7 @@
/* Attempt to call the plugin's remove function (if there) */
if (g_module_symbol(p->handle, "gaim_plugin_remove", (gpointer *)&gaim_plugin_remove))
- (*gaim_plugin_remove)();
+ gaim_plugin_remove();
plugin_remove_callbacks(p->handle);
@@ -190,7 +190,7 @@
debug_printf("Unloading %s\n", g_module_name(p->handle));
if (g_module_symbol(p->handle, "gaim_plugin_remove", (gpointer *)&gaim_plugin_remove))
- (*gaim_plugin_remove)();
+ gaim_plugin_remove();
plugin_remove_callbacks(p->handle);
plugins = g_list_remove(plugins, p);
g_free(p);
@@ -491,7 +491,7 @@
case event_blist_update:
case event_quit:
zero = g->function;
- (*zero)(g->data);
+ zero(g->data);
break;
/* one arg */
@@ -500,7 +500,7 @@
case event_new_conversation:
case event_error:
one = g->function;
- (*one)(arg1, g->data);
+ one(arg1, g->data);
break;
/* two args */
@@ -514,7 +514,7 @@
case event_set_info:
case event_draw_menu:
two = g->function;
- (*two)(arg1, arg2, g->data);
+ two(arg1, arg2, g->data);
break;
/* three args */
@@ -528,7 +528,7 @@
case event_back:
case event_warned:
three = g->function;
- (*three)(arg1, arg2, arg3, g->data);
+ three(arg1, arg2, arg3, g->data);
break;
/* four args */
@@ -538,7 +538,7 @@
case event_chat_send_invite:
case event_chat_invited:
four = g->function;
- (*four)(arg1, arg2, arg3, arg4, g->data);
+ four(arg1, arg2, arg3, arg4, g->data);
break;
default:
@@ -567,7 +567,7 @@
while (c) {
p = (struct gaim_plugin *)c->data;
if (g_module_symbol(p->handle, "gaim_plugin_remove", (gpointer *)&gaim_plugin_remove))
- (*gaim_plugin_remove)();
+ gaim_plugin_remove();
g_free(p);
c = c->next;
}
Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- multi.c 2001/11/02 00:52:07 1.102
+++ multi.c 2001/11/02 01:41:37 1.103
@@ -103,7 +103,7 @@
while (h) {
n = (struct buddy *)h->data;
if (gc->prpl->buddy_free)
- (*gc->prpl->buddy_free)(n);
+ gc->prpl->buddy_free(n);
h = g_slist_remove(h, n);
g_free(n);
}
@@ -150,7 +150,7 @@
{
struct prpl *p = find_prpl(proto);
if (p && p->name)
- return (*p->name)();
+ return p->name();
else
return "Unknown";
}
@@ -357,7 +357,7 @@
if (!found)
count++;
if (e->name)
- opt = gtk_menu_item_new_with_label((*e->name)());
+ opt = gtk_menu_item_new_with_label(e->name());
else
opt = gtk_menu_item_new_with_label("Unknown");
gtk_object_set_user_data(GTK_OBJECT(opt), u);
@@ -606,12 +606,12 @@
if (!p->user_opts)
return;
- tmp = op = (*p->user_opts)();
+ tmp = op = p->user_opts();
if (!op)
return;
- g_snprintf(buf, sizeof(buf), "%s Options", (*p->name)());
+ g_snprintf(buf, sizeof(buf), "%s Options", p->name());
u->proto_frame = gtk_frame_new(buf);
gtk_box_pack_start(GTK_BOX(box), u->proto_frame, FALSE, FALSE, 0);
gtk_widget_show(u->proto_frame);
@@ -1088,7 +1088,7 @@
return;
i = gtk_clist_find_row_from_data(GTK_CLIST(list), gc->user);
gtk_clist_set_text(GTK_CLIST(list), i, 1, "Yes");
- gtk_clist_set_text(GTK_CLIST(list), i, 3, (*gc->prpl->name)());
+ gtk_clist_set_text(GTK_CLIST(list), i, 3, gc->prpl->name());
return;
}
Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- perl.c 2001/10/24 11:07:35 1.63
+++ perl.c 2001/11/02 01:41:37 1.64
@@ -378,7 +378,7 @@
{
struct gaim_connection *gc = (struct gaim_connection *)SvIV(ST(1));
if (g_slist_find(connections, gc))
- XST_mPV(i++, (*gc->prpl->name)());
+ XST_mPV(i++, gc->prpl->name());
else
XST_mPV(i++, "Unknown");
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- prefs.c 2001/10/31 23:46:54 1.194
+++ prefs.c 2001/11/02 01:41:37 1.195
@@ -2117,7 +2117,7 @@
c = c->next;
if (!gc->prpl->set_permit_deny)
continue;
- g_snprintf(buf, sizeof buf, "%s (%s)", gc->username, (*gc->prpl->name)());
+ g_snprintf(buf, sizeof buf, "%s (%s)", gc->username, gc->prpl->name());
opt = gtk_menu_item_new_with_label(buf);
gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(deny_gc_opt), gc);
gtk_widget_show(opt);
@@ -2341,7 +2341,7 @@
/* this is a hack */
void (*func)();
func = gtk_ctree_node_get_row_data(ctree, node);
- (*func)();
+ func();
}
void show_prefs()
Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- prpl.c 2001/10/25 07:03:08 1.45
+++ prpl.c 2001/11/02 01:41:37 1.46
@@ -92,7 +92,7 @@
char buf[256];
g_snprintf(buf, sizeof buf, _("%s was using %s, which got removed."
" %s is now offline."), g->username,
- (*p->name)(), g->username);
+ p->name(), g->username);
do_error_dialog(buf, _("Disconnect"));
signoff(g);
c = connections;
@@ -235,7 +235,7 @@
static void proto_act(GtkObject *obj, struct gaim_connection *gc)
{
char *act = gtk_object_get_user_data(obj);
- (*gc->prpl->do_action)(gc, act);
+ gc->prpl->do_action(gc, act);
}
void do_proto_menu()
@@ -282,7 +282,7 @@
c = g_slist_next(c);
}
- tmp = act = (*gc->prpl->actions)();
+ tmp = act = gc->prpl->actions();
while (act) {
if (act->data == NULL) {
@@ -311,7 +311,7 @@
continue;
}
- g_snprintf(buf, sizeof(buf), "%s (%s)", gc->username, (*gc->prpl->name)());
+ g_snprintf(buf, sizeof(buf), "%s (%s)", gc->username, gc->prpl->name());
menuitem = gtk_menu_item_new_with_label(buf);
gtk_menu_append(GTK_MENU(protomenu), menuitem);
gtk_widget_show(menuitem);
@@ -320,7 +320,7 @@
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
gtk_widget_show(submenu);
- tmp = act = (*gc->prpl->actions)();
+ tmp = act = gc->prpl->actions();
while (act) {
if (act->data == NULL) {
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- server.c 2001/11/01 00:26:19 1.205
+++ server.c 2001/11/02 01:41:37 1.206
@@ -54,8 +54,8 @@
return;
}
- debug_printf("Logging in using %s\n", (*p->name)());
- (*p->login)(user);
+ debug_printf("Logging in using %s\n", p->name());
+ p->login(user);
} else {
do_error_dialog(_("You cannot log this account in; you do not have "
"the protocol it uses loaded, or the protocol does "
@@ -67,7 +67,7 @@
{
struct gaim_connection *gc = d;
if (gc->prpl && gc->prpl->keepalive)
- (*gc->prpl->keepalive)(gc);
+ gc->prpl->keepalive(gc);
return TRUE;
}
@@ -99,7 +99,7 @@
update_keepalive(gc, FALSE);
if (gc->prpl && gc->prpl->close)
- (*gc->prpl->close)(gc);
+ gc->prpl->close(gc);
account_offline(gc);
destroy_gaim_conn(gc);
@@ -146,7 +146,7 @@
{
int val = -EINVAL;
if (gc->prpl && gc->prpl->send_im)
- val = (*gc->prpl->send_im)(gc, name, message, flags);
+ val = gc->prpl->send_im(gc, name, message, flags);
if (!(flags & IM_FLAG_AWAY))
serv_touch_idle(gc);
@@ -157,27 +157,27 @@
void serv_get_info(struct gaim_connection *g, char *name)
{
if (g && g->prpl && g->prpl->get_info)
- (*g->prpl->get_info)(g, name);
+ g->prpl->get_info(g, name);
}
void serv_get_dir(struct gaim_connection *g, char *name)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->get_dir)
- (*g->prpl->get_dir)(g, name);
+ g->prpl->get_dir(g, name);
}
void serv_set_dir(struct gaim_connection *g, char *first, char *middle, char *last, char *maiden,
char *city, char *state, char *country, int web)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->set_dir)
- (*g->prpl->set_dir)(g, first, middle, last, maiden, city, state, country, web);
+ g->prpl->set_dir(g, first, middle, last, maiden, city, state, country, web);
}
void serv_dir_search(struct gaim_connection *g, char *first, char *middle, char *last, char *maiden,
char *city, char *state, char *country, char *email)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->dir_search)
- (*g->prpl->dir_search)(g, first, middle, last, maiden, city, state, country, email);
+ g->prpl->dir_search(g, first, middle, last, maiden, city, state, country, email);
}
@@ -193,7 +193,7 @@
strncpy_nohtml(buf, message, strlen(message) + 1);
}
- (*gc->prpl->set_away)(gc, state, buf);
+ gc->prpl->set_away(gc, state, buf);
plugin_event(event_away, gc, state, buf, 0);
@@ -220,30 +220,30 @@
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->set_info) {
plugin_event(event_set_info, g, info, 0, 0);
- (*g->prpl->set_info)(g, info);
+ g->prpl->set_info(g, info);
}
}
void serv_change_passwd(struct gaim_connection *g, char *orig, char *new)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->change_passwd)
- (*g->prpl->change_passwd)(g, orig, new);
+ g->prpl->change_passwd(g, orig, new);
}
void serv_add_buddy(struct gaim_connection *g, char *name)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->add_buddy)
- (*g->prpl->add_buddy)(g, name);
+ g->prpl->add_buddy(g, name);
}
void serv_add_buddies(struct gaim_connection *g, GList *buddies)
{
if (g && g_slist_find(connections, g) && g->prpl) {
if (g->prpl->add_buddies)
- (*g->prpl->add_buddies)(g, buddies);
+ g->prpl->add_buddies(g, buddies);
else if (g->prpl->add_buddy)
while (buddies) {
- (*g->prpl->add_buddy)(g, buddies->data);
+ g->prpl->add_buddy(g, buddies->data);
buddies = buddies->next;
}
}
@@ -253,7 +253,7 @@
void serv_remove_buddy(struct gaim_connection *g, char *name)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->remove_buddy)
- (*g->prpl->remove_buddy)(g, name);
+ g->prpl->remove_buddy(g, name);
}
void serv_remove_buddies(struct gaim_connection *gc, GList *g)
@@ -263,7 +263,7 @@
if (!gc->prpl)
return; /* how the hell did that happen? */
if (gc->prpl->remove_buddies)
- (*gc->prpl->remove_buddies)(gc, g);
+ gc->prpl->remove_buddies(gc, g);
else {
while (g) {
serv_remove_buddy(gc, g->data);
@@ -275,25 +275,25 @@
void serv_add_permit(struct gaim_connection *g, char *name)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->add_permit)
- (*g->prpl->add_permit)(g, name);
+ g->prpl->add_permit(g, name);
}
void serv_add_deny(struct gaim_connection *g, char *name)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->add_deny)
- (*g->prpl->add_deny)(g, name);
+ g->prpl->add_deny(g, name);
}
void serv_rem_permit(struct gaim_connection *g, char *name)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->rem_permit)
- (*g->prpl->rem_permit)(g, name);
+ g->prpl->rem_permit(g, name);
}
void serv_rem_deny(struct gaim_connection *g, char *name)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->rem_deny)
- (*g->prpl->rem_deny)(g, name);
+ g->prpl->rem_deny(g, name);
}
void serv_set_permit_deny(struct gaim_connection *g)
@@ -302,26 +302,26 @@
* or when the user toggles the permit/deny mode in the prefs. In either case you should
* probably be resetting and resending the permit/deny info when you get this. */
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->set_permit_deny)
- (*g->prpl->set_permit_deny)(g);
+ g->prpl->set_permit_deny(g);
}
void serv_set_idle(struct gaim_connection *g, int time)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->set_idle)
- (*g->prpl->set_idle)(g, time);
+ g->prpl->set_idle(g, time);
}
void serv_warn(struct gaim_connection *g, char *name, int anon)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->warn)
- (*g->prpl->warn)(g, name, anon);
+ g->prpl->warn(g, name, anon);
}
void serv_join_chat(struct gaim_connection *g, GList *data)
{
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->join_chat)
- (*g->prpl->join_chat)(g, data);
+ g->prpl->join_chat(g, data);
}
void serv_chat_invite(struct gaim_connection *g, int id, char *message, char *name)
@@ -329,7 +329,7 @@
char *buffy = message && *message ? g_strdup(message) : NULL;
plugin_event(event_chat_send_invite, g, (void *)id, name, &buffy);
if (g && g_slist_find(connections, g) && g->prpl && g->prpl->chat_invite)
- (*g->prpl->chat_invite)(g, id, buffy, name);
+ g->prpl->chat_invite(g, id, buffy, name);
if (buffy)
g_free(buffy);
}
@@ -340,20 +340,20 @@
return;
if (g->prpl && g->prpl->chat_leave)
- (*g->prpl->chat_leave)(g, id);
+ g->prpl->chat_leave(g, id);
}
void serv_chat_whisper(struct gaim_connection *g, int id, char *who, char *message)
{
if (g->prpl && g->prpl->chat_whisper)
- (*g->prpl->chat_whisper)(g, id, who, message);
+ g->prpl->chat_whisper(g, id, who, message);
}
int serv_chat_send(struct gaim_connection *g, int id, char *message)
{
int val = -EINVAL;
if (g->prpl && g->prpl->chat_send)
- val = (*g->prpl->chat_send)(g, id, message);
+ val = g->prpl->chat_send(g, id, message);
serv_touch_idle(g);
return val;
}
Index: ticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ticker.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ticker.c 2001/10/19 08:39:48 1.17
+++ ticker.c 2001/11/02 01:41:37 1.18
@@ -293,7 +293,7 @@
if( b->present ) {
xpm = NULL;
if (gc->prpl->list_icon)
- xpm = (*gc->prpl->list_icon)(b->uc);
+ xpm = gc->prpl->list_icon(b->uc);
if (xpm == NULL)
xpm = (char **)no_icon_xpm;
pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm);
Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- util.c 2001/10/25 20:58:01 1.110
+++ util.c 2001/11/02 01:41:37 1.111
@@ -963,32 +963,32 @@
switch (what) {
case log_signon:
g_snprintf(text, sizeof(text), "+++ %s (%s) signed on @ %s",
- gc->username, (*gc->prpl->name)(), full_date());
+ gc->username, gc->prpl->name(), full_date());
g_snprintf(html, sizeof(html), "<B>%s</B>", text);
break;
case log_signoff:
g_snprintf(text, sizeof(text), "+++ %s (%s) signed off @ %s",
- gc->username, (*gc->prpl->name)(), full_date());
+ gc->username, gc->prpl->name(), full_date());
g_snprintf(html, sizeof(html), "<I><FONT COLOR=GRAY>%s</FONT></I>", text);
break;
case log_away:
g_snprintf(text, sizeof(text), "+++ %s (%s) changed away state @ %s",
- gc->username, (*gc->prpl->name)(), full_date());
+ gc->username, gc->prpl->name(), full_date());
g_snprintf(html, sizeof(html), "<FONT COLOR=OLIVE>%s</FONT>", text);
break;
case log_back:
g_snprintf(text, sizeof(text), "+++ %s (%s) came back @ %s",
- gc->username, (*gc->prpl->name)(), full_date());
+ gc->username, gc->prpl->name(), full_date());
g_snprintf(html, sizeof(html), "%s", text);
break;
case log_idle:
g_snprintf(text, sizeof(text), "+++ %s (%s) became idle @ %s",
- gc->username, (*gc->prpl->name)(), full_date());
+ gc->username, gc->prpl->name(), full_date());
g_snprintf(html, sizeof(html), "<FONT COLOR=GRAY>%s</FONT>", text);
break;
case log_unidle:
g_snprintf(text, sizeof(text), "+++ %s (%s) returned from idle @ %s",
- gc->username, (*gc->prpl->name)(), full_date());
+ gc->username, gc->prpl->name(), full_date());
g_snprintf(html, sizeof(html), "%s", text);
break;
case log_quit:
@@ -1000,33 +1000,33 @@
switch (what) {
case log_signon:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) signed on @ %s",
- gc->username, (*gc->prpl->name)(), who->show, who->name, full_date());
+ gc->username, gc->prpl->name(), who->show, who->name, full_date());
g_snprintf(html, sizeof(html), "<B>%s</B>", text);
break;
case log_signoff:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) signed off @ %s",
- gc->username, (*gc->prpl->name)(), who->show, who->name, full_date());
+ gc->username, gc->prpl->name(), who->show, who->name, full_date());
g_snprintf(html, sizeof(html), "<I><FONT COLOR=GRAY>%s</FONT></I>", text);
break;
case log_away:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) went away @ %s",
- gc->username, (*gc->prpl->name)(), who->show, who->name, full_date());
+ gc->username, gc->prpl->name(), who->show, who->name, full_date());
g_snprintf(html, sizeof(html), "<FONT COLOR=OLIVE>%s</FONT>", text);
break;
case log_back:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) came back @ %s",
- gc->username, (*gc->prpl->name)(), who->show, who->name, full_date());
+ gc->username, gc->prpl->name(), who->show, who->name, full_date());
g_snprintf(html, sizeof(html), "%s", text);
break;
case log_idle:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) became idle @ %s",
- gc->username, (*gc->prpl->name)(), who->show, who->name, full_date());
+ gc->username, gc->prpl->name(), who->show, who->name, full_date());
g_snprintf(html, sizeof(html), "<FONT COLOR=GRAY>%s</FONT>", text);
break;
case log_unidle:
g_snprintf(text, sizeof(text),
"%s (%s) reported that %s (%s) returned from idle @ %s", gc->username,
- (*gc->prpl->name)(), who->show, who->name, full_date());
+ gc->prpl->name(), who->show, who->name, full_date());
g_snprintf(html, sizeof(html), "%s", text);
break;
default:
@@ -1038,33 +1038,33 @@
switch (what) {
case log_signon:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s signed on @ %s",
- gc->username, (*gc->prpl->name)(), who->name, full_date());
+ gc->username, gc->prpl->name(), who->name, full_date());
g_snprintf(html, sizeof(html), "<B>%s</B>", text);
break;
case log_signoff:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s signed off @ %s",
- gc->username, (*gc->prpl->name)(), who->name, full_date());
+ gc->username, gc->prpl->name(), who->name, full_date());
g_snprintf(html, sizeof(html), "<I><FONT COLOR=GRAY>%s</FONT></I>", text);
break;
case log_away:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s went away @ %s",
- gc->username, (*gc->prpl->name)(), who->name, full_date());
+ gc->username, gc->prpl->name(), who->name, full_date());
g_snprintf(html, sizeof(html), "<FONT COLOR=OLIVE>%s</FONT>", text);
break;
case log_back:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s came back @ %s",
- gc->username, (*gc->prpl->name)(), who->name, full_date());
+ gc->username, gc->prpl->name(), who->name, full_date());
g_snprintf(html, sizeof(html), "%s", text);
break;
case log_idle:
g_snprintf(text, sizeof(text), "%s (%s) reported that %s became idle @ %s",
- gc->username, (*gc->prpl->name)(), who->name, full_date());
+ gc->username, gc->prpl->name(), who->name, full_date());
g_snprintf(html, sizeof(html), "<FONT COLOR=GRAY>%s</FONT>", text);
break;
case log_unidle:
g_snprintf(text, sizeof(text),
"%s (%s) reported that %s returned from idle @ %s", gc->username,
- (*gc->prpl->name)(), who->name, full_date());
+ gc->prpl->name(), who->name, full_date());
g_snprintf(html, sizeof(html), "%s", text);
break;
default:
|