Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 15632:a830f9756f23
Some more pidgininfication
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Wed, 14 Feb 2007 02:35:35 +0000 |
parents | b6f9f5331a82 |
children | 0457791756e7 |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Wed Feb 14 02:28:44 2007 +0000 +++ b/pidgin/gtkconv.c Wed Feb 14 02:35:35 2007 +0000 @@ -218,7 +218,7 @@ if (!GTK_WIDGET_VISIBLE(w)) return FALSE; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) return FALSE; if (gtkconv->auto_resize) { @@ -2934,10 +2934,10 @@ gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Block...")); - win->menu.unblock = + win->menu.unblock = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Unblock...")); - + win->menu.add = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Add...")); @@ -4184,7 +4184,7 @@ g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", gtkconv); g_signal_connect_swapped(G_OBJECT(gtkconv->entry_buffer), "changed", G_CALLBACK(resize_imhtml_cb), gtkconv); - + g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event", G_CALLBACK(entry_key_press_cb), gtkconv); g_signal_connect_after(G_OBJECT(gtkconv->entry), "message_send", @@ -4795,7 +4795,7 @@ gboolean plugin_return; char *bracket; int tag_count = 0; - + g_return_if_fail(conv != NULL); gtkconv = PIDGIN_CONVERSATION(conv); g_return_if_fail(gtkconv != NULL); @@ -6000,7 +6000,7 @@ GaimBuddyIcon *icon; g_return_if_fail(conv != NULL); - g_return_if_fail(GAIM_IS_GTK_CONVERSATION(conv)); + g_return_if_fail(PIDGIN_IS_PIDGIN_CONVERSATION(conv)); g_return_if_fail(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM); gtkconv = PIDGIN_CONVERSATION(conv); @@ -6151,7 +6151,7 @@ { PidginWindow *win; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) return; win = PIDGIN_CONVERSATION(conv)->win; @@ -6240,7 +6240,7 @@ for (l = gaim_get_conversations(); l != NULL; l = l->next) { conv = (GaimConversation *)l->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) continue; gtkconv = PIDGIN_CONVERSATION(conv); @@ -6266,7 +6266,7 @@ conv = (GaimConversation *)cl->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) continue; gtkconv = PIDGIN_CONVERSATION(conv); @@ -6311,7 +6311,7 @@ { conv = (GaimConversation *)l->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) continue; gtkconv = PIDGIN_CONVERSATION(conv); @@ -6339,7 +6339,7 @@ { conv = (GaimConversation *)l->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) continue; gtkconv = PIDGIN_CONVERSATION(conv);