Mercurial > pidgin.yaz
changeset 5676:dae79aefac8d
[gaim-migrate @ 6094]
I've been meaning to do this for a LONG time. The conversation API now
follows the naming convention of the rest of the new APIs. I'll get some
g_return_*_if_fail() checks in there soon.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Mon, 02 Jun 2003 21:51:06 +0000 |
| parents | 17e345ffeddb |
| children | 0adfd56b46b5 |
| files | plugins/events.c plugins/filectl.c plugins/gestures/gestures.c plugins/history.c plugins/iconaway.c plugins/notify.c plugins/perl/perl.c plugins/statenotify.c plugins/timestamp.c src/away.c src/blist.c src/connection.c src/conversation.c src/conversation.h src/core.h src/dialogs.c src/gaim.h src/gtkconv.c src/gtkconv.h src/gtkpounce.c src/gtkutils.c src/gtkutils.h src/log.c src/prpl.c src/server.c src/themes.c src/ui.h src/util.c |
| diffstat | 28 files changed, 862 insertions(+), 890 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/events.c Mon Jun 02 21:14:50 2003 +0000 +++ b/plugins/events.c Mon Jun 02 21:51:06 2003 +0000 @@ -161,7 +161,7 @@ printf("event_got_typing: %s\n", who); } -static evt_del_conversation(struct gaim_conversation *c, void *data) +static evt_del_conversation(GaimConversation *c, void *data) { printf("event_del_conversation\n"); }
--- a/plugins/filectl.c Mon Jun 02 21:14:50 2003 +0000 +++ b/plugins/filectl.c Mon Jun 02 21:51:06 2003 +0000 @@ -72,7 +72,7 @@ signoff_all(NULL, NULL); free(arg1); } else if (!strncasecmp(command, "send", 4)) { - struct gaim_conversation *c; + GaimConversation *c; arg1 = getarg(buffer, 1, 0); arg2 = getarg(buffer, 2, 1); c = find_conversation(arg1);
--- a/plugins/gestures/gestures.c Mon Jun 02 21:14:50 2003 +0000 +++ b/plugins/gestures/gestures.c Mon Jun 02 21:51:06 2003 +0000 @@ -30,10 +30,10 @@ static void stroke_close(GtkWidget *widget, void *data) { - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *conv; + GaimGtkConversation *gtkconv; - conv = (struct gaim_conversation *)data; + conv = (GaimConversation *)data; /* Double-check */ if (!GAIM_IS_GTK_CONVERSATION(conv)) @@ -48,11 +48,11 @@ static void stroke_prev_tab(GtkWidget *widget, void *data) { - struct gaim_conversation *conv; - struct gaim_window *win; + GaimConversation *conv; + GaimWindow *win; unsigned int index; - conv = (struct gaim_conversation *)data; + conv = (GaimConversation *)data; win = gaim_conversation_get_window(conv); index = gaim_conversation_get_index(conv); @@ -67,11 +67,11 @@ static void stroke_next_tab(GtkWidget *widget, void *data) { - struct gaim_conversation *conv; - struct gaim_window *win; + GaimConversation *conv; + GaimWindow *win; unsigned int index; - conv = (struct gaim_conversation *)data; + conv = (GaimConversation *)data; win = gaim_conversation_get_window(conv); index = gaim_conversation_get_index(conv); @@ -86,10 +86,10 @@ void stroke_new_win(GtkWidget *widget, void *data) { - struct gaim_window *new_win, *old_win; - struct gaim_conversation *conv; + GaimWindow *new_win, *old_win; + GaimConversation *conv; - conv = (struct gaim_conversation *)data; + conv = (GaimConversation *)data; old_win = gaim_conversation_get_window(conv); if (gaim_window_get_conversation_count(old_win) <= 1) @@ -104,9 +104,9 @@ } static void -attach_signals(struct gaim_conversation *conv) +attach_signals(GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -124,7 +124,7 @@ static void new_conv_cb(char *who) { - struct gaim_conversation *conv; + GaimConversation *conv; conv = gaim_find_conversation(who); @@ -153,11 +153,11 @@ static gboolean plugin_load(GaimPlugin *plugin) { - struct gaim_conversation *conv; + GaimConversation *conv; GList *l; for (l = gaim_get_conversations(); l != NULL; l = l->next) { - conv = (struct gaim_conversation *)l->data; + conv = (GaimConversation *)l->data; if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; @@ -173,12 +173,12 @@ static gboolean plugin_unload(GaimPlugin *plugin) { - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *conv; + GaimGtkConversation *gtkconv; GList *l; for (l = gaim_get_conversations(); l != NULL; l = l->next) { - conv = (struct gaim_conversation *)l->data; + conv = (GaimConversation *)l->data; if (!GAIM_IS_GTK_CONVERSATION(conv)) continue;
--- a/plugins/history.c Mon Jun 02 21:14:50 2003 +0000 +++ b/plugins/history.c Mon Jun 02 21:51:06 2003 +0000 @@ -17,8 +17,8 @@ void historize (char *name, void *data) { - struct gaim_conversation *c = gaim_find_conversation(name); - struct gaim_gtk_conversation *gtkconv; + GaimConversation *c = gaim_find_conversation(name); + GaimGtkConversation *gtkconv; struct stat st; FILE *fd; char *userdir = g_strdup(gaim_user_dir());
--- a/plugins/iconaway.c Mon Jun 02 21:14:50 2003 +0000 +++ b/plugins/iconaway.c Mon Jun 02 21:51:06 2003 +0000 @@ -20,7 +20,7 @@ void iconify_windows(GaimConnection *gc, char *state, char *message, void *data) { - struct gaim_window *win; + GaimWindow *win; GList *windows; if (!imaway || !gc->away) @@ -33,10 +33,10 @@ windows != NULL; windows = windows->next) { - win = (struct gaim_window *)windows->data; + win = (GaimWindow *)windows->data; if (GAIM_IS_GTK_WINDOW(win)) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; gtkwin = GAIM_GTK_WINDOW(win);
--- a/plugins/notify.c Mon Jun 02 21:14:50 2003 +0000 +++ b/plugins/notify.c Mon Jun 02 21:51:06 2003 +0000 @@ -71,11 +71,11 @@ void quote_add(GtkWidget *widget); gboolean quote_remove(GtkWidget *widget); /* urgent functions */ -void urgent_add(struct gaim_conversation *c); -gboolean urgent_remove(struct gaim_conversation *c); +void urgent_add(GaimConversation *c); +gboolean urgent_remove(GaimConversation *c); -int notify(struct gaim_conversation *cnv) { - struct gaim_gtk_window *gtkwin; +int notify(GaimConversation *cnv) { + GaimGtkWindow *gtkwin; Window focus_return; int revert_to_return; @@ -97,8 +97,8 @@ return 0; } -guint unnotify(struct gaim_conversation *c, gboolean clean) { - struct gaim_gtk_window *gtkwin; +guint unnotify(GaimConversation *c, gboolean clean) { + GaimGtkWindow *gtkwin; guint option = 0; gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c)); @@ -130,7 +130,7 @@ } void chat_recv_im(struct gaim_connection *gc, int id, char **who, char **text) { - struct gaim_conversation *c = gaim_find_chat(gc, id); + GaimConversation *c = gaim_find_chat(gc, id); if (c && (type & TYPE_CHAT)) notify(c); @@ -138,7 +138,7 @@ } void chat_sent_im(struct gaim_connection *gc, int id, char **text) { - struct gaim_conversation *c = gaim_find_chat(gc, id); + GaimConversation *c = gaim_find_chat(gc, id); if (c && (type & TYPE_CHAT)) unnotify(c, FALSE); @@ -146,7 +146,7 @@ } int im_recv_im(struct gaim_connection *gc, char **who, char **what, void *m) { - struct gaim_conversation *c = gaim_find_conversation(*who); + GaimConversation *c = gaim_find_conversation(*who); if (c && (type & TYPE_IM)) notify(c); @@ -154,16 +154,16 @@ } int im_sent_im(struct gaim_connection *gc, char *who, char **what, void *m) { - struct gaim_conversation *c = gaim_find_conversation(who); + GaimConversation *c = gaim_find_conversation(who); if (c && (type & TYPE_IM)) unnotify(c, FALSE); return 0; } -int attach_signals(struct gaim_conversation *c) { - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_window *gtkwin; +int attach_signals(GaimConversation *c) { + GaimGtkConversation *gtkconv; + GaimGtkWindow *gtkwin; gtkconv = GAIM_GTK_CONVERSATION(c); gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c)); @@ -189,9 +189,9 @@ return 0; } -void detach_signals(struct gaim_conversation *c) { - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_window *gtkwin; +void detach_signals(GaimConversation *c) { + GaimGtkConversation *gtkconv; + GaimGtkWindow *gtkwin; guint options; gtkconv = GAIM_GTK_CONVERSATION(c); @@ -214,21 +214,21 @@ } void new_conv(char *who) { - struct gaim_conversation *c = gaim_find_conversation(who); + GaimConversation *c = gaim_find_conversation(who); if (c && (type & TYPE_IM)) attach_signals(c); } void chat_join(struct gaim_connection *gc, int id, char *room) { - struct gaim_conversation *c = gaim_find_chat(gc, id); + GaimConversation *c = gaim_find_chat(gc, id); if (c && (type & TYPE_CHAT)) attach_signals(c); } int un_star(GtkWidget *widget, gpointer data) { - struct gaim_conversation *c = g_object_get_data(G_OBJECT(widget), "user_data"); + GaimConversation *c = g_object_get_data(G_OBJECT(widget), "user_data"); if (method & METHOD_QUOTE) quote_remove(widget); @@ -354,8 +354,8 @@ return FALSE; } -void urgent_add(struct gaim_conversation *c) { - struct gaim_gtk_window *gtkwin; +void urgent_add(GaimConversation *c) { + GaimGtkWindow *gtkwin; XWMHints *hints; gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c)); @@ -366,8 +366,8 @@ XFree(hints); } -gboolean urgent_remove(struct gaim_conversation *c) { - struct gaim_gtk_conversation *gtkconv; +gboolean urgent_remove(GaimConversation *c) { + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(c); @@ -376,8 +376,8 @@ (gaim_conversation_get_type(c) != GAIM_CONV_CHAT && (im_options & OPT_IM_ONE_WINDOW))) { if (gaim_conversation_get_type(c) == GAIM_CONV_CHAT) { - struct gaim_conversation *c = (struct gaim_conversation *)gaim_get_chats()->data; - struct gaim_gtk_window *gtkwin; + GaimConversation *c = (GaimConversation *)gaim_get_chats()->data; + GaimGtkWindow *gtkwin; GdkWindow *win; XWMHints *hints; @@ -395,12 +395,12 @@ XFree(hints); return FALSE; } else { - struct gaim_conversation *c; - struct gaim_gtk_window *gtkwin; + GaimConversation *c; + GaimGtkWindow *gtkwin; GdkWindow *win; XWMHints *hints; - c = (struct gaim_conversation *)gaim_get_ims()->data; + c = (GaimConversation *)gaim_get_ims()->data; gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c)); win = gtkwin->window->window; @@ -415,7 +415,7 @@ return FALSE; } } else { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; XWMHints *hints; gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c)); @@ -527,9 +527,9 @@ while (cnv) { guint notification; - struct gaim_conversation *c = (struct gaim_conversation *) cnv->data; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_window *gtkwin; + GaimConversation *c = (GaimConversation *) cnv->data; + GaimGtkConversation *gtkconv; + GaimGtkWindow *gtkwin; guint options = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(c->window), "notify_data")); gtkconv = GAIM_GTK_CONVERSATION(c); @@ -664,8 +664,8 @@ GList *c = gaim_get_conversations(); while (c) { - struct gaim_conversation *cnv = (struct gaim_conversation *)c->data; - struct gaim_gtk_window *gtkwin; + GaimConversation *cnv = (GaimConversation *)c->data; + GaimGtkWindow *gtkwin; gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(cnv));
--- a/plugins/perl/perl.c Mon Jun 02 21:14:50 2003 +0000 +++ b/plugins/perl/perl.c Mon Jun 02 21:51:06 2003 +0000 @@ -797,7 +797,7 @@ XS (XS_GAIM_write_to_conv) { char *nick, *who, *what; - struct gaim_conversation *c; + GaimConversation *c; int junk; int send, wflags; dXSARGS; @@ -853,7 +853,7 @@ GaimConnection *gc; char *nick, *what; int isauto; - struct gaim_conversation *c; + GaimConversation *c; unsigned int junk; dXSARGS; items = 0; @@ -887,7 +887,7 @@ GaimConnection *gc; int id; char *what; - struct gaim_conversation *b = NULL; + GaimConversation *b = NULL; GSList *bcs; unsigned int junk; dXSARGS; @@ -903,7 +903,7 @@ } bcs = gc->buddy_chats; while (bcs) { - b = (struct gaim_conversation *)bcs->data; + b = (GaimConversation *)bcs->data; if (gaim_chat_get_id(gaim_conversation_get_chat_data(b)) == id) break;
--- a/plugins/statenotify.c Mon Jun 02 21:14:50 2003 +0000 +++ b/plugins/statenotify.c Mon Jun 02 21:51:06 2003 +0000 @@ -3,7 +3,7 @@ static void write_status(GaimConnection *gc, char *who, const char *message) { - struct gaim_conversation *conv; + GaimConversation *conv; struct buddy *b; char buf[256];
--- a/plugins/timestamp.c Mon Jun 02 21:14:50 2003 +0000 +++ b/plugins/timestamp.c Mon Jun 02 21:51:06 2003 +0000 @@ -19,7 +19,7 @@ gboolean do_timestamp (gpointer data) { - struct gaim_conversation *c = (struct gaim_conversation *)data; + GaimConversation *c = (GaimConversation *)data; char *buf; char mdate[6]; time_t tim = time(NULL); @@ -36,7 +36,7 @@ void timestamp_new_convo(char *name) { - struct gaim_conversation *c = gaim_find_conversation(name); + GaimConversation *c = gaim_find_conversation(name); do_timestamp(c); timestamp_timeouts = g_slist_append(timestamp_timeouts, @@ -101,7 +101,7 @@ plugin_load(GaimPlugin *plugin) { GList *cnvs; - struct gaim_conversation *c; + GaimConversation *c; for (cnvs = gaim_get_conversations(); cnvs != NULL; cnvs = cnvs->next) { c = cnvs->data;
--- a/src/away.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/away.c Mon Jun 02 21:51:06 2003 +0000 @@ -62,7 +62,7 @@ { gchar *name; GSList *templist; - struct gaim_conversation *cnv; + GaimConversation *cnv; gtk_tree_model_get(GTK_TREE_MODEL(awayqueuestore), iter, 0, &name, -1); @@ -109,7 +109,7 @@ { GSList *q = *queue; struct queued_message *qm; - struct gaim_conversation *cnv; + GaimConversation *cnv; GaimAccount *account; while (q) {
--- a/src/blist.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/blist.c Mon Jun 02 21:51:06 2003 +0000 @@ -246,7 +246,7 @@ void gaim_blist_alias_buddy (struct buddy *buddy, const char *alias) { struct gaim_blist_ui_ops *ops = gaimbuddylist->ui_ops; - struct gaim_conversation *conv; + GaimConversation *conv; g_free(buddy->alias);
--- a/src/connection.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/connection.c Mon Jun 02 21:51:06 2003 +0000 @@ -127,7 +127,7 @@ * notification system. */ for (wins = gaim_get_windows(); wins != NULL; wins = wins->next) { - struct gaim_window *win = (struct gaim_window *)wins->data; + GaimWindow *win = (GaimWindow *)wins->data; gaim_conversation_update(gaim_window_get_conversation_at(win, 0), GAIM_CONV_ACCOUNT_OFFLINE); } @@ -191,7 +191,7 @@ * notification system. */ for (wins = gaim_get_windows(); wins != NULL; wins = wins->next) { - struct gaim_window *win = (struct gaim_window *)wins->data; + GaimWindow *win = (GaimWindow *)wins->data; gaim_conversation_update(gaim_window_get_conversation_at(win, 0), GAIM_CONV_ACCOUNT_ONLINE); }
--- a/src/conversation.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/conversation.c Mon Jun 02 21:51:06 2003 +0000 @@ -38,22 +38,23 @@ #include "win32dep.h" #endif -struct ConvPlacementData +typedef struct { char *name; - gaim_conv_placement_fnc fnc; -}; + GaimConvPlacementFunc fnc; + +} ConvPlacementData; #define SEND_TYPED_TIMEOUT 5000 -static struct gaim_window_ui_ops *win_ui_ops = NULL; +static GaimWindowUiOps *win_ui_ops = NULL; static GList *conversations = NULL; static GList *ims = NULL; static GList *chats = NULL; static GList *windows = NULL; static GList *conv_placement_fncs = NULL; -static gaim_conv_placement_fnc place_conv = NULL; +static GaimConvPlacementFunc place_conv = NULL; static int place_conv_index = -1; static gint @@ -138,8 +139,8 @@ reset_typing(gpointer data) { char *name = (char *)data; - struct gaim_conversation *c = gaim_find_conversation(name); - struct gaim_im *im; + GaimConversation *c = gaim_find_conversation(name); + GaimIm *im; if (!c) return FALSE; @@ -156,7 +157,7 @@ static gboolean send_typed(gpointer data) { - struct gaim_conversation *conv = (struct gaim_conversation *)data; + GaimConversation *conv = (GaimConversation *)data; GaimConnection *gc; const char *name; @@ -176,11 +177,11 @@ } static void -common_send(struct gaim_conversation *conv, const char *message) +common_send(GaimConversation *conv, const char *message) { GaimConversationType type; GaimConnection *gc; - struct gaim_conversation_ui_ops *ops; + GaimConversationUiOps *ops; char *buf, *buf2, *buffy = NULL; gulong length = 0; gboolean binary = FALSE; @@ -251,7 +252,7 @@ g_free(buffy); if (type == GAIM_CONV_IM) { - struct gaim_im *im = GAIM_IM(conv); + GaimIm *im = GAIM_IM(conv); buffy = g_strdup(buf); gaim_event_broadcast(event_im_displayed_sent, gc, @@ -429,7 +430,7 @@ } static void -update_conv_indexes(struct gaim_window *win) +update_conv_indexes(GaimWindow *win) { GList *l; int i; @@ -438,18 +439,18 @@ l != NULL; l = l->next, i++) { - struct gaim_conversation *conv = (struct gaim_conversation *)l->data; + GaimConversation *conv = (GaimConversation *)l->data; conv->conversation_pos = i; } } -struct gaim_window * +GaimWindow * gaim_window_new(void) { - struct gaim_window *win; - - win = g_malloc0(sizeof(struct gaim_window)); + GaimWindow *win; + + win = g_malloc0(sizeof(GaimWindow)); win->ui_ops = gaim_get_win_ui_ops(); @@ -462,9 +463,9 @@ } void -gaim_window_destroy(struct gaim_window *win) +gaim_window_destroy(GaimWindow *win) { - struct gaim_window_ui_ops *ops; + GaimWindowUiOps *ops; GList *node; if (win == NULL) @@ -487,7 +488,7 @@ node = g_list_first(gaim_window_get_conversations(win)); while(node != NULL) { - struct gaim_conversation *conv = node->data; + GaimConversation *conv = node->data; node = g_list_next(node); @@ -508,9 +509,9 @@ } void -gaim_window_show(struct gaim_window *win) +gaim_window_show(GaimWindow *win) { - struct gaim_window_ui_ops *ops; + GaimWindowUiOps *ops; if (win == NULL) return; @@ -524,9 +525,9 @@ } void -gaim_window_hide(struct gaim_window *win) +gaim_window_hide(GaimWindow *win) { - struct gaim_window_ui_ops *ops; + GaimWindowUiOps *ops; if (win == NULL) return; @@ -540,9 +541,9 @@ } void -gaim_window_raise(struct gaim_window *win) +gaim_window_raise(GaimWindow *win) { - struct gaim_window_ui_ops *ops; + GaimWindowUiOps *ops; if (win == NULL) return; @@ -556,9 +557,9 @@ } void -gaim_window_flash(struct gaim_window *win) +gaim_window_flash(GaimWindow *win) { - struct gaim_window_ui_ops *ops; + GaimWindowUiOps *ops; if (win == NULL) return; @@ -572,9 +573,9 @@ } void -gaim_window_set_ui_ops(struct gaim_window *win, struct gaim_window_ui_ops *ops) +gaim_window_set_ui_ops(GaimWindow *win, GaimWindowUiOps *ops) { - struct gaim_conversation_ui_ops *conv_ops = NULL; + GaimConversationUiOps *conv_ops = NULL; GList *l; if (win == NULL || win->ui_ops == ops) @@ -595,7 +596,7 @@ l != NULL; l = l->next) { - struct gaim_conversation *conv = (struct gaim_conversation *)l; + GaimConversation *conv = (GaimConversation *)l; gaim_conversation_set_ui_ops(conv, conv_ops); @@ -604,8 +605,8 @@ } } -struct gaim_window_ui_ops * -gaim_window_get_ui_ops(const struct gaim_window *win) +GaimWindowUiOps * +gaim_window_get_ui_ops(const GaimWindow *win) { if (win == NULL) return NULL; @@ -614,10 +615,9 @@ } int -gaim_window_add_conversation(struct gaim_window *win, - struct gaim_conversation *conv) +gaim_window_add_conversation(GaimWindow *win, GaimConversation *conv) { - struct gaim_window_ui_ops *ops; + GaimWindowUiOps *ops; if (win == NULL || conv == NULL) return -1; @@ -648,11 +648,11 @@ return win->conversation_count - 1; } -struct gaim_conversation * -gaim_window_remove_conversation(struct gaim_window *win, unsigned int index) +GaimConversation * +gaim_window_remove_conversation(GaimWindow *win, unsigned int index) { - struct gaim_window_ui_ops *ops; - struct gaim_conversation *conv; + GaimWindowUiOps *ops; + GaimConversation *conv; GList *node; if (win == NULL || index >= gaim_window_get_conversation_count(win)) @@ -661,7 +661,7 @@ ops = gaim_window_get_ui_ops(win); node = g_list_nth(gaim_window_get_conversations(win), index); - conv = (struct gaim_conversation *)node->data; + conv = (GaimConversation *)node->data; if (ops != NULL && ops->remove_conversation != NULL) ops->remove_conversation(win, conv); @@ -685,11 +685,11 @@ } void -gaim_window_move_conversation(struct gaim_window *win, unsigned int index, +gaim_window_move_conversation(GaimWindow *win, unsigned int index, unsigned int new_index) { - struct gaim_window_ui_ops *ops; - struct gaim_conversation *conv; + GaimWindowUiOps *ops; + GaimConversation *conv; GList *l; if (win == NULL || index >= gaim_window_get_conversation_count(win) || @@ -711,7 +711,7 @@ return; } - conv = (struct gaim_conversation *)l->data; + conv = (GaimConversation *)l->data; /* Update the UI part of this. */ ops = gaim_window_get_ui_ops(win); @@ -731,19 +731,18 @@ update_conv_indexes(win); } -struct gaim_conversation * -gaim_window_get_conversation_at(const struct gaim_window *win, - unsigned int index) +GaimConversation * +gaim_window_get_conversation_at(const GaimWindow *win, unsigned int index) { if (win == NULL || index >= gaim_window_get_conversation_count(win)) return NULL; - return (struct gaim_conversation *)g_list_nth_data( + return (GaimConversation *)g_list_nth_data( gaim_window_get_conversations(win), index); } size_t -gaim_window_get_conversation_count(const struct gaim_window *win) +gaim_window_get_conversation_count(const GaimWindow *win) { if (win == NULL) return 0; @@ -752,9 +751,9 @@ } void -gaim_window_switch_conversation(struct gaim_window *win, unsigned int index) +gaim_window_switch_conversation(GaimWindow *win, unsigned int index) { - struct gaim_window_ui_ops *ops; + GaimWindowUiOps *ops; if (win == NULL || index < 0 || index >= gaim_window_get_conversation_count(win)) @@ -769,10 +768,10 @@ gaim_window_get_conversation_at(win, index), 0); } -struct gaim_conversation * -gaim_window_get_active_conversation(const struct gaim_window *win) +GaimConversation * +gaim_window_get_active_conversation(const GaimWindow *win) { - struct gaim_window_ui_ops *ops; + GaimWindowUiOps *ops; if (win == NULL) return NULL; @@ -786,7 +785,7 @@ } GList * -gaim_window_get_conversations(const struct gaim_window *win) +gaim_window_get_conversations(const GaimWindow *win) { if (win == NULL) return NULL; @@ -800,24 +799,24 @@ return windows; } -struct gaim_window * +GaimWindow * gaim_get_first_window_with_type(GaimConversationType type) { GList *wins, *convs; - struct gaim_window *win; - struct gaim_conversation *conv; + GaimWindow *win; + GaimConversation *conv; if (type == GAIM_CONV_UNKNOWN) return NULL; for (wins = gaim_get_windows(); wins != NULL; wins = wins->next) { - win = (struct gaim_window *)wins->data; + win = (GaimWindow *)wins->data; for (convs = gaim_window_get_conversations(win); convs != NULL; convs = convs->next) { - conv = (struct gaim_conversation *)convs->data; + conv = (GaimConversation *)convs->data; if (gaim_conversation_get_type(conv) == type) return win; @@ -827,12 +826,12 @@ return NULL; } -struct gaim_window * +GaimWindow * gaim_get_last_window_with_type(GaimConversationType type) { GList *wins, *convs; - struct gaim_window *win; - struct gaim_conversation *conv; + GaimWindow *win; + GaimConversation *conv; if (type == GAIM_CONV_UNKNOWN) return NULL; @@ -841,13 +840,13 @@ wins != NULL; wins = wins->prev) { - win = (struct gaim_window *)wins->data; + win = (GaimWindow *)wins->data; for (convs = gaim_window_get_conversations(win); convs != NULL; convs = convs->next) { - conv = (struct gaim_conversation *)convs->data; + conv = (GaimConversation *)convs->data; if (gaim_conversation_get_type(conv) == type) return win; @@ -860,11 +859,11 @@ /************************************************************************** * Conversation API **************************************************************************/ -struct gaim_conversation * +GaimConversation * gaim_conversation_new(GaimConversationType type, GaimAccount *account, const char *name) { - struct gaim_conversation *conv; + GaimConversation *conv; if (type == GAIM_CONV_UNKNOWN) return NULL; @@ -873,7 +872,7 @@ if ((conv = gaim_find_conversation_with_account(name, account)) != NULL) return conv; - conv = g_malloc0(sizeof(struct gaim_conversation)); + conv = g_malloc0(sizeof(GaimConversation)); conv->type = type; conv->account = account; @@ -886,7 +885,7 @@ if (type == GAIM_CONV_IM) { - conv->u.im = g_malloc0(sizeof(struct gaim_im)); + conv->u.im = g_malloc0(sizeof(GaimIm)); conv->u.im->conv = conv; ims = g_list_append(ims, conv); @@ -896,7 +895,7 @@ } else if (type == GAIM_CONV_CHAT) { - conv->u.chat = g_malloc0(sizeof(struct gaim_chat)); + conv->u.chat = g_malloc0(sizeof(GaimChat)); conv->u.chat->conv = conv; chats = g_list_append(chats, conv); @@ -917,7 +916,7 @@ if (windows == NULL || !gaim_prefs_get_bool("/gaim/gtk/conversations/tabs")) { - struct gaim_window *win; + GaimWindow *win; win = gaim_window_new(); gaim_window_add_conversation(win, conv); @@ -938,11 +937,11 @@ } void -gaim_conversation_destroy(struct gaim_conversation *conv) +gaim_conversation_destroy(GaimConversation *conv) { GaimPluginProtocolInfo *prpl_info = NULL; - struct gaim_window *win; - struct gaim_conversation_ui_ops *ops; + GaimWindow *win; + GaimConversationUiOps *ops; GaimConnection *gc; const char *name; GList *node; @@ -1069,7 +1068,7 @@ } GaimConversationType -gaim_conversation_get_type(const struct gaim_conversation *conv) +gaim_conversation_get_type(const GaimConversation *conv) { if (conv == NULL) return GAIM_CONV_UNKNOWN; @@ -1078,8 +1077,8 @@ } void -gaim_conversation_set_ui_ops(struct gaim_conversation *conv, - struct gaim_conversation_ui_ops *ops) +gaim_conversation_set_ui_ops(GaimConversation *conv, + GaimConversationUiOps *ops) { if (conv == NULL || conv->ui_ops == ops) return; @@ -1092,8 +1091,8 @@ conv->ui_ops = ops; } -struct gaim_conversation_ui_ops * -gaim_conversation_get_ui_ops(struct gaim_conversation *conv) +GaimConversationUiOps * +gaim_conversation_get_ui_ops(const GaimConversation *conv) { if (conv == NULL) return NULL; @@ -1102,8 +1101,7 @@ } void -gaim_conversation_set_account(struct gaim_conversation *conv, - GaimAccount *account) +gaim_conversation_set_account(GaimConversation *conv, GaimAccount *account) { if (conv == NULL || account == gaim_conversation_get_account(conv)) return; @@ -1114,7 +1112,7 @@ } GaimAccount * -gaim_conversation_get_account(const struct gaim_conversation *conv) +gaim_conversation_get_account(const GaimConversation *conv) { if (conv == NULL) return NULL; @@ -1123,7 +1121,7 @@ } GaimConnection * -gaim_conversation_get_gc(const struct gaim_conversation *conv) +gaim_conversation_get_gc(const GaimConversation *conv) { GaimAccount *account; @@ -1139,9 +1137,9 @@ } void -gaim_conversation_set_title(struct gaim_conversation *conv, const char *title) +gaim_conversation_set_title(GaimConversation *conv, const char *title) { - struct gaim_conversation_ui_ops *ops; + GaimConversationUiOps *ops; if (conv == NULL || title == NULL) return; @@ -1158,7 +1156,7 @@ } const char * -gaim_conversation_get_title(const struct gaim_conversation *conv) +gaim_conversation_get_title(const GaimConversation *conv) { if (conv == NULL) return NULL; @@ -1167,7 +1165,7 @@ } void -gaim_conversation_autoset_title(struct gaim_conversation *conv) +gaim_conversation_autoset_title(GaimConversation *conv) { GaimAccount *account; struct buddy *b; @@ -1191,7 +1189,7 @@ } int -gaim_conversation_get_index(const struct gaim_conversation *conv) +gaim_conversation_get_index(const GaimConversation *conv) { if (conv == NULL) return 0; @@ -1200,8 +1198,7 @@ } void -gaim_conversation_set_unseen(struct gaim_conversation *conv, - GaimUnseenState state) +gaim_conversation_set_unseen(GaimConversation *conv, GaimUnseenState state) { if (conv == NULL) return; @@ -1212,23 +1209,23 @@ } void -gaim_conversation_foreach(void (*func)(struct gaim_conversation *conv)) +gaim_conversation_foreach(void (*func)(GaimConversation *conv)) { - struct gaim_conversation *conv; + GaimConversation *conv; GList *l; if (func == NULL) return; for (l = gaim_get_conversations(); l != NULL; l = l->next) { - conv = (struct gaim_conversation *)l->data; + conv = (GaimConversation *)l->data; func(conv); } } GaimUnseenState -gaim_conversation_get_unseen(const struct gaim_conversation *conv) +gaim_conversation_get_unseen(const GaimConversation *conv) { if (conv == NULL) return 0; @@ -1237,7 +1234,7 @@ } const char * -gaim_conversation_get_name(const struct gaim_conversation *conv) +gaim_conversation_get_name(const GaimConversation *conv) { if (conv == NULL) return NULL; @@ -1246,7 +1243,7 @@ } void -gaim_conversation_set_logging(struct gaim_conversation *conv, gboolean log) +gaim_conversation_set_logging(GaimConversation *conv, gboolean log) { if (conv == NULL) return; @@ -1257,7 +1254,7 @@ } gboolean -gaim_conversation_is_logging(const struct gaim_conversation *conv) +gaim_conversation_is_logging(const GaimConversation *conv) { if (conv == NULL) return FALSE; @@ -1266,7 +1263,7 @@ } GList * -gaim_conversation_get_send_history(const struct gaim_conversation *conv) +gaim_conversation_get_send_history(const GaimConversation *conv) { if (conv == NULL) return NULL; @@ -1275,8 +1272,7 @@ } void -gaim_conversation_set_history(struct gaim_conversation *conv, - GString *history) +gaim_conversation_set_history(GaimConversation *conv, GString *history) { if (conv == NULL) return; @@ -1285,7 +1281,7 @@ } GString * -gaim_conversation_get_history(const struct gaim_conversation *conv) +gaim_conversation_get_history(const GaimConversation *conv) { if (conv == NULL) return NULL; @@ -1293,8 +1289,8 @@ return conv->history; } -struct gaim_window * -gaim_conversation_get_window(const struct gaim_conversation *conv) +GaimWindow * +gaim_conversation_get_window(const GaimConversation *conv) { if (conv == NULL) return NULL; @@ -1302,8 +1298,8 @@ return conv->window; } -struct gaim_im * -gaim_conversation_get_im_data(const struct gaim_conversation *conv) +GaimIm * +gaim_conversation_get_im_data(const GaimConversation *conv) { if (conv == NULL) return NULL; @@ -1314,8 +1310,8 @@ return conv->u.im; } -struct gaim_chat * -gaim_conversation_get_chat_data(const struct gaim_conversation *conv) +GaimChat * +gaim_conversation_get_chat_data(const GaimConversation *conv) { if (conv == NULL) return NULL; @@ -1327,7 +1323,7 @@ } void -gaim_conversation_set_data(struct gaim_conversation *conv, const char *key, +gaim_conversation_set_data(GaimConversation *conv, const char *key, gpointer data) { if (conv == NULL || key == NULL) @@ -1337,7 +1333,7 @@ } gpointer -gaim_conversation_get_data(struct gaim_conversation *conv, const char *key) +gaim_conversation_get_data(GaimConversation *conv, const char *key) { if (conv == NULL || key == NULL) return NULL; @@ -1363,10 +1359,10 @@ return chats; } -struct gaim_conversation * +GaimConversation * gaim_find_conversation(const char *name) { - struct gaim_conversation *c = NULL; + GaimConversation *c = NULL; char *cuser; GList *cnv; @@ -1376,7 +1372,7 @@ cuser = g_strdup(normalize(name)); for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { - c = (struct gaim_conversation *)cnv->data; + c = (GaimConversation *)cnv->data; if (!gaim_utf8_strcasecmp(cuser, normalize(gaim_conversation_get_name(c)))) break; @@ -1389,10 +1385,11 @@ return c; } -struct gaim_conversation * -gaim_find_conversation_with_account(const char *name, const GaimAccount *account) +GaimConversation * +gaim_find_conversation_with_account(const char *name, + const GaimAccount *account) { - struct gaim_conversation *c = NULL; + GaimConversation *c = NULL; char *cuser; GList *cnv; @@ -1402,9 +1399,10 @@ cuser = g_strdup(normalize(name)); for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { - c = (struct gaim_conversation *)cnv->data; - - if (!gaim_utf8_strcasecmp(cuser, normalize(gaim_conversation_get_name(c))) && + c = (GaimConversation *)cnv->data; + + if (!gaim_utf8_strcasecmp(cuser, + normalize(gaim_conversation_get_name(c))) && account == gaim_conversation_get_account(c)) { break; @@ -1419,15 +1417,15 @@ } void -gaim_conversation_write(struct gaim_conversation *conv, const char *who, +gaim_conversation_write(GaimConversation *conv, const char *who, const char *message, size_t length, int flags, time_t mtime) { GaimPluginProtocolInfo *prpl_info = NULL; GaimConnection *gc; GaimAccount *account; - struct gaim_conversation_ui_ops *ops; - struct gaim_window *win; + GaimConversationUiOps *ops; + GaimWindow *win; struct buddy *b; GaimUnseenState unseen; /* int logging_font_options = 0; */ @@ -1517,10 +1515,9 @@ } void -gaim_conversation_update_progress(struct gaim_conversation *conv, - float percent) +gaim_conversation_update_progress(GaimConversation *conv, float percent) { - struct gaim_conversation_ui_ops *ops; + GaimConversationUiOps *ops; if (conv == NULL) return; @@ -1539,10 +1536,9 @@ } void -gaim_conversation_update(struct gaim_conversation *conv, - GaimConvUpdateType type) +gaim_conversation_update(GaimConversation *conv, GaimConvUpdateType type) { - struct gaim_conversation_ui_ops *ops; + GaimConversationUiOps *ops; if (conv == NULL) return; @@ -1556,8 +1552,8 @@ /************************************************************************** * IM Conversation API **************************************************************************/ -struct gaim_conversation * -gaim_im_get_conversation(struct gaim_im *im) +GaimConversation * +gaim_im_get_conversation(const GaimIm *im) { if (im == NULL) return NULL; @@ -1566,7 +1562,7 @@ } void -gaim_im_set_typing_state(struct gaim_im *im, int state) +gaim_im_set_typing_state(GaimIm *im, int state) { if (im == NULL) return; @@ -1575,7 +1571,7 @@ } int -gaim_im_get_typing_state(const struct gaim_im *im) +gaim_im_get_typing_state(const GaimIm *im) { if (im == NULL) return 0; @@ -1584,9 +1580,9 @@ } void -gaim_im_start_typing_timeout(struct gaim_im *im, int timeout) +gaim_im_start_typing_timeout(GaimIm *im, int timeout) { - struct gaim_conversation *conv; + GaimConversation *conv; const char *name; if (im == NULL) @@ -1603,7 +1599,7 @@ } void -gaim_im_stop_typing_timeout(struct gaim_im *im) +gaim_im_stop_typing_timeout(GaimIm *im) { if (im == NULL) return; @@ -1616,7 +1612,7 @@ } guint -gaim_im_get_typing_timeout(const struct gaim_im *im) +gaim_im_get_typing_timeout(const GaimIm *im) { if (im == NULL) return 0; @@ -1625,7 +1621,7 @@ } void -gaim_im_set_type_again(struct gaim_im *im, time_t val) +gaim_im_set_type_again(GaimIm *im, time_t val) { if (im == NULL) return; @@ -1634,7 +1630,7 @@ } time_t -gaim_im_get_type_again(const struct gaim_im *im) +gaim_im_get_type_again(const GaimIm *im) { if (im == NULL) return 0; @@ -1643,7 +1639,7 @@ } void -gaim_im_start_type_again_timeout(struct gaim_im *im) +gaim_im_start_type_again_timeout(GaimIm *im) { if (im == NULL) return; @@ -1653,7 +1649,7 @@ } void -gaim_im_stop_type_again_timeout(struct gaim_im *im) +gaim_im_stop_type_again_timeout(GaimIm *im) { if (im == NULL) return; @@ -1666,7 +1662,7 @@ } guint -gaim_im_get_type_again_timeout(const struct gaim_im *im) +gaim_im_get_type_again_timeout(const GaimIm *im) { if (im == NULL) return 0; @@ -1675,7 +1671,7 @@ } void -gaim_im_update_typing(struct gaim_im *im) +gaim_im_update_typing(GaimIm *im) { if (im == NULL) return; @@ -1685,10 +1681,10 @@ } void -gaim_im_write(struct gaim_im *im, const char *who, const char *message, +gaim_im_write(GaimIm *im, const char *who, const char *message, size_t len, int flags, time_t mtime) { - struct gaim_conversation *c; + GaimConversation *c; if (im == NULL || message == NULL) return; @@ -1703,7 +1699,7 @@ } void -gaim_im_send(struct gaim_im *im, const char *message) +gaim_im_send(GaimIm *im, const char *message) { if (im == NULL || message == NULL) return; @@ -1715,8 +1711,8 @@ * Chat Conversation API **************************************************************************/ -struct gaim_conversation * -gaim_chat_get_conversation(struct gaim_chat *chat) +GaimConversation * +gaim_chat_get_conversation(const GaimChat *chat) { if (chat == NULL) return NULL; @@ -1725,7 +1721,7 @@ } GList * -gaim_chat_set_users(struct gaim_chat *chat, GList *users) +gaim_chat_set_users(GaimChat *chat, GList *users) { if (chat == NULL) return NULL; @@ -1736,7 +1732,7 @@ } GList * -gaim_chat_get_users(const struct gaim_chat *chat) +gaim_chat_get_users(const GaimChat *chat) { if (chat == NULL) return NULL; @@ -1745,7 +1741,7 @@ } void -gaim_chat_ignore(struct gaim_chat *chat, const char *name) +gaim_chat_ignore(GaimChat *chat, const char *name) { if (chat == NULL || name == NULL) return; @@ -1759,7 +1755,7 @@ } void -gaim_chat_unignore(struct gaim_chat *chat, const char *name) +gaim_chat_unignore(GaimChat *chat, const char *name) { GList *item; @@ -1781,7 +1777,7 @@ } GList * -gaim_chat_set_ignored(struct gaim_chat *chat, GList *ignored) +gaim_chat_set_ignored(GaimChat *chat, GList *ignored) { if (chat == NULL) return NULL; @@ -1792,7 +1788,7 @@ } GList * -gaim_chat_get_ignored(const struct gaim_chat *chat) +gaim_chat_get_ignored(const GaimChat *chat) { if (chat == NULL) return NULL; @@ -1801,7 +1797,7 @@ } const char * -gaim_chat_get_ignored_user(const struct gaim_chat *chat, const char *user) +gaim_chat_get_ignored_user(const GaimChat *chat, const char *user) { GList *ignored; @@ -1831,7 +1827,7 @@ } gboolean -gaim_chat_is_user_ignored(const struct gaim_chat *chat, const char *user) +gaim_chat_is_user_ignored(const GaimChat *chat, const char *user) { if (chat == NULL || user == NULL) return FALSE; @@ -1840,7 +1836,7 @@ } void -gaim_chat_set_topic(struct gaim_chat *chat, const char *who, const char *topic) +gaim_chat_set_topic(GaimChat *chat, const char *who, const char *topic) { if (chat == NULL) return; @@ -1856,7 +1852,7 @@ } const char * -gaim_chat_get_topic(const struct gaim_chat *chat) +gaim_chat_get_topic(const GaimChat *chat) { if (chat == NULL) return NULL; @@ -1865,7 +1861,7 @@ } void -gaim_chat_set_id(struct gaim_chat *chat, int id) +gaim_chat_set_id(GaimChat *chat, int id) { if (chat == NULL) return; @@ -1874,7 +1870,7 @@ } int -gaim_chat_get_id(const struct gaim_chat *chat) +gaim_chat_get_id(const GaimChat *chat) { if (chat == NULL) return -1; @@ -1883,11 +1879,11 @@ } void -gaim_chat_write(struct gaim_chat *chat, const char *who, - const char *message, int flags, time_t mtime) +gaim_chat_write(GaimChat *chat, const char *who, const char *message, + int flags, time_t mtime) { GaimAccount *account; - struct gaim_conversation *conv; + GaimConversation *conv; GaimConnection *gc; if (chat == NULL || who == NULL || message == NULL) @@ -1929,7 +1925,7 @@ } void -gaim_chat_send(struct gaim_chat *chat, const char *message) +gaim_chat_send(GaimChat *chat, const char *message) { if (chat == NULL || message == NULL) return; @@ -1938,11 +1934,10 @@ } void -gaim_chat_add_user(struct gaim_chat *chat, const char *user, - const char *extra_msg) +gaim_chat_add_user(GaimChat *chat, const char *user, const char *extra_msg) { - struct gaim_conversation *conv; - struct gaim_conversation_ui_ops *ops; + GaimConversation *conv; + GaimConversationUiOps *ops; char tmp[BUF_LONG]; if (chat == NULL || user == NULL) @@ -1975,11 +1970,11 @@ } void -gaim_chat_rename_user(struct gaim_chat *chat, const char *old_user, +gaim_chat_rename_user(GaimChat *chat, const char *old_user, const char *new_user) { - struct gaim_conversation *conv; - struct gaim_conversation_ui_ops *ops; + GaimConversation *conv; + GaimConversationUiOps *ops; char tmp[BUF_LONG]; GList *names; @@ -2023,11 +2018,10 @@ } void -gaim_chat_remove_user(struct gaim_chat *chat, const char *user, - const char *reason) +gaim_chat_remove_user(GaimChat *chat, const char *user, const char *reason) { - struct gaim_conversation *conv; - struct gaim_conversation_ui_ops *ops; + GaimConversation *conv; + GaimConversationUiOps *ops; char tmp[BUF_LONG]; GList *names; @@ -2067,14 +2061,14 @@ } } -struct gaim_conversation * -gaim_find_chat(GaimConnection *gc, int id) +GaimConversation * +gaim_find_chat(const GaimConnection *gc, int id) { GList *l; - struct gaim_conversation *conv; + GaimConversation *conv; for (l = gaim_get_chats(); l != NULL; l = l->next) { - conv = (struct gaim_conversation *)l->data; + conv = (GaimConversation *)l->data; if (gaim_chat_get_id(GAIM_CHAT(conv)) == id && gaim_conversation_get_gc(conv) == gc) @@ -2089,9 +2083,9 @@ **************************************************************************/ /* This one places conversations in the last made window. */ static void -conv_placement_last_created_win(struct gaim_conversation *conv) +conv_placement_last_created_win(GaimConversation *conv) { - struct gaim_window *win; + GaimWindow *win; if (gaim_prefs_get_bool("/core/conversations/combine_chat_im")) win = g_list_last(gaim_get_windows())->data; @@ -2110,9 +2104,9 @@ /* This one places each conversation in its own window. */ static void -conv_placement_new_window(struct gaim_conversation *conv) +conv_placement_new_window(GaimConversation *conv) { - struct gaim_window *win; + GaimWindow *win; win = gaim_window_new(); @@ -2127,9 +2121,9 @@ * open windows will get a new window. */ static void -conv_placement_by_group(struct gaim_conversation *conv) +conv_placement_by_group(GaimConversation *conv) { - struct gaim_window *win; + GaimWindow *win; GaimConversationType type; type = gaim_conversation_get_type(conv); @@ -2155,18 +2149,18 @@ /* Go through the list of IMs and find one with this group. */ for (wins = gaim_get_windows(); wins != NULL; wins = wins->next) { - struct gaim_window *win2; - struct gaim_conversation *conv2; + GaimWindow *win2; + GaimConversation *conv2; struct buddy *b2; struct group *g2 = NULL; - win2 = (struct gaim_window *)wins->data; + win2 = (GaimWindow *)wins->data; for (convs = gaim_window_get_conversations(win2); convs != NULL; convs = convs->next) { - conv2 = (struct gaim_conversation *)convs->data; + conv2 = (GaimConversation *)convs->data; b2 = gaim_find_buddy(gaim_conversation_get_account(conv2), gaim_conversation_get_name(conv2)); @@ -2189,7 +2183,7 @@ /* This groups things by account. Otherwise, the same semantics as above */ static void -conv_placement_by_account(struct gaim_conversation *conv) +conv_placement_by_account(GaimConversation *conv) { GaimConversationType type; GList *wins, *convs; @@ -2202,16 +2196,16 @@ /* Go through the list of IMs and find one with this group. */ for (wins = gaim_get_windows(); wins != NULL; wins = wins->next) { - struct gaim_window *win2; - struct gaim_conversation *conv2; - - win2 = (struct gaim_window *)wins->data; + GaimWindow *win2; + GaimConversation *conv2; + + win2 = (GaimWindow *)wins->data; for (convs = gaim_window_get_conversations(win2); convs != NULL; convs = convs->next) { - conv2 = (struct gaim_conversation *)convs->data; + conv2 = (GaimConversation *)convs->data; if ((gaim_prefs_get_bool("/core/conversations/combine_chat_im") || type == gaim_conversation_get_type(conv2)) && @@ -2229,11 +2223,11 @@ } static int -add_conv_placement_fnc(const char *name, gaim_conv_placement_fnc fnc) +add_conv_placement_fnc(const char *name, GaimConvPlacementFunc fnc) { - struct ConvPlacementData *data; - - data = g_malloc0(sizeof(struct ConvPlacementData)); + ConvPlacementData *data; + + data = g_malloc0(sizeof(ConvPlacementData)); data->name = g_strdup(name); data->fnc = fnc; @@ -2259,7 +2253,7 @@ } int -gaim_conv_placement_add_fnc(const char *name, gaim_conv_placement_fnc fnc) +gaim_conv_placement_add_fnc(const char *name, GaimConvPlacementFunc fnc) { if (name == NULL || fnc == NULL) return -1; @@ -2273,14 +2267,14 @@ void gaim_conv_placement_remove_fnc(int index) { - struct ConvPlacementData *data; + ConvPlacementData *data; GList *node; if (index < 0 || index > g_list_length(conv_placement_fncs)) return; node = g_list_nth(conv_placement_fncs, index); - data = (struct ConvPlacementData *)node->data; + data = (ConvPlacementData *)node->data; g_free(data->name); g_free(data); @@ -2300,7 +2294,7 @@ const char * gaim_conv_placement_get_name(int index) { - struct ConvPlacementData *data; + ConvPlacementData *data; ensure_default_funcs(); @@ -2315,10 +2309,10 @@ return data->name; } -gaim_conv_placement_fnc +GaimConvPlacementFunc gaim_conv_placement_get_fnc(int index) { - struct ConvPlacementData *data; + ConvPlacementData *data; ensure_default_funcs(); @@ -2334,9 +2328,9 @@ } int -gaim_conv_placement_get_fnc_index(gaim_conv_placement_fnc fnc) +gaim_conv_placement_get_fnc_index(GaimConvPlacementFunc fnc) { - struct ConvPlacementData *data; + ConvPlacementData *data; GList *node; int i; @@ -2346,7 +2340,7 @@ node != NULL; node = node->next, i++) { - data = (struct ConvPlacementData *)node->data; + data = (ConvPlacementData *)node->data; if (data->fnc == fnc) return i; @@ -2364,7 +2358,7 @@ void gaim_conv_placement_set_active(int index) { - gaim_conv_placement_fnc fnc; + GaimConvPlacementFunc fnc; ensure_default_funcs(); @@ -2378,12 +2372,12 @@ } void -gaim_set_win_ui_ops(struct gaim_window_ui_ops *ops) +gaim_set_win_ui_ops(GaimWindowUiOps *ops) { win_ui_ops = ops; } -struct gaim_window_ui_ops * +GaimWindowUiOps * gaim_get_win_ui_ops(void) { return win_ui_ops;
--- a/src/conversation.h Mon Jun 02 21:14:50 2003 +0000 +++ b/src/conversation.h Mon Jun 02 21:51:06 2003 +0000 @@ -28,14 +28,15 @@ /** Data Structures */ /**************************************************************************/ -typedef enum _GaimConversationType GaimConversationType; -typedef enum _GaimUnseenState GaimUnseenState; -typedef enum _GaimConvUpdateType GaimConvUpdateType; -struct gaim_window_ui_ops; -struct gaim_window; -struct gaim_conversation; -struct gaim_im; -struct gaim_chat; +typedef enum _GaimConversationType GaimConversationType; +typedef enum _GaimUnseenState GaimUnseenState; +typedef enum _GaimConvUpdateType GaimConvUpdateType; +typedef struct _GaimWindowUiOps GaimWindowUiOps; +typedef struct _GaimWindow GaimWindow; +typedef struct _GaimConversationUiOps GaimConversationUiOps; +typedef struct _GaimConversation GaimConversation; +typedef struct _GaimIm GaimIm; +typedef struct _GaimChat GaimChat; /** * A type of conversation. @@ -90,80 +91,76 @@ * Conversation window operations. * * Any UI representing a window must assign a filled-out gaim_window_ops - * structure to the gaim_window. + * structure to the GaimWindow. */ -struct gaim_window_ui_ops +struct _GaimWindowUiOps { - struct gaim_conversation_ui_ops *(*get_conversation_ui_ops)(void); + GaimConversationUiOps *(*get_conversation_ui_ops)(void); - void (*new_window)(struct gaim_window *win); - void (*destroy_window)(struct gaim_window *win); + void (*new_window)(GaimWindow *win); + void (*destroy_window)(GaimWindow *win); - void (*show)(struct gaim_window *win); - void (*hide)(struct gaim_window *win); - void (*raise)(struct gaim_window *win); - void (*flash)(struct gaim_window *win); + void (*show)(GaimWindow *win); + void (*hide)(GaimWindow *win); + void (*raise)(GaimWindow *win); + void (*flash)(GaimWindow *win); - void (*switch_conversation)(struct gaim_window *win, unsigned int index); - void (*add_conversation)(struct gaim_window *win, - struct gaim_conversation *conv); - void (*remove_conversation)(struct gaim_window *win, - struct gaim_conversation *conv); - void (*move_conversation)(struct gaim_window *win, - struct gaim_conversation *conv, + void (*switch_conversation)(GaimWindow *win, unsigned int index); + void (*add_conversation)(GaimWindow *win, GaimConversation *conv); + void (*remove_conversation)(GaimWindow *win, GaimConversation *conv); + void (*move_conversation)(GaimWindow *win, GaimConversation *conv, unsigned int newIndex); - int (*get_active_index)(const struct gaim_window *win); + int (*get_active_index)(const GaimWindow *win); }; /** * Conversation operations and events. * * Any UI representing a conversation must assign a filled-out - * gaim_conversation_ui_ops structure to the gaim_conversation. + * GaimConversationUiOps structure to the GaimConversation. */ -struct gaim_conversation_ui_ops +struct _GaimConversationUiOps { - void (*destroy_conversation)(struct gaim_conversation *conv); - void (*write_chat)(struct gaim_conversation *conv, const char *who, + void (*destroy_conversation)(GaimConversation *conv); + void (*write_chat)(GaimConversation *conv, const char *who, const char *message, int flags, time_t mtime); - void (*write_im)(struct gaim_conversation *conv, const char *who, + void (*write_im)(GaimConversation *conv, const char *who, const char *message, size_t len, int flags, time_t mtime); - void (*write_conv)(struct gaim_conversation *conv, const char *who, + void (*write_conv)(GaimConversation *conv, const char *who, const char *message, size_t length, int flags, time_t mtime); - void (*chat_add_user)(struct gaim_conversation *conv, const char *user); - void (*chat_rename_user)(struct gaim_conversation *conv, + void (*chat_add_user)(GaimConversation *conv, const char *user); + void (*chat_rename_user)(GaimConversation *conv, const char *old_name, const char *new_name); - void (*chat_remove_user)(struct gaim_conversation *conv, const char *user); + void (*chat_remove_user)(GaimConversation *conv, const char *user); - void (*set_title)(struct gaim_conversation *conv, - const char *title); - void (*update_progress)(struct gaim_conversation *conv, float percent); + void (*set_title)(GaimConversation *conv, const char *title); + void (*update_progress)(GaimConversation *conv, float percent); /* Events */ - void (*updated)(struct gaim_conversation *conv, GaimConvUpdateType type); + void (*updated)(GaimConversation *conv, GaimConvUpdateType type); }; /** * A core representation of a graphical window containing one or more * conversations. */ -struct gaim_window +struct _GaimWindow { GList *conversations; /**< The conversations in the window. */ size_t conversation_count; /**< The number of conversations. */ - struct gaim_window_ui_ops *ui_ops; /**< UI-specific window operations. */ + GaimWindowUiOps *ui_ops; /**< UI-specific window operations. */ void *ui_data; /**< UI-specific data. */ }; /** * Data specific to Instant Messages. */ -struct gaim_im +struct _GaimIm { - struct gaim_conversation *conv; /**< The parent conversation. */ + GaimConversation *conv; /**< The parent conversation. */ int typing_state; /**< The current typing state. */ guint typing_timeout; /**< The typing timer handle. */ @@ -176,9 +173,9 @@ /** * Data specific to Chats. */ -struct gaim_chat +struct _GaimChat { - struct gaim_conversation *conv; /**< The parent conversation. */ + GaimConversation *conv; /**< The parent conversation. */ GList *in_room; /**< The users in the room. */ GList *ignored; /**< Ignored users. */ @@ -191,14 +188,14 @@ * A core representation of a conversation between two or more people. * * The conversation can be an IM or a chat. Each conversation is kept - * in a gaim_window and has a UI representation. + * in a GaimWindow and has a UI representation. */ -struct gaim_conversation +struct _GaimConversation { GaimConversationType type; /**< The type of conversation. */ - GaimAccount *account; /**< The user using this conversation. */ - struct gaim_window *window; /**< The parent window. */ + GaimAccount *account; /**< The user using this conversation. */ + GaimWindow *window; /**< The parent window. */ int conversation_pos; /**< The position in the window's list. */ @@ -214,19 +211,19 @@ union { - struct gaim_im *im; /**< IM-specific data. */ - struct gaim_chat *chat; /**< Chat-specific data. */ + GaimIm *im; /**< IM-specific data. */ + GaimChat *chat; /**< Chat-specific data. */ void *misc; /**< Misc. data. */ } u; - struct gaim_conversation_ui_ops *ui_ops; /**< UI-specific operations. */ + GaimConversationUiOps *ui_ops; /**< UI-specific operations. */ void *ui_data; /**< UI-specific data. */ - GHashTable *data; /**< Plugin-specific data. */ + GHashTable *data; /**< Plugin-specific data. */ }; -typedef void (*gaim_conv_placement_fnc)(struct gaim_conversation *); +typedef void (*GaimConvPlacementFunc)(GaimConversation *); /**************************************************************************/ /** @name Conversation Window API */ @@ -241,42 +238,42 @@ * * @return The new conversation window. */ -struct gaim_window *gaim_window_new(void); +GaimWindow *gaim_window_new(void); /** * Destroys the specified conversation window and all conversations in it. * * @param win The window to destroy. */ -void gaim_window_destroy(struct gaim_window *win); +void gaim_window_destroy(GaimWindow *win); /** * Shows the specified conversation window. * * @param win The window. */ -void gaim_window_show(struct gaim_window *win); +void gaim_window_show(GaimWindow *win); /** * Hides the specified conversation window. * * @param win The window. */ -void gaim_window_hide(struct gaim_window *win); +void gaim_window_hide(GaimWindow *win); /** * Raises the specified conversation window. * * @param win The window. */ -void gaim_window_raise(struct gaim_window *win); +void gaim_window_raise(GaimWindow *win); /** * Causes the window to flash for IM notification, if the UI supports this. * * @param win The window. */ -void gaim_window_flash(struct gaim_window *win); +void gaim_window_flash(GaimWindow *win); /** * Sets the specified window's UI window operations structure. @@ -284,8 +281,7 @@ * @param win The window. * @param ops The UI window operations structure. */ -void gaim_window_set_ui_ops(struct gaim_window *win, - struct gaim_window_ui_ops *ops); +void gaim_window_set_ui_ops(GaimWindow *win, GaimWindowUiOps *ops); /** * Returns the specified window's UI window operations structure. @@ -294,8 +290,7 @@ * * @return The UI window operations structure. */ -struct gaim_window_ui_ops *gaim_window_get_ui_ops( - const struct gaim_window *win); +GaimWindowUiOps *gaim_window_get_ui_ops(const GaimWindow *win); /** * Adds a conversation to this window. @@ -307,8 +302,7 @@ * * @return The new index of the conversation in the window. */ -int gaim_window_add_conversation(struct gaim_window *win, - struct gaim_conversation *conv); +int gaim_window_add_conversation(GaimWindow *win, GaimConversation *conv); /** * Removes the conversation at the specified index from the window. @@ -320,8 +314,8 @@ * * @return The conversation removed. */ -struct gaim_conversation *gaim_window_remove_conversation( - struct gaim_window *win, unsigned int index); +GaimConversation *gaim_window_remove_conversation(GaimWindow *win, + unsigned int index); /** * Moves the conversation at the specified index in a window to a new index. @@ -330,8 +324,8 @@ * @param index The index of the conversation to move. * @param new_index The new index. */ -void gaim_window_move_conversation(struct gaim_window *win, - unsigned int index, unsigned int new_index); +void gaim_window_move_conversation(GaimWindow *win, unsigned int index, + unsigned int new_index); /** * Returns the conversation in the window at the specified index. @@ -343,8 +337,8 @@ * * @return The conversation at the specified index. */ -struct gaim_conversation *gaim_window_get_conversation_at( - const struct gaim_window *win, unsigned int index); +GaimConversation *gaim_window_get_conversation_at(const GaimWindow *win, + unsigned int index); /** * Returns the number of conversations in the window. @@ -353,7 +347,7 @@ * * @return The number of conversations. */ -size_t gaim_window_get_conversation_count(const struct gaim_window *win); +size_t gaim_window_get_conversation_count(const GaimWindow *win); /** * Switches the active conversation to the one at the specified index. @@ -363,8 +357,7 @@ * @param win The window. * @param index The new index. */ -void gaim_window_switch_conversation(struct gaim_window *win, - unsigned int index); +void gaim_window_switch_conversation(GaimWindow *win, unsigned int index); /** * Returns the active conversation in the window. @@ -373,8 +366,7 @@ * * @return The active conversation. */ -struct gaim_conversation *gaim_window_get_active_conversation( - const struct gaim_window *win); +GaimConversation *gaim_window_get_active_conversation(const GaimWindow *win); /** * Returns the list of conversations in the specified window. @@ -383,7 +375,7 @@ * * @return The list of conversations. */ -GList *gaim_window_get_conversations(const struct gaim_window *win); +GList *gaim_window_get_conversations(const GaimWindow *win); /** * Returns a list of all windows. @@ -399,7 +391,7 @@ * * @return The window if found, or @c NULL if not found. */ -struct gaim_window *gaim_get_first_window_with_type(GaimConversationType type); +GaimWindow *gaim_get_first_window_with_type(GaimConversationType type); /** * Returns the last window containing a conversation of the specified type. @@ -408,7 +400,7 @@ * * @return The window if found, or @c NULL if not found. */ -struct gaim_window *gaim_get_last_window_with_type(GaimConversationType type); +GaimWindow *gaim_get_last_window_with_type(GaimConversationType type); /*@}*/ @@ -427,9 +419,9 @@ * * @return The new conversation. */ -struct gaim_conversation *gaim_conversation_new(GaimConversationType type, - GaimAccount *account, - const char *name); +GaimConversation *gaim_conversation_new(GaimConversationType type, + GaimAccount *account, + const char *name); /** * Destroys the specified conversation and removes it from the parent @@ -440,7 +432,7 @@ * * @param conv The conversation to destroy. */ -void gaim_conversation_destroy(struct gaim_conversation *conv); +void gaim_conversation_destroy(GaimConversation *conv); /** * Returns the specified conversation's type. @@ -449,8 +441,7 @@ * * @return The conversation's type. */ -GaimConversationType gaim_conversation_get_type( - const struct gaim_conversation *conv); +GaimConversationType gaim_conversation_get_type(const GaimConversation *conv); /** * Sets the specified conversation's UI operations structure. @@ -458,8 +449,8 @@ * @param conv The conversation. * @param ops The UI conversation operations structure. */ -void gaim_conversation_set_ui_ops(struct gaim_conversation *conv, - struct gaim_conversation_ui_ops *ops); +void gaim_conversation_set_ui_ops(GaimConversation *conv, + GaimConversationUiOps *ops); /** * Returns the specified conversation's UI operations structure. @@ -468,8 +459,8 @@ * * @return The operations structure. */ -struct gaim_conversation_ui_ops *gaim_conversation_get_ui_ops( - struct gaim_conversation *conv); +GaimConversationUiOps *gaim_conversation_get_ui_ops( + const GaimConversation *conv); /** * Sets the specified conversation's gaim_account. @@ -480,8 +471,8 @@ * @param conv The conversation. * @param account The gaim_account. */ -void gaim_conversation_set_account(struct gaim_conversation *conv, - GaimAccount *account); +void gaim_conversation_set_account(GaimConversation *conv, + GaimAccount *account); /** * Returns the specified conversation's gaim_account. @@ -493,8 +484,7 @@ * * @return The conversation's gaim_account. */ -GaimAccount *gaim_conversation_get_account( - const struct gaim_conversation *conv); +GaimAccount *gaim_conversation_get_account(const GaimConversation *conv); /** * Returns the specified conversation's gaim_connection. @@ -505,8 +495,7 @@ * * @return The conversation's gaim_connection. */ -GaimConnection *gaim_conversation_get_gc( - const struct gaim_conversation *conv); +GaimConnection *gaim_conversation_get_gc(const GaimConversation *conv); /** * Sets the specified conversation's title. @@ -514,8 +503,7 @@ * @param conv The conversation. * @param title The title. */ -void gaim_conversation_set_title(struct gaim_conversation *conv, - const char *title); +void gaim_conversation_set_title(GaimConversation *conv, const char *title); /** * Returns the specified conversation's title. @@ -524,7 +512,7 @@ * * @return The title. */ -const char *gaim_conversation_get_title(const struct gaim_conversation *conv); +const char *gaim_conversation_get_title(const GaimConversation *conv); /** * Automatically sets the specified conversation's title. @@ -534,7 +522,7 @@ * * @param conv The conversation. */ -void gaim_conversation_autoset_title(struct gaim_conversation *conv); +void gaim_conversation_autoset_title(GaimConversation *conv); /** * Returns the specified conversation's index in the parent window. @@ -543,7 +531,7 @@ * * @return The current index in the parent window. */ -int gaim_conversation_get_index(const struct gaim_conversation *conv); +int gaim_conversation_get_index(const GaimConversation *conv); /** * Sets the conversation's unseen state. @@ -551,7 +539,7 @@ * @param conv The conversation. * @param state The new unseen state. */ -void gaim_conversation_set_unseen(struct gaim_conversation *conv, +void gaim_conversation_set_unseen(GaimConversation *conv, GaimUnseenState state); /** @@ -561,8 +549,7 @@ * * @param The conversation's unseen state. */ -GaimUnseenState gaim_conversation_get_unseen( - const struct gaim_conversation *conv); +GaimUnseenState gaim_conversation_get_unseen(const GaimConversation *conv); /** * Returns the specified conversation's name. @@ -571,22 +558,21 @@ * * @return The conversation's name. */ -const char *gaim_conversation_get_name(const struct gaim_conversation *conv); +const char *gaim_conversation_get_name(const GaimConversation *conv); /** * Enables or disables logging for this conversation. * * @param log @c TRUE if logging should be enabled, or @c FALSE otherwise. */ -void gaim_conversation_set_logging(struct gaim_conversation *conv, - gboolean log); +void gaim_conversation_set_logging(GaimConversation *conv, gboolean log); /** * Returns whether or not logging is enabled for this conversation. * * @return @c TRUE if logging is enabled, or @c FALSE otherwise. */ -gboolean gaim_conversation_is_logging(const struct gaim_conversation *conv); +gboolean gaim_conversation_is_logging(const GaimConversation *conv); /** * Returns the specified conversation's send history. @@ -595,8 +581,7 @@ * * @return The conversation's send history. */ -GList *gaim_conversation_get_send_history( - const struct gaim_conversation *conv); +GList *gaim_conversation_get_send_history(const GaimConversation *conv); /** * Sets the specified conversation's history. @@ -604,8 +589,7 @@ * @param conv The conversation. * @param history The history. */ -void gaim_conversation_set_history(struct gaim_conversation *conv, - GString *history); +void gaim_conversation_set_history(GaimConversation *conv, GString *history); /** * Returns the specified conversation's history. @@ -614,7 +598,7 @@ * * @return The conversation's history. */ -GString *gaim_conversation_get_history(const struct gaim_conversation *conv); +GString *gaim_conversation_get_history(const GaimConversation *conv); /** * Returns the specified conversation's parent window. @@ -623,8 +607,7 @@ * * @return The conversation's parent window. */ -struct gaim_window *gaim_conversation_get_window( - const struct gaim_conversation *conv); +GaimWindow *gaim_conversation_get_window(const GaimConversation *conv); /** * Returns the specified conversation's IM-specific data. @@ -635,8 +618,7 @@ * * @return The IM-specific data. */ -struct gaim_im *gaim_conversation_get_im_data( - const struct gaim_conversation *conv); +GaimIm *gaim_conversation_get_im_data(const GaimConversation *conv); #define GAIM_IM(c) (gaim_conversation_get_im_data(c)) @@ -649,8 +631,7 @@ * * @return The chat-specific data. */ -struct gaim_chat *gaim_conversation_get_chat_data( - const struct gaim_conversation *conv); +GaimChat *gaim_conversation_get_chat_data(const GaimConversation *conv); #define GAIM_CHAT(c) (gaim_conversation_get_chat_data(c)) @@ -661,8 +642,8 @@ * @param key The unique key. * @param data The data to assign. */ -void gaim_conversation_set_data(struct gaim_conversation *conv, - const char *key, gpointer data); +void gaim_conversation_set_data(GaimConversation *conv, const char *key, + gpointer data); /** * Returns extra data in a conversation. @@ -672,8 +653,7 @@ * * @return The data associated with the key. */ -gpointer gaim_conversation_get_data(struct gaim_conversation *conv, - const char *key); +gpointer gaim_conversation_get_data(GaimConversation *conv, const char *key); /** * Returns a list of all conversations. @@ -705,7 +685,7 @@ * * @return The conversation if found, or @c NULL otherwise. */ -struct gaim_conversation *gaim_find_conversation(const char *name); +GaimConversation *gaim_find_conversation(const char *name); /** * Finds a conversation with the specified name and user. @@ -715,7 +695,7 @@ * * @return The conversation if found, or @c NULL otherwise. */ -struct gaim_conversation *gaim_find_conversation_with_account( +GaimConversation *gaim_find_conversation_with_account( const char *name, const GaimAccount *account); /** @@ -739,7 +719,7 @@ * @see gaim_im_write() * @see gaim_chat_write() */ -void gaim_conversation_write(struct gaim_conversation *conv, const char *who, +void gaim_conversation_write(GaimConversation *conv, const char *who, const char *message, size_t length, int flags, time_t mtime); @@ -752,8 +732,7 @@ * @param conv The conversation. * @param percent The percentage. */ -void gaim_conversation_update_progress(struct gaim_conversation *conv, - float percent); +void gaim_conversation_update_progress(GaimConversation *conv, float percent); /** * Updates the visual status and UI of a conversation. @@ -761,15 +740,14 @@ * @param conv The conversation. * @param type The update type. */ -void gaim_conversation_update(struct gaim_conversation *conv, - GaimConvUpdateType type); +void gaim_conversation_update(GaimConversation *conv, GaimConvUpdateType type); /** * Calls a function on each conversation. * * @param func The function. */ -void gaim_conversation_foreach(void (*func)(struct gaim_conversation *conv)); +void gaim_conversation_foreach(void (*func)(GaimConversation *conv)); /*@}*/ @@ -786,7 +764,7 @@ * * @return The parent conversation. */ -struct gaim_conversation *gaim_im_get_conversation(struct gaim_im *im); +GaimConversation *gaim_im_get_conversation(const GaimIm *im); /** * Sets the IM's typing state. @@ -794,7 +772,7 @@ * @param im The IM. * @param state The typing state. */ -void gaim_im_set_typing_state(struct gaim_im *im, int state); +void gaim_im_set_typing_state(GaimIm *im, int state); /** * Returns the IM's typing state. @@ -803,7 +781,7 @@ * * @return The IM's typing state. */ -int gaim_im_get_typing_state(const struct gaim_im *im); +int gaim_im_get_typing_state(const GaimIm *im); /** * Starts the IM's typing timeout. @@ -811,14 +789,14 @@ * @param im The IM. * @param timeout The timeout. */ -void gaim_im_start_typing_timeout(struct gaim_im *im, int timeout); +void gaim_im_start_typing_timeout(GaimIm *im, int timeout); /** * Stops the IM's typing timeout. * * @param im The IM. */ -void gaim_im_stop_typing_timeout(struct gaim_im *im); +void gaim_im_stop_typing_timeout(GaimIm *im); /** * Returns the IM's typing timeout. @@ -827,7 +805,7 @@ * * @return The timeout. */ -guint gaim_im_get_typing_timeout(const struct gaim_im *im); +guint gaim_im_get_typing_timeout(const GaimIm *im); /** * Sets the IM's time until it should send another typing notification. @@ -835,7 +813,7 @@ * @param im The IM. * @param val The time. */ -void gaim_im_set_type_again(struct gaim_im *im, time_t val); +void gaim_im_set_type_again(GaimIm *im, time_t val); /** * Returns the IM's time until it should send another typing notification. @@ -844,21 +822,21 @@ * * @return The time. */ -time_t gaim_im_get_type_again(const struct gaim_im *im); +time_t gaim_im_get_type_again(const GaimIm *im); /** * Starts the IM's type again timeout. * * @param im The IM. */ -void gaim_im_start_type_again_timeout(struct gaim_im *im); +void gaim_im_start_type_again_timeout(GaimIm *im); /** * Stops the IM's type again timeout. * * @param im The IM. */ -void gaim_im_stop_type_again_timeout(struct gaim_im *im); +void gaim_im_stop_type_again_timeout(GaimIm *im); /** * Returns the IM's type again timeout interval. @@ -867,14 +845,14 @@ * * @return The type again timeout interval. */ -guint gaim_im_get_type_again_timeout(const struct gaim_im *im); +guint gaim_im_get_type_again_timeout(const GaimIm *im); /** * Updates the visual typing notification for an IM conversation. * * @param im The IM. */ -void gaim_im_update_typing(struct gaim_im *im); +void gaim_im_update_typing(GaimIm *im); /** * Writes to an IM. @@ -890,7 +868,7 @@ * @param flag The flags. * @param mtime The time the message was sent. */ -void gaim_im_write(struct gaim_im *im, const char *who, +void gaim_im_write(GaimIm *im, const char *who, const char *message, size_t len, int flag, time_t mtime); /** @@ -899,7 +877,7 @@ * @param im The IM. * @param message The message to send. */ -void gaim_im_send(struct gaim_im *im, const char *message); +void gaim_im_send(GaimIm *im, const char *message); /*@}*/ @@ -916,7 +894,7 @@ * * @return The parent conversation. */ -struct gaim_conversation *gaim_chat_get_conversation(struct gaim_chat *chat); +GaimConversation *gaim_chat_get_conversation(const GaimChat *chat); /** * Sets the list of users in the chat room. @@ -926,7 +904,7 @@ * * @return The list passed. */ -GList *gaim_chat_set_users(struct gaim_chat *chat, GList *users); +GList *gaim_chat_set_users(GaimChat *chat, GList *users); /** * Returns a list of users in the chat room. @@ -935,7 +913,7 @@ * * @return The list of users. */ -GList *gaim_chat_get_users(const struct gaim_chat *chat); +GList *gaim_chat_get_users(const GaimChat *chat); /** * Ignores a user in a chat room. @@ -943,7 +921,7 @@ * @param chat The chat. * @param name The name of the user. */ -void gaim_chat_ignore(struct gaim_chat *chat, const char *name); +void gaim_chat_ignore(GaimChat *chat, const char *name); /** * Unignores a user in a chat room. @@ -951,7 +929,7 @@ * @param chat The chat. * @param name The name of the user. */ -void gaim_chat_unignore(struct gaim_chat *chat, const char *name); +void gaim_chat_unignore(GaimChat *chat, const char *name); /** * Sets the list of ignored users in the chat room. @@ -961,7 +939,7 @@ * * @return The list passed. */ -GList *gaim_chat_set_ignored(struct gaim_chat *chat, GList *ignored); +GList *gaim_chat_set_ignored(GaimChat *chat, GList *ignored); /** * Returns the list of ignored users in the chat room. @@ -970,7 +948,7 @@ * * @return The list of ignored users. */ -GList *gaim_chat_get_ignored(const struct gaim_chat *chat); +GList *gaim_chat_get_ignored(const GaimChat *chat); /** * Returns the actual name of the specified ignored user, if it exists in @@ -986,7 +964,7 @@ * @return The ignored user if found, complete with prefixes, or @c NULL * if not found. */ -const char *gaim_chat_get_ignored_user(const struct gaim_chat *chat, +const char *gaim_chat_get_ignored_user(const GaimChat *chat, const char *user); /** @@ -997,7 +975,7 @@ * * @return @c TRUE if the user is in the ignore list; @c FALSE otherwise. */ -gboolean gaim_chat_is_user_ignored(const struct gaim_chat *chat, +gboolean gaim_chat_is_user_ignored(const GaimChat *chat, const char *user); /** @@ -1007,7 +985,7 @@ * @param who The user that set the topic. * @param topic The topic. */ -void gaim_chat_set_topic(struct gaim_chat *chat, const char *who, +void gaim_chat_set_topic(GaimChat *chat, const char *who, const char *topic); /** @@ -1017,7 +995,7 @@ * * @return The chat's topic. */ -const char *gaim_chat_get_topic(const struct gaim_chat *chat); +const char *gaim_chat_get_topic(const GaimChat *chat); /** * Sets the chat room's ID. @@ -1025,7 +1003,7 @@ * @param chat The chat. * @param id The ID. */ -void gaim_chat_set_id(struct gaim_chat *chat, int id); +void gaim_chat_set_id(GaimChat *chat, int id); /** * Returns the chat room's ID. @@ -1034,7 +1012,7 @@ * * @return The ID. */ -int gaim_chat_get_id(const struct gaim_chat *chat); +int gaim_chat_get_id(const GaimChat *chat); /** * Writes to a chat. @@ -1045,7 +1023,7 @@ * @param flag The flags. * @param mtime The time the message was sent. */ -void gaim_chat_write(struct gaim_chat *chat, const char *who, +void gaim_chat_write(GaimChat *chat, const char *who, const char *message, int flag, time_t mtime); /** @@ -1054,7 +1032,7 @@ * @param chat The chat. * @param message The message to send. */ -void gaim_chat_send(struct gaim_chat *chat, const char *message); +void gaim_chat_send(GaimChat *chat, const char *message); /** * Adds a user to a chat. @@ -1063,7 +1041,7 @@ * @param user The user to add. * @param extra_msg An extra message to display with the join message. */ -void gaim_chat_add_user(struct gaim_chat *chat, const char *user, +void gaim_chat_add_user(GaimChat *chat, const char *user, const char *extra_msg); /** @@ -1073,7 +1051,7 @@ * @param old_user The old username. * @param new_user The new username. */ -void gaim_chat_rename_user(struct gaim_chat *chat, const char *old_user, +void gaim_chat_rename_user(GaimChat *chat, const char *old_user, const char *new_user); /** @@ -1083,7 +1061,7 @@ * @param user The user that is being removed. * @param reason The optional reason given for the removal. Can be @c NULL. */ -void gaim_chat_remove_user(struct gaim_chat *chat, const char *user, +void gaim_chat_remove_user(GaimChat *chat, const char *user, const char *reason); /** @@ -1094,7 +1072,7 @@ * * @return The chat conversation. */ -struct gaim_conversation *gaim_find_chat(GaimConnection *gc, int id); +GaimConversation *gaim_find_chat(const GaimConnection *gc, int id); /*@}*/ @@ -1111,7 +1089,7 @@ * * @return The index of this entry. */ -int gaim_conv_placement_add_fnc(const char *name, gaim_conv_placement_fnc fnc); +int gaim_conv_placement_add_fnc(const char *name, GaimConvPlacementFunc fnc); /** * Removes a conversation placement function from the list of possible @@ -1147,7 +1125,7 @@ * * @return A pointer to the function. */ -gaim_conv_placement_fnc gaim_conv_placement_get_fnc(int index); +GaimConvPlacementFunc gaim_conv_placement_get_fnc(int index); /** * Returns the index of the specified conversation placement function. @@ -1157,7 +1135,7 @@ * @return The index of the conversation, or -1 if the function is not * registered. */ -int gaim_conv_placement_get_fnc_index(gaim_conv_placement_fnc fnc); +int gaim_conv_placement_get_fnc_index(GaimConvPlacementFunc fnc); /** * Returns the index of the active conversation placement function. @@ -1186,15 +1164,15 @@ * * @param ops The UI operations structure. */ -void gaim_set_win_ui_ops(struct gaim_window_ui_ops *ops); +void gaim_set_win_ui_ops(GaimWindowUiOps *ops); /** * Returns the gaim window UI operations structure to be used in * new windows. * - * @return A filled-out gaim_window_ui_ops structure. + * @return A filled-out GaimWindowUiOps structure. */ -struct gaim_window_ui_ops *gaim_get_win_ui_ops(void); +GaimWindowUiOps *gaim_get_win_ui_ops(void); /*@}*/
--- a/src/core.h Mon Jun 02 21:14:50 2003 +0000 +++ b/src/core.h Mon Jun 02 21:51:06 2003 +0000 @@ -128,7 +128,7 @@ extern void serv_got_typing_stopped(GaimConnection *, const char *); extern void serv_got_eviled(GaimConnection *, const char *, int); extern void serv_got_chat_invite(GaimConnection *, const char *, const char *, const char *, GHashTable *); -extern struct gaim_conversation *serv_got_joined_chat(GaimConnection *, int, const char *); +extern GaimConversation *serv_got_joined_chat(GaimConnection *, int, const char *); extern void serv_got_chat_left(GaimConnection *, int); extern void serv_got_chat_in(GaimConnection *, int, char *, int, char *, time_t); extern void serv_got_alias(GaimConnection *, const char *, const char *);
--- a/src/dialogs.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/dialogs.c Mon Jun 02 21:51:06 2003 +0000 @@ -208,7 +208,7 @@ GtkWidget *text; GtkWidget *toggle; GtkWidget *entry; - struct gaim_conversation *c; + GaimConversation *c; }; struct passwddlg { @@ -247,9 +247,9 @@ /* Destroys */ /*------------------------------------------------------------------------*/ -static gint delete_event_dialog(GtkWidget *w, GdkEventAny *e, struct gaim_conversation *c) +static gint delete_event_dialog(GtkWidget *w, GdkEventAny *e, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gchar *object_data; object_data = g_object_get_data(G_OBJECT(w), "dialog_type"); @@ -352,7 +352,7 @@ GtkWidget *hbox, *vbox; GtkWidget *label; GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); - struct gaim_conversation *c = gaim_find_conversation(who); + GaimConversation *c = gaim_find_conversation(who); struct warning *w = g_new0(struct warning, 1); w->who = who; @@ -412,7 +412,7 @@ void do_remove_buddy(struct buddy *b) { struct group *g; - struct gaim_conversation *c; + GaimConversation *c; gchar *name; if (!b) @@ -441,7 +441,7 @@ while (b) { if(GAIM_BLIST_NODE_IS_BUDDY(b)) { struct buddy *bd = (struct buddy *)b; - struct gaim_conversation *c = gaim_find_conversation(bd->name); + GaimConversation *c = gaim_find_conversation(bd->name); if(bd->account->gc) { serv_remove_buddy(bd->account->gc, bd->name, g->name); gaim_blist_remove_buddy(bd); @@ -501,7 +501,7 @@ static void do_im(GtkWidget *widget, int resp, struct getuserinfo *info) { const char *who; - struct gaim_conversation *conv; + GaimConversation *conv; GaimAccount *account; if (resp == GTK_RESPONSE_OK) { @@ -846,12 +846,12 @@ /* The dialog for adding buddies */ /*------------------------------------------------------------------------*/ -extern void add_callback(GtkWidget *, struct gaim_conversation *); +extern void add_callback(GtkWidget *, GaimConversation *); void do_add_buddy(GtkWidget *w, int resp, struct addbuddy *a) { const char *grp, *who, *whoalias; - struct gaim_conversation *c; + GaimConversation *c; struct buddy *b; struct group *g; void *icon_data; @@ -2507,9 +2507,9 @@ /* Functions Called To Add A Log */ /*------------------------------------------------------------------------*/ -void cancel_log(GtkWidget *widget, struct gaim_conversation *c) +void cancel_log(GtkWidget *widget, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(c); @@ -2523,9 +2523,9 @@ gtkconv->dialogs.log = NULL; } -void do_log(GtkWidget *w, struct gaim_conversation *c) +void do_log(GtkWidget *w, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; struct log_conversation *l; const char *file; char path[PATHSIZE]; @@ -2553,9 +2553,9 @@ cancel_log(NULL, c); } -void show_log_dialog(struct gaim_conversation *c) +void show_log_dialog(GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; char *buf = g_malloc(BUF_LEN); gtkconv = GAIM_GTK_CONVERSATION(c); @@ -2808,9 +2808,9 @@ /* Link Dialog */ /*------------------------------------------------------*/ -void cancel_link(GtkWidget *widget, struct gaim_conversation *c) +void cancel_link(GtkWidget *widget, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(c); @@ -2825,7 +2825,7 @@ void do_insert_link(GtkWidget *w, int resp, struct linkdlg *b) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; char *open_tag; const char *urltext, *showtext; @@ -2856,10 +2856,10 @@ destroy_dialog(NULL, b->window); } -void show_insert_link(GtkWidget *linky, struct gaim_conversation *c) +void show_insert_link(GtkWidget *linky, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_window *gtkwin; + GaimGtkConversation *gtkconv; + GaimGtkWindow *gtkwin; GtkWidget *table; GtkWidget *label; GtkWidget *hbox; @@ -2954,9 +2954,9 @@ GtkWidget *fgcseld = NULL; GtkWidget *bgcseld = NULL; -void cancel_fgcolor(GtkWidget *widget, struct gaim_conversation *c) +void cancel_fgcolor(GtkWidget *widget, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(c); @@ -2970,9 +2970,9 @@ gtkconv->dialogs.fg_color = NULL; } -void cancel_bgcolor(GtkWidget *widget, struct gaim_conversation *c) +void cancel_bgcolor(GtkWidget *widget, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(c); @@ -2989,8 +2989,8 @@ void do_fgcolor(GtkWidget *widget, GtkColorSelection *colorsel) { GdkColor text_color; - struct gaim_conversation *c; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *c; + GaimGtkConversation *gtkconv; char *open_tag; open_tag = g_malloc(30); @@ -3020,8 +3020,8 @@ void do_bgcolor(GtkWidget *widget, GtkColorSelection *colorsel) { GdkColor text_color; - struct gaim_conversation *c; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *c; + GaimGtkConversation *gtkconv; char *open_tag; open_tag = g_malloc(30); @@ -3048,9 +3048,9 @@ cancel_bgcolor(NULL, c); } -void show_fgcolor_dialog(struct gaim_conversation *c, GtkWidget *color) +void show_fgcolor_dialog(GaimConversation *c, GtkWidget *color) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; GtkWidget *colorsel; GdkColor fgcolor; @@ -3100,9 +3100,9 @@ gdk_window_raise(gtkconv->dialogs.fg_color->window); } -void show_bgcolor_dialog(struct gaim_conversation *c, GtkWidget *color) +void show_bgcolor_dialog(GaimConversation *c, GtkWidget *color) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; GtkWidget *colorsel; GdkColor bgcolor; @@ -3156,9 +3156,9 @@ /* Font Selection Dialog */ /*------------------------------------------------------------------------*/ -void cancel_font(GtkWidget *widget, struct gaim_conversation *c) +void cancel_font(GtkWidget *widget, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(c); @@ -3178,7 +3178,7 @@ but for now only works with font face */ int i = 0; char *fontname; - struct gaim_conversation *c = g_object_get_data(G_OBJECT(fontsel), + GaimConversation *c = g_object_get_data(G_OBJECT(fontsel), "gaim_conversation"); fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(fontsel)); @@ -3215,9 +3215,9 @@ fontseld = NULL; } -void show_font_dialog(struct gaim_conversation *c, GtkWidget *font) +void show_font_dialog(GaimConversation *c, GtkWidget *font) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; char fonttif[128]; const char *fontface; @@ -3475,9 +3475,9 @@ /* smiley dialog */ -void close_smiley_dialog(GtkWidget *widget, struct gaim_conversation *c) +void close_smiley_dialog(GtkWidget *widget, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(c); @@ -3492,9 +3492,9 @@ } } -void insert_smiley_text(GtkWidget *widget, struct gaim_conversation *c) +void insert_smiley_text(GtkWidget *widget, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text"); GtkTextMark *select_mark, *insert_mark; GtkTextIter select_iter, insert_iter; @@ -3514,11 +3514,11 @@ close_smiley_dialog(NULL, c); } -static void add_smiley(struct gaim_conversation *c, GtkWidget *table, int row, int col, char *filename, char *face) +static void add_smiley(GaimConversation *c, GtkWidget *table, int row, int col, char *filename, char *face) { GtkWidget *image; GtkWidget *button; - struct gaim_gtk_conversation *gtkconv = GAIM_GTK_CONVERSATION(c); + GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(c); image = gtk_image_new_from_file(filename); button = gtk_button_new(); @@ -3546,9 +3546,9 @@ return TRUE; } -void show_smiley_dialog(struct gaim_conversation *c, GtkWidget *widget) +void show_smiley_dialog(GaimConversation *c, GtkWidget *widget) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; GtkWidget *dialog; GtkWidget *smiley_table = NULL; GSList *smileys, *unique_smileys = NULL;
--- a/src/gaim.h Mon Jun 02 21:14:50 2003 +0000 +++ b/src/gaim.h Mon Jun 02 21:51:06 2003 +0000 @@ -268,7 +268,7 @@ extern void rm_log(struct log_conversation *); extern struct log_conversation *find_log_info(const char *); extern void update_log_convs(); -extern void save_convo(GtkWidget *save, struct gaim_conversation *c); +extern void save_convo(GtkWidget *save, GaimConversation *c); extern char *html_logize(const char *p); /*------------------------------------------------------------------------*/
--- a/src/gtkconv.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/gtkconv.c Mon Jun 02 21:51:06 2003 +0000 @@ -91,15 +91,16 @@ ((gdk_pixbuf_animation_get_width(x) <= 48 && \ gdk_pixbuf_animation_get_height(x) <= 48) ? 48 : 50) -struct InviteBuddyInfo +typedef struct { GtkWidget *window; GtkWidget *entry; GtkWidget *message; - struct gaim_conversation *conv; -}; + GaimConversation *conv; + +} InviteBuddyInfo; char fontface[128] = { 0 }; int fontsize = 3; @@ -109,23 +110,23 @@ /* Prototypes. <-- because Paco-Paco hates this comment. */ static void check_everything(GtkTextBuffer *buffer); static void set_toggle(GtkWidget *tb, gboolean active); -static void move_next_tab(struct gaim_conversation *conv); -static void do_bold(GtkWidget *bold, struct gaim_gtk_conversation *gtkconv); -static void do_italic(GtkWidget *italic, struct gaim_gtk_conversation *gtkconv); -static void do_underline(GtkWidget *underline, struct gaim_gtk_conversation *gtkconv); -static void do_small(GtkWidget *small, struct gaim_gtk_conversation *gtkconv); -static void do_normal(GtkWidget *small, struct gaim_gtk_conversation *gtkconv); -static void do_big(GtkWidget *small, struct gaim_gtk_conversation *gtkconv); -static void toggle_font(GtkWidget *font, struct gaim_conversation *conv); -static void toggle_fg_color(GtkWidget *color, struct gaim_conversation *conv); -static void toggle_bg_color(GtkWidget *color, struct gaim_conversation *conv); -static void got_typing_keypress(struct gaim_conversation *conv, gboolean first); +static void move_next_tab(GaimConversation *conv); +static void do_bold(GtkWidget *bold, GaimGtkConversation *gtkconv); +static void do_italic(GtkWidget *italic, GaimGtkConversation *gtkconv); +static void do_underline(GtkWidget *underline, GaimGtkConversation *gtkconv); +static void do_small(GtkWidget *small, GaimGtkConversation *gtkconv); +static void do_normal(GtkWidget *small, GaimGtkConversation *gtkconv); +static void do_big(GtkWidget *small, GaimGtkConversation *gtkconv); +static void toggle_font(GtkWidget *font, GaimConversation *conv); +static void toggle_fg_color(GtkWidget *color, GaimConversation *conv); +static void toggle_bg_color(GtkWidget *color, GaimConversation *conv); +static void got_typing_keypress(GaimConversation *conv, gboolean first); static GList *generate_invite_user_names(GaimConnection *gc); -static void add_chat_buddy_common(struct gaim_conversation *conv, +static void add_chat_buddy_common(GaimConversation *conv, const char *name, int pos); -static void tab_complete(struct gaim_conversation *conv); -static void update_typing_icon(struct gaim_conversation *conv); -static gboolean update_send_as_selection(struct gaim_window *win); +static void tab_complete(GaimConversation *conv); +static void update_typing_icon(GaimConversation *conv); +static gboolean update_send_as_selection(GaimWindow *win); static char *item_factory_translate_func (const char *path, gpointer func_data); /************************************************************************** @@ -134,9 +135,9 @@ static void do_insert_image_cb(GObject *obj, GtkWidget *wid) { - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; - struct gaim_im *im; + GaimConversation *conv; + GaimGtkConversation *gtkconv; + GaimIm *im; const char *name; const char *filename; char *buf; @@ -180,7 +181,7 @@ static gint close_win_cb(GtkWidget *w, GdkEventAny *e, gpointer d) { - struct gaim_window *win = (struct gaim_window *)d; + GaimWindow *win = (GaimWindow *)d; gaim_window_destroy(win); @@ -190,7 +191,7 @@ static gint close_conv_cb(GtkWidget *w, gpointer d) { - struct gaim_conversation *conv = (struct gaim_conversation *)d; + GaimConversation *conv = (GaimConversation *)d; gaim_conversation_destroy(conv); @@ -198,19 +199,21 @@ } static void -cancel_insert_image_cb(GtkWidget *unused, struct gaim_gtk_conversation *gtkconv) +cancel_insert_image_cb(GtkWidget *unused, GaimGtkConversation *gtkconv) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.image), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.image), + FALSE); if (gtkconv->dialogs.image) gtk_widget_destroy(gtkconv->dialogs.image); + gtkconv->dialogs.image = NULL; } static void -insert_image_cb(GtkWidget *save, struct gaim_conversation *conv) +insert_image_cb(GtkWidget *save, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; char buf[BUF_LONG]; GtkWidget *window; @@ -238,9 +241,9 @@ } static void -insert_link_cb(GtkWidget *w, struct gaim_conversation *conv) +insert_link_cb(GtkWidget *w, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -255,9 +258,9 @@ } static void -insert_smiley_cb(GtkWidget *smiley, struct gaim_conversation *conv) +insert_smiley_cb(GtkWidget *smiley, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -272,7 +275,7 @@ static void menu_save_as_cb(gpointer data, guint action, GtkWidget *widget) { - struct gaim_window *win = (struct gaim_window *)data; + GaimWindow *win = (GaimWindow *)data; save_convo(NULL, gaim_window_get_active_conversation(win)); } @@ -280,8 +283,8 @@ static void menu_view_log_cb(gpointer data, guint action, GtkWidget *widget) { - struct gaim_window *win = (struct gaim_window *)data; - struct gaim_conversation *conv; + GaimWindow *win = (GaimWindow *)data; + GaimConversation *conv; conv = gaim_window_get_active_conversation(win); @@ -290,9 +293,9 @@ static void menu_insert_link_cb(gpointer data, guint action, GtkWidget *widget) { - struct gaim_window *win = (struct gaim_window *)data; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimWindow *win = (GaimWindow *)data; + GaimConversation *conv; + GaimGtkConversation *gtkconv; conv = gaim_window_get_active_conversation(win); gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -303,8 +306,8 @@ static void menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget) { - struct gaim_window *win = (struct gaim_window *)data; - struct gaim_gtk_conversation *gtkconv; + GaimWindow *win = (GaimWindow *)data; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(gaim_window_get_active_conversation(win)); @@ -315,7 +318,7 @@ static void menu_close_conv_cb(gpointer data, guint action, GtkWidget *widget) { - struct gaim_window *win = (struct gaim_window *)data; + GaimWindow *win = (GaimWindow *)data; close_conv_cb(NULL, gaim_window_get_active_conversation(win)); } @@ -323,8 +326,8 @@ static void menu_logging_cb(gpointer data, guint action, GtkWidget *widget) { - struct gaim_window *win = (struct gaim_window *)data; - struct gaim_conversation *conv; + GaimWindow *win = (GaimWindow *)data; + GaimConversation *conv; conv = gaim_window_get_active_conversation(win); @@ -335,9 +338,9 @@ static void menu_sounds_cb(gpointer data, guint action, GtkWidget *widget) { - struct gaim_window *win = (struct gaim_window *)data; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimWindow *win = (GaimWindow *)data; + GaimConversation *conv; + GaimGtkConversation *gtkconv; conv = gaim_window_get_active_conversation(win); @@ -359,9 +362,9 @@ } static void -send_cb(GtkWidget *widget, struct gaim_conversation *conv) +send_cb(GtkWidget *widget, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; char *buf, *buf2; GtkTextIter start_iter, end_iter; int limit; @@ -472,7 +475,7 @@ } static void -add_cb(GtkWidget *widget, struct gaim_conversation *conv) +add_cb(GtkWidget *widget, GaimConversation *conv) { GaimConnection *gc; struct buddy *b; @@ -491,14 +494,14 @@ } static void -info_cb(GtkWidget *widget, struct gaim_conversation *conv) +info_cb(GtkWidget *widget, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(conv); if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) { - struct gaim_gtk_chat_pane *gtkchat; + GaimGtkChatPane *gtkchat; GtkTreeIter iter; GtkTreeModel *model; GtkTreeSelection *sel; @@ -525,7 +528,7 @@ } static void -warn_cb(GtkWidget *widget, struct gaim_conversation *conv) +warn_cb(GtkWidget *widget, GaimConversation *conv) { show_warn_dialog(gaim_conversation_get_gc(conv), (char *)gaim_conversation_get_name(conv)); @@ -534,7 +537,7 @@ } static void -block_cb(GtkWidget *widget, struct gaim_conversation *conv) +block_cb(GtkWidget *widget, GaimConversation *conv) { GaimConnection *gc; @@ -547,11 +550,11 @@ } void -im_cb(GtkWidget *widget, struct gaim_conversation *conv) +im_cb(GtkWidget *widget, GaimConversation *conv) { - struct gaim_conversation *conv2; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; + GaimConversation *conv2; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; GaimAccount *account; GtkTreeIter iter; GtkTreeModel *model; @@ -586,11 +589,11 @@ } static void -ignore_cb(GtkWidget *w, struct gaim_conversation *conv) +ignore_cb(GtkWidget *w, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; - struct gaim_chat *chat; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; + GaimChat *chat; GtkTreeIter iter; GtkTreeModel *model; GtkTreeSelection *sel; @@ -622,10 +625,10 @@ } static void -menu_im_cb(GtkWidget *w, struct gaim_conversation *conv) +menu_im_cb(GtkWidget *w, GaimConversation *conv) { const char *who; - struct gaim_conversation *conv2; + GaimConversation *conv2; GaimAccount *account; who = g_object_get_data(G_OBJECT(w), "user_data"); @@ -641,7 +644,7 @@ } static void -menu_info_cb(GtkWidget *w, struct gaim_conversation *conv) +menu_info_cb(GtkWidget *w, GaimConversation *conv) { GaimPluginProtocolInfo *prpl_info = NULL; GaimConnection *gc; @@ -665,7 +668,7 @@ } static void -menu_away_cb(GtkWidget *w, struct gaim_conversation *conv) +menu_away_cb(GtkWidget *w, GaimConversation *conv) { GaimPluginProtocolInfo *prpl_info = NULL; GaimConnection *gc; @@ -687,7 +690,7 @@ } static void -menu_add_cb(GtkWidget *w, struct gaim_conversation *conv) +menu_add_cb(GtkWidget *w, GaimConversation *conv) { GaimConnection *gc; struct buddy *b; @@ -707,11 +710,11 @@ static gint right_click_chat_cb(GtkWidget *widget, GdkEventButton *event, - struct gaim_conversation *conv) + GaimConversation *conv) { GaimPluginProtocolInfo *prpl_info = NULL; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; GaimConnection *gc; GaimAccount *account; GtkTreePath *path; @@ -748,7 +751,7 @@ if (*who == '+') who++; if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) { - struct gaim_conversation *c; + GaimConversation *c; if ((c = gaim_find_conversation(who)) == NULL) c = gaim_conversation_new(GAIM_CONV_IM, account, who); @@ -829,10 +832,10 @@ } static void -do_invite(GtkWidget *w, int resp, struct InviteBuddyInfo *info) +do_invite(GtkWidget *w, int resp, InviteBuddyInfo *info) { const char *buddy, *message; - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(info->conv); @@ -858,14 +861,14 @@ } static void -invite_cb(GtkWidget *widget, struct gaim_conversation *conv) +invite_cb(GtkWidget *widget, GaimConversation *conv) { - struct InviteBuddyInfo *info = NULL; + InviteBuddyInfo *info = NULL; if (invite_dialog == NULL) { GaimConnection *gc; - struct gaim_window *win; - struct gaim_gtk_window *gtkwin; + GaimWindow *win; + GaimGtkWindow *gtkwin; GtkWidget *label; GtkWidget *vbox, *hbox; GtkWidget *table; @@ -873,7 +876,7 @@ img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); - info = g_new0(struct InviteBuddyInfo, 1); + info = g_new0(InviteBuddyInfo, 1); info->conv = conv; gc = gaim_conversation_get_gc(conv); @@ -977,12 +980,12 @@ static gboolean entry_key_pressed_cb_2(GtkWidget *entry, GdkEventKey *event, gpointer data) { - struct gaim_window *win; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_window *gtkwin; - - conv = (struct gaim_conversation *)data; + GaimWindow *win; + GaimConversation *conv; + GaimGtkConversation *gtkconv; + GaimGtkWindow *gtkwin; + + conv = (GaimConversation *)data; gtkconv = GAIM_GTK_CONVERSATION(conv); win = gaim_conversation_get_window(conv); gtkwin = GAIM_GTK_WINDOW(win); @@ -1267,9 +1270,9 @@ static void menu_conv_sel_send_cb(GObject *m, gpointer data) { - struct gaim_window *win = g_object_get_data(m, "user_data"); + GaimWindow *win = g_object_get_data(m, "user_data"); GaimAccount *account = g_object_get_data(m, "gaim_account"); - struct gaim_conversation *conv; + GaimConversation *conv; conv = gaim_window_get_active_conversation(win); @@ -1280,7 +1283,7 @@ insert_text_cb(GtkTextBuffer *textbuffer, GtkTextIter *position, gchar *new_text, gint new_text_length, gpointer user_data) { - struct gaim_conversation *conv = (struct gaim_conversation *)user_data; + GaimConversation *conv = (GaimConversation *)user_data; if (conv == NULL) return; @@ -1296,8 +1299,8 @@ delete_text_cb(GtkTextBuffer *textbuffer, GtkTextIter *start_pos, GtkTextIter *end_pos, gpointer user_data) { - struct gaim_conversation *conv = (struct gaim_conversation *)user_data; - struct gaim_im *im; + GaimConversation *conv = (GaimConversation *)user_data; + GaimIm *im; if (conv == NULL) return; @@ -1325,7 +1328,7 @@ } static void -notebook_init_grab(struct gaim_gtk_window *gtkwin, GtkWidget *widget) +notebook_init_grab(GaimGtkWindow *gtkwin, GtkWidget *widget) { static GdkCursor *cursor = NULL; @@ -1354,10 +1357,9 @@ } static gboolean -notebook_motion_cb(GtkWidget *widget, GdkEventButton *e, - struct gaim_window *win) +notebook_motion_cb(GtkWidget *widget, GdkEventButton *e, GaimWindow *win) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; gtkwin = GAIM_GTK_WINDOW(win); @@ -1376,8 +1378,8 @@ } } else { /* Otherwise, draw the arrows. */ - struct gaim_window *dest_win; - struct gaim_gtk_window *dest_gtkwin; + GaimWindow *dest_win; + GaimGtkWindow *dest_gtkwin; GtkNotebook *dest_notebook; GtkWidget *tab, *last_vis_tab = NULL; gint nb_x, nb_y, page_num, i, last_vis_tab_loc = -1; @@ -1417,7 +1419,7 @@ l != NULL; l = l->next, i++) { - struct gaim_conversation *conv = l->data; + GaimConversation *conv = l->data; tab = GAIM_GTK_CONVERSATION(conv)->tabby; @@ -1489,10 +1491,9 @@ } static gboolean -notebook_leave_cb(GtkWidget *widget, GdkEventCrossing *e, - struct gaim_window *win) +notebook_leave_cb(GtkWidget *widget, GdkEventCrossing *e, GaimWindow *win) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; gtkwin = GAIM_GTK_WINDOW(win); @@ -1515,10 +1516,9 @@ * THANK YOU GALEON! */ static gboolean -notebook_press_cb(GtkWidget *widget, GdkEventButton *e, - struct gaim_window *win) +notebook_press_cb(GtkWidget *widget, GdkEventButton *e, GaimWindow *win) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; gint nb_x, nb_y, x_rel, y_rel; GList *l; int tab_clicked; @@ -1560,7 +1560,7 @@ /* Find out which tab was dragged. */ for (l = gaim_window_get_conversations(win); l != NULL; l = l->next) { - struct gaim_conversation *conv = l->data; + GaimConversation *conv = l->data; GtkWidget *tab = GAIM_GTK_CONVERSATION(conv)->tabby; if (!GTK_WIDGET_VISIBLE(tab)) @@ -1600,13 +1600,12 @@ } static gboolean -notebook_release_cb(GtkWidget *widget, GdkEventButton *e, - struct gaim_window *win) +notebook_release_cb(GtkWidget *widget, GdkEventButton *e, GaimWindow *win) { - struct gaim_window *dest_win; - struct gaim_gtk_window *gtkwin; - struct gaim_gtk_window *dest_gtkwin; - struct gaim_conversation *conv; + GaimWindow *dest_win; + GaimGtkWindow *gtkwin; + GaimGtkWindow *dest_gtkwin; + GaimConversation *conv; GtkNotebook *dest_notebook; gint dest_page_num; @@ -1670,9 +1669,9 @@ if (gaim_window_get_conversation_count(win) > 1) { /* Make a new window to stick this to. */ - struct gaim_window *new_win; - struct gaim_gtk_window *new_gtkwin; - struct gaim_gtk_conversation *gtkconv; + GaimWindow *new_win; + GaimGtkWindow *new_gtkwin; + GaimGtkConversation *gtkconv; gint win_width, win_height; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -1734,13 +1733,13 @@ gpointer user_data) { GaimPluginProtocolInfo *prpl_info = NULL; - struct gaim_window *win; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_window *gtkwin; + GaimWindow *win; + GaimConversation *conv; + GaimGtkConversation *gtkconv; + GaimGtkWindow *gtkwin; GaimConnection *gc; - win = (struct gaim_window *)user_data; + win = (GaimWindow *)user_data; conv = gaim_window_get_conversation_at(win, page_num); @@ -1793,7 +1792,7 @@ * Utility functions **************************************************************************/ static void -do_bold(GtkWidget *bold, struct gaim_gtk_conversation *gtkconv) +do_bold(GtkWidget *bold, GaimGtkConversation *gtkconv) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(bold))) gaim_gtk_surround(gtkconv, "<B>", "</B>"); @@ -1804,7 +1803,7 @@ } static void -do_italic(GtkWidget *italic, struct gaim_gtk_conversation *gtkconv) +do_italic(GtkWidget *italic, GaimGtkConversation *gtkconv) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(italic))) gaim_gtk_surround(gtkconv, "<I>", "</I>"); @@ -1815,7 +1814,7 @@ } static void -do_underline(GtkWidget *underline, struct gaim_gtk_conversation *gtkconv) +do_underline(GtkWidget *underline, GaimGtkConversation *gtkconv) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(underline))) gaim_gtk_surround(gtkconv, "<U>", "</U>"); @@ -1826,7 +1825,7 @@ } static void -do_small(GtkWidget *small, struct gaim_gtk_conversation *gtkconv) +do_small(GtkWidget *small, GaimGtkConversation *gtkconv) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(small))) gaim_gtk_surround(gtkconv, "<FONT SIZE=\"1\">", "</FONT>"); @@ -1837,7 +1836,7 @@ } static void -do_normal(GtkWidget *normal, struct gaim_gtk_conversation *gtkconv) +do_normal(GtkWidget *normal, GaimGtkConversation *gtkconv) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(normal))) gaim_gtk_surround(gtkconv, "<FONT SIZE=\"3\">", "</FONT>"); @@ -1848,7 +1847,7 @@ } static void -do_big(GtkWidget *large, struct gaim_gtk_conversation *gtkconv) +do_big(GtkWidget *large, GaimGtkConversation *gtkconv) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(large))) gaim_gtk_surround(gtkconv, "<FONT SIZE=\"5\">", "</FONT>"); @@ -1859,9 +1858,9 @@ } static void -toggle_font(GtkWidget *font, struct gaim_conversation *conv) +toggle_font(GtkWidget *font, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -1874,9 +1873,9 @@ } static void -toggle_fg_color(GtkWidget *color, struct gaim_conversation *conv) +toggle_fg_color(GtkWidget *color, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -1889,9 +1888,9 @@ } static void -toggle_bg_color(GtkWidget *color, struct gaim_conversation *conv) +toggle_bg_color(GtkWidget *color, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -1906,10 +1905,10 @@ static void check_everything(GtkTextBuffer *buffer) { - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; - - conv = (struct gaim_conversation *)g_object_get_data(G_OBJECT(buffer), + GaimConversation *conv; + GaimGtkConversation *gtkconv; + + conv = (GaimConversation *)g_object_get_data(G_OBJECT(buffer), "user_data"); if (conv == NULL) @@ -1927,9 +1926,9 @@ } static void -got_typing_keypress(struct gaim_conversation *conv, gboolean first) +got_typing_keypress(GaimConversation *conv, gboolean first) { - struct gaim_im *im; + GaimIm *im; /* * We know we got something, so we at least have to make sure we don't @@ -1958,11 +1957,11 @@ } static void -update_typing_icon(struct gaim_conversation *conv) +update_typing_icon(GaimConversation *conv) { - struct gaim_gtk_window *gtkwin; - struct gaim_im *im = NULL; - struct gaim_gtk_conversation *gtkconv = GAIM_GTK_CONVERSATION(conv); + GaimGtkWindow *gtkwin; + GaimIm *im = NULL; + GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv); gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(conv)); @@ -2001,11 +2000,11 @@ } static gboolean -update_send_as_selection(struct gaim_window *win) +update_send_as_selection(GaimWindow *win) { GaimAccount *account; - struct gaim_conversation *conv; - struct gaim_gtk_window *gtkwin; + GaimConversation *conv; + GaimGtkWindow *gtkwin; GtkWidget *menu; GList *child; @@ -2049,10 +2048,9 @@ } static void -generate_send_as_items(struct gaim_window *win, - struct gaim_conversation *deleted_conv) +generate_send_as_items(GaimWindow *win, GaimConversation *deleted_conv) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; GtkWidget *menu; GtkWidget *menuitem; GList *gcs; @@ -2076,10 +2074,10 @@ convs != NULL; convs = convs->next) { - struct gaim_conversation *conv; + GaimConversation *conv; GaimAccount *account; - conv = (struct gaim_conversation *)convs->data; + conv = (GaimConversation *)convs->data; account = gaim_conversation_get_account(conv); if (account->gc == NULL) { @@ -2179,14 +2177,14 @@ convs != NULL; convs = convs->next) { - struct gaim_conversation *conv; + GaimConversation *conv; GaimAccount *account; GtkWidget *box; GtkWidget *label; GtkWidget *image; GdkPixbuf *pixbuf, *scale; - conv = (struct gaim_conversation *)convs->data; + conv = (GaimConversation *)convs->data; if (conv == deleted_conv) continue; @@ -2293,12 +2291,11 @@ } static void -add_chat_buddy_common(struct gaim_conversation *conv, const char *name, - int pos) +add_chat_buddy_common(GaimConversation *conv, const char *name, int pos) { - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; - struct gaim_chat *chat; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; + GaimChat *chat; GtkTreeIter iter; GtkListStore *ls; @@ -2317,10 +2314,10 @@ } static void -tab_complete(struct gaim_conversation *conv) +tab_complete(GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; - struct gaim_chat *chat; + GaimGtkConversation *gtkconv; + GaimChat *chat; GtkTextIter cursor, word_start, start_buffer; int start; int most_matched = -1; @@ -2578,9 +2575,9 @@ } static GtkWidget * -setup_menubar(struct gaim_window *win) +setup_menubar(GaimWindow *win) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; GtkAccelGroup *accel_group; gtkwin = GAIM_GTK_WINDOW(win); @@ -2619,11 +2616,11 @@ } static void -setup_im_buttons(struct gaim_conversation *conv, GtkWidget *parent) +setup_im_buttons(GaimConversation *conv, GtkWidget *parent) { GaimConnection *gc; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_im_pane *gtkim; + GaimGtkConversation *gtkconv; + GaimGtkImPane *gtkim; GaimConversationType type = GAIM_CONV_IM; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -2719,12 +2716,12 @@ } static void -setup_chat_buttons(struct gaim_conversation *conv, GtkWidget *parent) +setup_chat_buttons(GaimConversation *conv, GtkWidget *parent) { GaimConnection *gc; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; - struct gaim_gtk_window *gtkwin; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; + GaimGtkWindow *gtkwin; GtkWidget *sep; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -2763,9 +2760,9 @@ } static GtkWidget * -build_conv_toolbar(struct gaim_conversation *conv) +build_conv_toolbar(GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; GtkWidget *vbox; GtkWidget *hbox; GtkWidget *button; @@ -2944,11 +2941,11 @@ } static GtkWidget * -setup_chat_pane(struct gaim_conversation *conv) +setup_chat_pane(GaimConversation *conv) { GaimPluginProtocolInfo *prpl_info = NULL; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; GaimConnection *gc; GtkWidget *vpaned, *hpaned; GtkWidget *vbox, *hbox; @@ -3173,10 +3170,10 @@ } static GtkWidget * -setup_im_pane(struct gaim_conversation *conv) +setup_im_pane(GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_im_pane *gtkim; + GaimGtkConversation *gtkconv; + GaimGtkImPane *gtkim; GtkWidget *paned; GtkWidget *vbox; GtkWidget *vbox2; @@ -3276,10 +3273,10 @@ } static void -move_next_tab(struct gaim_conversation *conv) +move_next_tab(GaimConversation *conv) { - struct gaim_conversation *next_conv = NULL; - struct gaim_window *win; + GaimConversation *next_conv = NULL; + GaimWindow *win; GList *l; int index, i; @@ -3291,7 +3288,7 @@ l != NULL; l = l->next) { - next_conv = (struct gaim_conversation *)l->data; + next_conv = (GaimConversation *)l->data; if (gaim_conversation_get_unseen(next_conv) > 0) break; @@ -3306,7 +3303,7 @@ l != NULL && i < index; l = l->next) { - next_conv = (struct gaim_conversation *)l->data; + next_conv = (GaimConversation *)l->data; if (gaim_conversation_get_unseen(next_conv) > 0) break; @@ -3332,10 +3329,10 @@ static void conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y, GtkSelectionData *sd, guint info, guint t, - struct gaim_conversation *conv) + GaimConversation *conv) { - struct gaim_window *win = conv->window; - struct gaim_conversation *c; + GaimWindow *win = conv->window; + GaimConversation *c; if (sd->target == gdk_atom_intern("GAIM_BLIST_NODE", FALSE)) { GaimBlistNode *n = NULL; @@ -3355,21 +3352,21 @@ /************************************************************************** * GTK+ window ops **************************************************************************/ -static struct gaim_conversation_ui_ops * +static GaimConversationUiOps * gaim_gtk_get_conversation_ui_ops(void) { return gaim_get_gtk_conversation_ui_ops(); } static void -gaim_gtk_new_window(struct gaim_window *win) +gaim_gtk_new_window(GaimWindow *win) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; GtkPositionType pos; GtkWidget *testidea; GtkWidget *menubar; - gtkwin = g_malloc0(sizeof(struct gaim_gtk_window)); + gtkwin = g_malloc0(sizeof(GaimGtkWindow)); win->ui_data = gtkwin; @@ -3425,9 +3422,9 @@ } static void -gaim_gtk_destroy_window(struct gaim_window *win) +gaim_gtk_destroy_window(GaimWindow *win) { - struct gaim_gtk_window *gtkwin = GAIM_GTK_WINDOW(win); + GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win); gtk_widget_destroy(gtkwin->window); @@ -3438,25 +3435,25 @@ } static void -gaim_gtk_show(struct gaim_window *win) +gaim_gtk_show(GaimWindow *win) { - struct gaim_gtk_window *gtkwin = GAIM_GTK_WINDOW(win); + GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win); gtk_widget_show(gtkwin->window); } static void -gaim_gtk_hide(struct gaim_window *win) +gaim_gtk_hide(GaimWindow *win) { - struct gaim_gtk_window *gtkwin = GAIM_GTK_WINDOW(win); + GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win); gtk_widget_hide(gtkwin->window); } static void -gaim_gtk_raise(struct gaim_window *win) +gaim_gtk_raise(GaimWindow *win) { - struct gaim_gtk_window *gtkwin = GAIM_GTK_WINDOW(win); + GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win); gtk_widget_show(gtkwin->window); gtk_window_deiconify(GTK_WINDOW(gtkwin->window)); @@ -3464,19 +3461,19 @@ } static void -gaim_gtk_flash(struct gaim_window *win) +gaim_gtk_flash(GaimWindow *win) { #ifdef _WIN32 - struct gaim_gtk_window *gtkwin = GAIM_GTK_WINDOW(win); + GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win); wgaim_im_blink(gtkwin->window); #endif } static void -gaim_gtk_switch_conversation(struct gaim_window *win, unsigned int index) +gaim_gtk_switch_conversation(GaimWindow *win, unsigned int index) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; gtkwin = GAIM_GTK_WINDOW(win); @@ -3492,12 +3489,11 @@ }; static void -gaim_gtk_add_conversation(struct gaim_window *win, - struct gaim_conversation *conv) +gaim_gtk_add_conversation(GaimWindow *win, GaimConversation *conv) { - struct gaim_gtk_window *gtkwin; - struct gaim_gtk_conversation *gtkconv, *focus_gtkconv; - struct gaim_conversation *focus_conv; + GaimGtkWindow *gtkwin; + GaimGtkConversation *gtkconv, *focus_gtkconv; + GaimConversation *focus_conv; GtkWidget *pane = NULL; GtkWidget *tab_cont; GtkWidget *tabby; @@ -3510,14 +3506,14 @@ gtkwin = GAIM_GTK_WINDOW(win); if (conv->ui_data != NULL) { - gtkconv = (struct gaim_gtk_conversation *)conv->ui_data; + gtkconv = (GaimGtkConversation *)conv->ui_data; tab_cont = gtkconv->tab_cont; new_ui = FALSE; } else { - gtkconv = g_malloc0(sizeof(struct gaim_gtk_conversation)); + gtkconv = g_malloc0(sizeof(GaimGtkConversation)); conv->ui_data = gtkconv; /* Setup some initial variables. */ @@ -3531,12 +3527,12 @@ gaim_gtkconv_update_font_face(conv); if (conv_type == GAIM_CONV_CHAT) { - gtkconv->u.chat = g_malloc0(sizeof(struct gaim_gtk_chat_pane)); + gtkconv->u.chat = g_malloc0(sizeof(GaimGtkChatPane)); pane = setup_chat_pane(conv); } else if (conv_type == GAIM_CONV_IM) { - gtkconv->u.im = g_malloc0(sizeof(struct gaim_gtk_im_pane)); + gtkconv->u.im = g_malloc0(sizeof(GaimGtkImPane)); gtkconv->u.im->a_virgin = TRUE; pane = setup_im_pane(conv); @@ -3690,11 +3686,10 @@ } static void -gaim_gtk_remove_conversation(struct gaim_window *win, - struct gaim_conversation *conv) +gaim_gtk_remove_conversation(GaimWindow *win, GaimConversation *conv) { - struct gaim_gtk_window *gtkwin; - struct gaim_gtk_conversation *gtkconv; + GaimGtkWindow *gtkwin; + GaimGtkConversation *gtkconv; unsigned int index; GaimConversationType conv_type; @@ -3725,12 +3720,11 @@ } static void -gaim_gtk_move_conversation(struct gaim_window *win, - struct gaim_conversation *conv, +gaim_gtk_move_conversation(GaimWindow *win, GaimConversation *conv, unsigned int new_index) { - struct gaim_gtk_window *gtkwin; - struct gaim_gtk_conversation *gtkconv; + GaimGtkWindow *gtkwin; + GaimGtkConversation *gtkconv; gtkwin = GAIM_GTK_WINDOW(win); gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -3743,16 +3737,16 @@ } static int -gaim_gtk_get_active_index(const struct gaim_window *win) +gaim_gtk_get_active_index(const GaimWindow *win) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; gtkwin = GAIM_GTK_WINDOW(win); return gtk_notebook_get_current_page(GTK_NOTEBOOK(gtkwin->notebook)); } -static struct gaim_window_ui_ops window_ui_ops = +static GaimWindowUiOps window_ui_ops = { gaim_gtk_get_conversation_ui_ops, gaim_gtk_new_window, @@ -3769,10 +3763,10 @@ }; static void -update_convo_add_button(struct gaim_conversation *conv) +update_convo_add_button(GaimConversation *conv) { GaimPluginProtocolInfo *prpl_info = NULL; - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; GaimConnection *gc; GaimConversationType type; GtkWidget *parent; @@ -3814,7 +3808,7 @@ gtk_size_group_add_widget(gtkconv->sg, gtkconv->u.im->add); } -struct gaim_window_ui_ops * +GaimWindowUiOps * gaim_get_gtk_window_ui_ops(void) { return &window_ui_ops; @@ -3824,9 +3818,9 @@ * Conversation UI operations **************************************************************************/ static void -gaim_gtkconv_destroy(struct gaim_conversation *conv) +gaim_gtkconv_destroy(GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv = GAIM_GTK_CONVERSATION(conv); + GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv); if (gtkconv->dialogs.fg_color != NULL) gtk_widget_destroy(gtkconv->dialogs.fg_color); @@ -3871,10 +3865,11 @@ } static void -gaim_gtkconv_write_im(struct gaim_conversation *conv, const char *who, - const char *message, size_t len, int flags, time_t mtime) +gaim_gtkconv_write_im(GaimConversation *conv, const char *who, + const char *message, size_t len, int flags, + time_t mtime) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -3906,10 +3901,10 @@ } static void -gaim_gtkconv_write_chat(struct gaim_conversation *conv, const char *who, +gaim_gtkconv_write_chat(GaimConversation *conv, const char *who, const char *message, int flags, time_t mtime) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -3942,12 +3937,12 @@ } static void -gaim_gtkconv_write_conv(struct gaim_conversation *conv, const char *who, +gaim_gtkconv_write_conv(GaimConversation *conv, const char *who, const char *message, size_t length, int flags, time_t mtime) { - struct gaim_gtk_conversation *gtkconv; - struct gaim_window *win; + GaimGtkConversation *gtkconv; + GaimWindow *win; GaimConnection *gc; int gtk_font_options = 0; GString *log_str; @@ -4250,11 +4245,11 @@ } static void -gaim_gtkconv_chat_add_user(struct gaim_conversation *conv, const char *user) +gaim_gtkconv_chat_add_user(GaimConversation *conv, const char *user) { - struct gaim_chat *chat; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; + GaimChat *chat; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; char tmp[BUF_LONG]; int num_users; int pos; @@ -4281,12 +4276,12 @@ } static void -gaim_gtkconv_chat_rename_user(struct gaim_conversation *conv, - const char *old_name, const char *new_name) +gaim_gtkconv_chat_rename_user(GaimConversation *conv, const char *old_name, + const char *new_name) { - struct gaim_chat *chat; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; + GaimChat *chat; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; GtkTreeIter iter; GtkTreeModel *model; GList *names; @@ -4337,11 +4332,11 @@ } static void -gaim_gtkconv_chat_remove_user(struct gaim_conversation *conv, const char *user) +gaim_gtkconv_chat_remove_user(GaimConversation *conv, const char *user) { - struct gaim_chat *chat; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; + GaimChat *chat; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; GtkTreeIter iter; GtkTreeModel *model; GList *names; @@ -4398,11 +4393,11 @@ } static void -gaim_gtkconv_set_title(struct gaim_conversation *conv, const char *title) +gaim_gtkconv_set_title(GaimConversation *conv, const char *title) { - struct gaim_gtk_conversation *gtkconv; - struct gaim_window *win; - struct gaim_gtk_window *gtkwin; + GaimGtkConversation *gtkconv; + GaimWindow *win; + GaimGtkWindow *gtkwin; win = gaim_conversation_get_window(conv); gtkwin = GAIM_GTK_WINDOW(win); @@ -4415,13 +4410,13 @@ } static void -gaim_gtkconv_updated(struct gaim_conversation *conv, GaimConvUpdateType type) +gaim_gtkconv_updated(GaimConversation *conv, GaimConvUpdateType type) { - struct gaim_window *win; - struct gaim_gtk_window *gtkwin; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_chat_pane *gtkchat; - struct gaim_chat *chat; + GaimWindow *win; + GaimGtkWindow *gtkwin; + GaimGtkConversation *gtkconv; + GaimGtkChatPane *gtkchat; + GaimChat *chat; win = gaim_conversation_get_window(conv); gtkwin = GAIM_GTK_WINDOW(win); @@ -4439,7 +4434,7 @@ else if (type == GAIM_CONV_UPDATE_TYPING || type == GAIM_CONV_UPDATE_UNSEEN) { GtkStyle *style; - struct gaim_im *im = NULL; + GaimIm *im = NULL; if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) @@ -4506,7 +4501,7 @@ } } -static struct gaim_conversation_ui_ops conversation_ui_ops = +static GaimConversationUiOps conversation_ui_ops = { gaim_gtkconv_destroy, /* destroy_conversation */ gaim_gtkconv_write_chat, /* write_chat */ @@ -4520,7 +4515,7 @@ gaim_gtkconv_updated /* updated */ }; -struct gaim_conversation_ui_ops * +GaimConversationUiOps * gaim_get_gtk_conversation_ui_ops(void) { return &conversation_ui_ops; @@ -4530,7 +4525,7 @@ * Public conversation utility functions **************************************************************************/ static void -remove_icon(struct gaim_gtk_conversation *gtkconv) +remove_icon(GaimGtkConversation *gtkconv) { if (gtkconv == NULL) return; @@ -4557,8 +4552,8 @@ static gboolean redraw_icon(gpointer data) { - struct gaim_conversation *conv = (struct gaim_conversation *)data; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *conv = (GaimConversation *)data; + GaimGtkConversation *gtkconv; GdkPixbuf *buf; GdkPixbuf *scale; @@ -4602,9 +4597,9 @@ } static void -start_anim(GtkObject *obj, struct gaim_conversation *conv) +start_anim(GtkObject *obj, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; int delay; if (!GAIM_IS_GTK_CONVERSATION(conv)) @@ -4620,9 +4615,9 @@ } static void -stop_anim(GtkObject *obj, struct gaim_conversation *conv) +stop_anim(GtkObject *obj, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; if (!GAIM_IS_GTK_CONVERSATION(conv)) return; @@ -4636,9 +4631,9 @@ } static gboolean -icon_menu(GtkObject *obj, GdkEventButton *e, struct gaim_conversation *conv) +icon_menu(GtkObject *obj, GdkEventButton *e, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; static GtkWidget *menu = NULL; GtkWidget *button; @@ -4691,9 +4686,9 @@ } void -gaim_gtkconv_update_buddy_icon(struct gaim_conversation *conv) +gaim_gtkconv_update_buddy_icon(GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; char filename[256]; FILE *file; @@ -4841,11 +4836,11 @@ gaim_gtkconv_update_font_buttons(void) { GList *l; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *conv; + GaimGtkConversation *gtkconv; for (l = gaim_get_ims(); l != NULL; l = l->next) { - conv = (struct gaim_conversation *)l->data; + conv = (GaimConversation *)l->data; if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; @@ -4867,9 +4862,9 @@ } void -gaim_gtkconv_update_font_colors(struct gaim_conversation *conv) +gaim_gtkconv_update_font_colors(GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; if (!GAIM_IS_GTK_CONVERSATION(conv)) return; @@ -4884,9 +4879,9 @@ } void -gaim_gtkconv_update_font_face(struct gaim_conversation *conv) +gaim_gtkconv_update_font_face(GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; if (!GAIM_IS_GTK_CONVERSATION(conv)) return; @@ -4897,12 +4892,12 @@ } void -gaim_gtkconv_update_buttons_by_protocol(struct gaim_conversation *conv) +gaim_gtkconv_update_buttons_by_protocol(GaimConversation *conv) { GaimPluginProtocolInfo *prpl_info = NULL; - struct gaim_window *win; - struct gaim_gtk_window *gtkwin = NULL; - struct gaim_gtk_conversation *gtkconv; + GaimWindow *win; + GaimGtkWindow *gtkwin = NULL; + GaimGtkConversation *gtkconv; GaimConnection *gc; if (!GAIM_IS_GTK_CONVERSATION(conv)) @@ -4990,11 +4985,11 @@ } } -struct gaim_window * +GaimWindow * gaim_gtkwin_get_at_xy(int x, int y) { - struct gaim_window *win = NULL; - struct gaim_gtk_window *gtkwin; + GaimWindow *win = NULL; + GaimGtkWindow *gtkwin; GdkWindow *gdkwin; GList *l; @@ -5004,7 +4999,7 @@ gdkwin = gdk_window_get_toplevel(gdkwin); for (l = gaim_get_windows(); l != NULL; l = l->next) { - win = (struct gaim_window *)l->data; + win = (GaimWindow *)l->data; if (!GAIM_IS_GTK_WINDOW(win)) continue; @@ -5019,9 +5014,9 @@ } int -gaim_gtkconv_get_tab_at_xy(struct gaim_window *win, int x, int y) +gaim_gtkconv_get_tab_at_xy(GaimWindow *win, int x, int y) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; GList *l; gint nb_x, nb_y, x_rel, y_rel; GtkNotebook *notebook; @@ -5043,7 +5038,7 @@ l != NULL; l = l->next, i++) { - struct gaim_conversation *conv = l->data; + GaimConversation *conv = l->data; tab = GAIM_GTK_CONVERSATION(conv)->tab_label; if (!GTK_WIDGET_MAPPED(tab)) @@ -5087,9 +5082,9 @@ } int -gaim_gtkconv_get_dest_tab_at_xy(struct gaim_window *win, int x, int y) +gaim_gtkconv_get_dest_tab_at_xy(GaimWindow *win, int x, int y) { - struct gaim_gtk_window *gtkwin; + GaimGtkWindow *gtkwin; GList *l; gint nb_x, nb_y, x_rel, y_rel; GtkNotebook *notebook; @@ -5110,7 +5105,7 @@ l != NULL; l = l->next, i++) { - struct gaim_conversation *conv = l->data; + GaimConversation *conv = l->data; tab = GAIM_GTK_CONVERSATION(conv)->tab_label; if (!GTK_WIDGET_MAPPED(tab)) @@ -5151,11 +5146,11 @@ gpointer data) { GList *l; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *conv; + GaimGtkConversation *gtkconv; for (l = gaim_get_conversations(); l != NULL; l = l->next) { - conv = (struct gaim_conversation *)l->data; + conv = (GaimConversation *)l->data; if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; @@ -5174,11 +5169,11 @@ gpointer data) { GList *l; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *conv; + GaimGtkConversation *gtkconv; for (l = gaim_get_conversations(); l != NULL; l = l->next) { - conv = (struct gaim_conversation *)l->data; + conv = (GaimConversation *)l->data; if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; @@ -5195,13 +5190,13 @@ { #ifdef USE_GTKSPELL GList *cl; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *conv; + GaimGtkConversation *gtkconv; GtkSpell *spell; for (cl = gaim_get_conversations(); cl != NULL; cl = cl->next) { - conv = (struct gaim_conversation *)cl->data; + conv = (GaimConversation *)cl->data; if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; @@ -5223,11 +5218,11 @@ gpointer data) { GList *cl; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *conv; + GaimGtkConversation *gtkconv; for (cl = gaim_get_conversations(); cl != NULL; cl = cl->next) { - conv = (struct gaim_conversation *)cl->data; + conv = (GaimConversation *)cl->data; if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; @@ -5244,13 +5239,13 @@ { GList *l; GtkPositionType pos; - struct gaim_window *win; - struct gaim_gtk_window *gtkwin; + GaimWindow *win; + GaimGtkWindow *gtkwin; pos = GPOINTER_TO_INT(value); for (l = gaim_get_windows(); l != NULL; l = l->next) { - win = (struct gaim_window *)l->data; + win = (GaimWindow *)l->data; if (!GAIM_IS_GTK_WINDOW(win)) continue; @@ -5266,11 +5261,11 @@ gpointer value, gpointer data) { GList *l; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *conv; + GaimGtkConversation *gtkconv; for (l = gaim_get_ims(); l != NULL; l = l->next) { - conv = (struct gaim_conversation *)l->data; + conv = (GaimConversation *)l->data; gtkconv = GAIM_GTK_CONVERSATION(conv); setup_im_buttons(conv, gtk_widget_get_parent(gtkconv->send)); @@ -5288,11 +5283,11 @@ if (value) { for (l = gaim_get_ims(); l != NULL; l = l->next) - start_anim(NULL, (struct gaim_conversation *)l->data); + start_anim(NULL, (GaimConversation *)l->data); } else { for (l = gaim_get_ims(); l != NULL; l = l->next) - stop_anim(NULL, (struct gaim_conversation *)l->data); + stop_anim(NULL, (GaimConversation *)l->data); } } @@ -5312,16 +5307,16 @@ GtkWidget *parent; GaimConversationType conv_type = GAIM_CONV_CHAT; GSList *bcs; - struct gaim_conversation *conv; - struct gaim_gtk_conversation *gtkconv; - struct gaim_gtk_window *gtkwin; + GaimConversation *conv; + GaimGtkConversation *gtkconv; + GaimGtkWindow *gtkwin; for (l = gaim_connections_get_all(); l != NULL; l = l->next) { g = (GaimConnection *)l->data; for (bcs = g->buddy_chats; bcs != NULL; bcs = bcs->next) { - conv = (struct gaim_conversation *)bcs->data; + conv = (GaimConversation *)bcs->data; if (gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) continue;
--- a/src/gtkconv.h Mon Jun 02 21:14:50 2003 +0000 +++ b/src/gtkconv.h Mon Jun 02 21:51:06 2003 +0000 @@ -24,20 +24,23 @@ #ifndef _GAIM_GTK_CONVERSATION_H_ #define _GAIM_GTK_CONVERSATION_H_ +#include "conversation.h" + /************************************************************************** * @name Structures **************************************************************************/ +/*@{*/ -struct gaim_gtk_window; -struct gaim_gtk_conversation; -struct gaim_gtk_im_pane; -struct gaim_gtk_chat_pane; +typedef struct _GaimGtkWindow GaimGtkWindow; +typedef struct _GaimGtkImPane GaimGtkImPane; +typedef struct _GaimGtkChatPane GaimGtkChatPane; +typedef struct _GaimGtkConversation GaimGtkConversation; /** * A GTK+ representation of a graphical window containing one or more * conversations. */ -struct gaim_gtk_window +struct _GaimGtkWindow { GtkWidget *window; /**< The window. */ GtkWidget *notebook; /**< The notebook of conversations. */ @@ -71,7 +74,7 @@ /** * GTK+ Instant Message panes. */ -struct gaim_gtk_im_pane +struct _GaimGtkImPane { GtkWidget *warn; GtkWidget *block; @@ -94,7 +97,7 @@ /** * GTK+ Chat panes. */ -struct gaim_gtk_chat_pane +struct _GaimGtkChatPane { GtkWidget *count; GtkWidget *list; @@ -106,7 +109,7 @@ /** * A GTK+ conversation pane. */ -struct gaim_gtk_conversation +struct _GaimGtkConversation { gboolean make_sound; gboolean has_font; @@ -169,17 +172,17 @@ union { - struct gaim_gtk_im_pane *im; - struct gaim_gtk_chat_pane *chat; + GaimGtkImPane *im; + GaimGtkChatPane *chat; } u; }; #define GAIM_GTK_WINDOW(win) \ - ((struct gaim_gtk_window *)(win)->ui_data) + ((GaimGtkWindow *)(win)->ui_data) #define GAIM_GTK_CONVERSATION(conv) \ - ((struct gaim_gtk_conversation *)(conv)->ui_data) + ((GaimGtkConversation *)(conv)->ui_data) #define GAIM_IS_GTK_WINDOW(win) \ (gaim_window_get_ui_ops(win) == gaim_get_gtk_window_ui_ops()) @@ -187,6 +190,8 @@ #define GAIM_IS_GTK_CONVERSATION(conv) \ (gaim_conversation_get_ui_ops(conv) == gaim_get_gtk_conversation_ui_ops()) +/*@}*/ + /************************************************************************** * @name GTK+ Conversation API **************************************************************************/ @@ -202,21 +207,21 @@ * * @return The GTK window operations structure. */ -struct gaim_window_ui_ops *gaim_get_gtk_window_ui_ops(void); +GaimWindowUiOps *gaim_get_gtk_window_ui_ops(void); /** * Returns the UI operations structure for GTK conversations. * * @return The GTK conversation operations structure. */ -struct gaim_conversation_ui_ops *gaim_get_gtk_conversation_ui_ops(void); +GaimConversationUiOps *gaim_get_gtk_conversation_ui_ops(void); /** * Updates the buddy icon on a conversation. * * @param conv The conversation. */ -void gaim_gtkconv_update_buddy_icon(struct gaim_conversation *conv); +void gaim_gtkconv_update_buddy_icon(GaimConversation *conv); /** * Updates the font buttons on all conversations to reflect any changed @@ -230,7 +235,7 @@ * * @param conv The conversation to update. */ -void gaim_gtkconv_update_font_colors(struct gaim_conversation *conv); +void gaim_gtkconv_update_font_colors(GaimConversation *conv); /** * Updates the font faces of each conversation to the new font @@ -238,7 +243,7 @@ * * @param conv The conversation to update. */ -void gaim_gtkconv_update_font_face(struct gaim_conversation *conv); +void gaim_gtkconv_update_font_face(GaimConversation *conv); /** * Updates the tab positions on all conversation windows to reflect any @@ -263,7 +268,7 @@ * * @param conv The conversation. */ -void gaim_gtkconv_update_buttons_by_protocol(struct gaim_conversation *conv); +void gaim_gtkconv_update_buttons_by_protocol(GaimConversation *conv); /** * Returns the window at the specified X, Y location. @@ -275,7 +280,7 @@ * * @return The GTK+ window at the location, if it exists, or @c NULL otherwise. */ -struct gaim_window *gaim_gtkwin_get_at_xy(int x, int y); +GaimWindow *gaim_gtkwin_get_at_xy(int x, int y); /** * Returns the index of the tab at the specified X, Y location in a notebook. @@ -286,7 +291,7 @@ * * @return The index of the tab at the location. */ -int gaim_gtkconv_get_tab_at_xy(struct gaim_window *win, int x, int y); +int gaim_gtkconv_get_tab_at_xy(GaimWindow *win, int x, int y); /** * Returns the index of the destination tab at the @@ -301,7 +306,7 @@ * * @return The index of the tab at the location. */ -int gaim_gtkconv_get_dest_tab_at_xy(struct gaim_window *win, int x, int y); +int gaim_gtkconv_get_dest_tab_at_xy(GaimWindow *win, int x, int y); /*@}*/
--- a/src/gtkpounce.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/gtkpounce.c Mon Jun 02 21:51:06 2003 +0000 @@ -322,7 +322,7 @@ static void pounce_cb(struct gaim_pounce *pounce, GaimPounceEvent events, void *data) { - struct gaim_conversation *conv; + GaimConversation *conv; GaimAccount *account; struct gaim_gtkpounce_data *pounce_data; const char *pouncee;
--- a/src/gtkutils.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/gtkutils.c Mon Jun 02 21:51:06 2003 +0000 @@ -77,7 +77,7 @@ } static void -gaim_gtk_remove_tags(struct gaim_gtk_conversation *gtkconv, const char *tag) +gaim_gtk_remove_tags(GaimGtkConversation *gtkconv, const char *tag) { GtkTextIter start, end, m_start, m_end; @@ -111,7 +111,7 @@ } void -gaim_gtk_surround(struct gaim_gtk_conversation *gtkconv, +gaim_gtk_surround(GaimGtkConversation *gtkconv, const char *pre, const char *post) { GtkTextIter start, end; @@ -201,7 +201,7 @@ } void -gaim_gtk_advance_past(struct gaim_gtk_conversation *gtkconv, +gaim_gtk_advance_past(GaimGtkConversation *gtkconv, const char *pre, const char *post) { GtkTextIter current_pos, start, end; @@ -222,7 +222,7 @@ } void -gaim_gtk_set_font_face(struct gaim_gtk_conversation *gtkconv, +gaim_gtk_set_font_face(GaimGtkConversation *gtkconv, const char *font) { char *pre_fontface; @@ -247,7 +247,7 @@ static int des_save_icon(GtkObject *obj, GdkEvent *e, - struct gaim_gtk_conversation *gtkconv) + GaimGtkConversation *gtkconv) { gtk_widget_destroy(gtkconv->u.im->save_icon); gtkconv->u.im->save_icon = NULL; @@ -256,9 +256,9 @@ } static void -do_save_icon(GtkObject *obj, struct gaim_conversation *c) +do_save_icon(GtkObject *obj, GaimConversation *c) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; FILE *file; const char *f; @@ -290,7 +290,7 @@ } static void -cancel_save_icon(GtkObject *obj, struct gaim_gtk_conversation *gtkconv) +cancel_save_icon(GtkObject *obj, GaimGtkConversation *gtkconv) { gtk_widget_destroy(gtkconv->u.im->save_icon); gtkconv->u.im->save_icon = NULL; @@ -298,9 +298,9 @@ void -gaim_gtk_save_icon_dialog(GtkObject *obj, struct gaim_conversation *conv) +gaim_gtk_save_icon_dialog(GtkObject *obj, GaimConversation *conv) { - struct gaim_gtk_conversation *gtkconv; + GaimGtkConversation *gtkconv; char buf[BUF_LEN]; if (conv == NULL || gaim_conversation_get_type(conv) != GAIM_CONV_IM)
--- a/src/gtkutils.h Mon Jun 02 21:14:50 2003 +0000 +++ b/src/gtkutils.h Mon Jun 02 21:51:06 2003 +0000 @@ -44,7 +44,7 @@ * @param pre The prefix string. * @param post The postfix string. */ -void gaim_gtk_surround(struct gaim_gtk_conversation *gtkconv, +void gaim_gtk_surround(GaimGtkConversation *gtkconv, const char *pre, const char *post); /** @@ -54,7 +54,7 @@ * @param pre The prefix string. * @param post The postfix string. */ -void gaim_gtk_advance_past(struct gaim_gtk_conversation *gtkconv, +void gaim_gtk_advance_past(GaimGtkConversation *gtkconv, const char *pre, const char *post); /** @@ -63,7 +63,7 @@ * @param conv The conversation. * @param font The new font. */ -void gaim_gtk_set_font_face(struct gaim_gtk_conversation *gtkconv, +void gaim_gtk_set_font_face(GaimGtkConversation *gtkconv, const char *font); /** @@ -72,7 +72,7 @@ * @param obj @c NULL * @param conv The conversation. */ -void gaim_gtk_save_icon_dialog(GtkObject *obj, struct gaim_conversation *conv); +void gaim_gtk_save_icon_dialog(GtkObject *obj, GaimConversation *conv); /** * Returns the display style for buttons for the specified conversation
--- a/src/log.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/log.c Mon Jun 02 21:51:06 2003 +0000 @@ -27,7 +27,7 @@ void rm_log(struct log_conversation *a) { - struct gaim_conversation *cnv = gaim_find_conversation(a->name); + GaimConversation *cnv = gaim_find_conversation(a->name); /* Added the following if statements for sanity check */ if (!a) @@ -69,12 +69,12 @@ void update_log_convs() { GList *cnv; - struct gaim_conversation *c; - struct gaim_gtk_conversation *gtkconv; + GaimConversation *c; + GaimGtkConversation *gtkconv; for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { - c = (struct gaim_conversation *)cnv->data; + c = (GaimConversation *)cnv->data; if (!GAIM_IS_GTK_CONVERSATION(c)) continue; @@ -94,7 +94,7 @@ static void do_save_convo(GObject *obj, GtkWidget *wid) { - struct gaim_conversation *c = g_object_get_data(obj, "gaim_conversation"); + GaimConversation *c = g_object_get_data(obj, "gaim_conversation"); const char *filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(wid)); FILE *f; @@ -122,7 +122,7 @@ } -void save_convo(GtkWidget *save, struct gaim_conversation *c) +void save_convo(GtkWidget *save, GaimConversation *c) { char buf[BUF_LONG]; GtkWidget *window = gtk_file_selection_new(_("Gaim - Save Conversation"));
--- a/src/prpl.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/prpl.c Mon Jun 02 21:51:06 2003 +0000 @@ -220,7 +220,7 @@ void set_icon_data(GaimConnection *gc, const char *who, void *data, int len) { - struct gaim_conversation *conv; + GaimConversation *conv; struct icon_data tmp; GList *l; struct icon_data *id;
--- a/src/server.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/server.c Mon Jun 02 21:51:06 2003 +0000 @@ -99,7 +99,7 @@ GaimPluginProtocolInfo *prpl_info = NULL; while (gc->buddy_chats) { - struct gaim_conversation *b = gc->buddy_chats->data; + GaimConversation *b = gc->buddy_chats->data; gc->buddy_chats = g_slist_remove(gc->buddy_chats, b); @@ -189,7 +189,7 @@ int serv_send_im(GaimConnection *gc, char *name, char *message, int len, int flags) { - struct gaim_conversation *c; + GaimConversation *c; int val = -EINVAL; GaimPluginProtocolInfo *prpl_info = NULL; @@ -757,7 +757,7 @@ int plugin_return; int away = 0; - struct gaim_conversation *cnv; + GaimConversation *cnv; char *message, *name; @@ -1087,7 +1087,7 @@ if (loggedin) { if (!GAIM_BUDDY_IS_ONLINE(b)) { - struct gaim_conversation *c = gaim_find_conversation(b->name); + GaimConversation *c = gaim_find_conversation(b->name); if (c != NULL && gaim_prefs_get_bool("/core/conversations/im/show_login")) { @@ -1115,7 +1115,7 @@ } } else { if (GAIM_BUDDY_IS_ONLINE(b)) { - struct gaim_conversation *c = gaim_find_conversation(b->name); + GaimConversation *c = gaim_find_conversation(b->name); if (c != NULL && gaim_prefs_get_bool("/core/conversations/im/show_login")) { @@ -1173,8 +1173,8 @@ int state) { struct buddy *b; - struct gaim_conversation *cnv = gaim_find_conversation(name); - struct gaim_im *im; + GaimConversation *cnv = gaim_find_conversation(name); + GaimIm *im; if (!cnv) return; @@ -1198,8 +1198,8 @@ void serv_got_typing_stopped(GaimConnection *gc, const char *name) { - struct gaim_conversation *c = gaim_find_conversation(name); - struct gaim_im *im; + GaimConversation *c = gaim_find_conversation(name); + GaimIm *im; struct buddy *b; if (!c) @@ -1270,11 +1270,11 @@ G_CALLBACK(chat_invite_data_free)); } -struct gaim_conversation *serv_got_joined_chat(GaimConnection *gc, +GaimConversation *serv_got_joined_chat(GaimConnection *gc, int id, const char *name) { - struct gaim_conversation *b; - struct gaim_chat *chat; + GaimConversation *b; + GaimChat *chat; b = gaim_conversation_new(GAIM_CONV_CHAT, gc->account, name); chat = GAIM_CHAT(b); @@ -1320,11 +1320,11 @@ void serv_got_chat_left(GaimConnection *g, int id) { GSList *bcs; - struct gaim_conversation *conv = NULL; - struct gaim_chat *chat = NULL; + GaimConversation *conv = NULL; + GaimChat *chat = NULL; for (bcs = g->buddy_chats; bcs != NULL; bcs = bcs->next) { - conv = (struct gaim_conversation *)bcs->data; + conv = (GaimConversation *)bcs->data; chat = GAIM_CHAT(conv); @@ -1352,14 +1352,14 @@ { int w; GSList *bcs; - struct gaim_conversation *conv = NULL; - struct gaim_chat *chat = NULL; + GaimConversation *conv = NULL; + GaimChat *chat = NULL; char *buf; char *buffy, *angel; int plugin_return; for (bcs = g->buddy_chats; bcs != NULL; bcs = bcs->next) { - conv = (struct gaim_conversation *)bcs->data; + conv = (GaimConversation *)bcs->data; chat = GAIM_CHAT(conv);
--- a/src/themes.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/themes.c Mon Jun 02 21:51:06 2003 +0000 @@ -193,7 +193,7 @@ GList *cnv; for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { - struct gaim_conversation *conv = cnv->data; + GaimConversation *conv = cnv->data; if (GAIM_IS_GTK_CONVERSATION(conv)) smiley_themeize(GAIM_GTK_CONVERSATION(conv)->imhtml);
--- a/src/ui.h Mon Jun 02 21:14:50 2003 +0000 +++ b/src/ui.h Mon Jun 02 21:51:06 2003 +0000 @@ -257,22 +257,22 @@ extern void conv_show_log(GtkWidget *, gpointer); extern void chat_show_log(GtkWidget *, gpointer); extern void show_log(char *); -extern void show_log_dialog(struct gaim_conversation *); -extern void show_fgcolor_dialog(struct gaim_conversation *c, GtkWidget *color); -extern void show_bgcolor_dialog(struct gaim_conversation *c, GtkWidget *color); -extern void cancel_fgcolor(GtkWidget *widget, struct gaim_conversation *c); -extern void cancel_bgcolor(GtkWidget *widget, struct gaim_conversation *c); +extern void show_log_dialog(GaimConversation *); +extern void show_fgcolor_dialog(GaimConversation *c, GtkWidget *color); +extern void show_bgcolor_dialog(GaimConversation *c, GtkWidget *color); +extern void cancel_fgcolor(GtkWidget *widget, GaimConversation *c); +extern void cancel_bgcolor(GtkWidget *widget, GaimConversation *c); extern void create_away_mess(GtkWidget *, void *); extern void show_ee_dialog(int); -extern void show_insert_link(GtkWidget *,struct gaim_conversation *); -extern void show_smiley_dialog(struct gaim_conversation *, GtkWidget *); -extern void close_smiley_dialog(GtkWidget *widget, struct gaim_conversation *c); +extern void show_insert_link(GtkWidget *,GaimConversation *); +extern void show_smiley_dialog(GaimConversation *, GtkWidget *); +extern void close_smiley_dialog(GtkWidget *widget, GaimConversation *c); extern void set_smiley_array(GtkWidget *widget, int smiley_type); -extern void insert_smiley_text(GtkWidget *widget, struct gaim_conversation *c); -extern void cancel_log(GtkWidget *, struct gaim_conversation *); -extern void cancel_link(GtkWidget *, struct gaim_conversation *); -extern void show_font_dialog(struct gaim_conversation *c, GtkWidget *font); -extern void cancel_font(GtkWidget *widget, struct gaim_conversation *c); +extern void insert_smiley_text(GtkWidget *widget, GaimConversation *c); +extern void cancel_log(GtkWidget *, GaimConversation *); +extern void cancel_link(GtkWidget *, GaimConversation *); +extern void show_font_dialog(GaimConversation *c, GtkWidget *font); +extern void cancel_font(GtkWidget *widget, GaimConversation *c); extern void apply_font(GtkWidget *widget, GtkFontSelection *fontsel); extern void set_color_selection(GtkWidget *selection, GdkColor color); extern void show_rename_group(GtkWidget *, struct group *);
--- a/src/util.c Mon Jun 02 21:14:50 2003 +0000 +++ b/src/util.c Mon Jun 02 21:51:06 2003 +0000 @@ -1039,7 +1039,7 @@ /* aim:goim?screenname=screenname&message=message */ if (!g_ascii_strncasecmp(uri, "aim:goim?", strlen("aim:goim?"))) { char *who, *what; - struct gaim_conversation *c; + GaimConversation *c; uri = uri + strlen("aim:goim?"); if (!(who = strstr(uri, "screenname="))) { @@ -1071,7 +1071,7 @@ g_free(who); if (what) { - struct gaim_gtk_conversation *gtkconv = GAIM_GTK_CONVERSATION(c); + GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(c); gtk_text_buffer_insert_at_cursor(gtkconv->entry_buffer, what, -1); g_free(what);