# HG changeset patch # User Christian Hammond # Date 1043279219 0 # Node ID a8249a5250b69835b794ec72006bb31586ad17a4 # Parent ce3a0eba91ef52a52c1c323e7da3542bd4fc7234 [gaim-migrate @ 4667] Made use of the new GAIM_IS_GTK_WINDOW() and GAIM_IS_GTK_CONVERSATION() macros. committer: Tailor Script diff -r ce3a0eba91ef -r a8249a5250b6 src/gtkconv.c --- a/src/gtkconv.c Wed Jan 22 23:20:09 2003 +0000 +++ b/src/gtkconv.c Wed Jan 22 23:46:59 2003 +0000 @@ -4200,7 +4200,7 @@ conv = (struct gaim_conversation *)cl->data; - if (gaim_conversation_get_ops(conv) != gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -4221,7 +4221,7 @@ conv = (struct gaim_conversation *)cl->data; - if (gaim_conversation_get_ops(conv) != gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -4244,7 +4244,7 @@ conv = (struct gaim_conversation *)cl->data; - if (gaim_conversation_get_ops(conv) != gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -4335,7 +4335,7 @@ struct gaim_gtk_conversation *gtkconv; int delay; - if (gaim_conversation_get_ops(conv) != gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(conv)) return; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -4352,7 +4352,7 @@ { struct gaim_gtk_conversation *gtkconv; - if (gaim_conversation_get_ops(conv) != gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(conv)) return; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -4439,8 +4439,7 @@ GdkBitmap *bm; int sf = 0; - if (conv == NULL || - gaim_conversation_get_ops(conv) != gaim_get_gtk_conversation_ops() || + if (conv == NULL || !GAIM_IS_GTK_CONVERSATION(conv) || gaim_conversation_get_type(conv) != GAIM_CONV_IM) { return; @@ -4575,8 +4574,7 @@ for (l = gaim_get_ims(); l != NULL; l = l->next) { conv = (struct gaim_conversation *)l->data; - if (gaim_conversation_get_ops(conv) != - gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -4610,7 +4608,7 @@ for (l = gaim_get_windows(); l != NULL; l = l->next) { win = (struct gaim_window *)l->data; - if (gaim_window_get_ops(win) != gaim_get_gtk_window_ops()) + if (!GAIM_IS_GTK_WINDOW(win)) continue; gtkwin = GAIM_GTK_WINDOW(win); @@ -4641,8 +4639,7 @@ if (gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) continue; - if (gaim_conversation_get_ops(conv) != - gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(conv)) continue; gtkconv = GAIM_GTK_CONVERSATION(conv); @@ -4700,7 +4697,7 @@ struct gaim_gtk_conversation *gtkconv; struct gaim_connection *gc; - if (gaim_conversation_get_ops(conv) != gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(conv)) return; gc = gaim_conversation_get_gc(conv); @@ -4795,7 +4792,7 @@ for (l = gaim_get_windows(); l != NULL; l = l->next) { win = (struct gaim_window *)l->data; - if (gaim_window_get_ops(win) != gaim_get_gtk_window_ops()) + if (!GAIM_IS_GTK_WINDOW(win)) continue; gtkwin = GAIM_GTK_WINDOW(win); @@ -4818,7 +4815,7 @@ gint i, page_num = 0; gboolean first_visible = TRUE; - if (gaim_window_get_ops(win) != gaim_get_gtk_window_ops()) + if (!GAIM_IS_GTK_WINDOW(win)) return -1; gtkwin = GAIM_GTK_WINDOW(win); @@ -4885,7 +4882,7 @@ GtkWidget *tab; gint i, page_num = 0; - if (gaim_window_get_ops(win) != gaim_get_gtk_window_ops()) + if (!GAIM_IS_GTK_WINDOW(win)) return -1; gtkwin = GAIM_GTK_WINDOW(win); diff -r ce3a0eba91ef -r a8249a5250b6 src/gtkutils.c --- a/src/gtkutils.c Wed Jan 22 23:20:09 2003 +0000 +++ b/src/gtkutils.c Wed Jan 22 23:46:59 2003 +0000 @@ -301,7 +301,7 @@ if (conv == NULL || gaim_conversation_get_type(conv) != GAIM_CONV_IM) return; - if (gaim_conversation_get_ops(conv) != gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(conv)) return; gtkconv = GAIM_GTK_CONVERSATION(conv); diff -r ce3a0eba91ef -r a8249a5250b6 src/log.c --- a/src/log.c Wed Jan 22 23:20:09 2003 +0000 +++ b/src/log.c Wed Jan 22 23:46:59 2003 +0000 @@ -66,7 +66,7 @@ c = (struct gaim_conversation *)cnv->data; - if (gaim_conversation_get_ops(c) != gaim_get_gtk_conversation_ops()) + if (!GAIM_IS_GTK_CONVERSATION(c)) continue; gtkconv = GAIM_GTK_CONVERSATION(c); diff -r ce3a0eba91ef -r a8249a5250b6 src/server.c --- a/src/server.c Wed Jan 22 23:20:09 2003 +0000 +++ b/src/server.c Wed Jan 22 23:46:59 2003 +0000 @@ -95,7 +95,7 @@ gc->buddy_chats = g_slist_remove(gc->buddy_chats, b); /* TODO: Nuke the UI-specific code here. */ - if (gaim_conversation_get_ops(b) == gaim_get_gtk_conversation_ops()) + if (GAIM_IS_GTK_CONVERSATION(b)) gaim_gtkconv_update_buttons_by_protocol(b); } diff -r ce3a0eba91ef -r a8249a5250b6 src/themes.c --- a/src/themes.c Wed Jan 22 23:20:09 2003 +0000 +++ b/src/themes.c Wed Jan 22 23:46:59 2003 +0000 @@ -184,11 +184,8 @@ for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { struct gaim_conversation *conv = cnv->data; - if (gaim_conversation_get_ops(conv) == - gaim_get_gtk_conversation_ops()) { - + if (GAIM_IS_GTK_CONVERSATION(conv)) smiley_themeize(GAIM_GTK_CONVERSATION(conv)->imhtml); - } } }