# HG changeset patch # User Christian Hammond # Date 1055572710 0 # Node ID 52d5fad43950a3a226192c4fd6d5278f965d0ad0 # Parent 022786c7ab53f1bae726a6f9f0366221ce8f5fdd [gaim-migrate @ 6291] Fixed a couple of run-time type check warnings. committer: Tailor Script diff -r 022786c7ab53 -r 52d5fad43950 src/conversation.c --- a/src/conversation.c Sat Jun 14 06:06:40 2003 +0000 +++ b/src/conversation.c Sat Jun 14 06:38:30 2003 +0000 @@ -454,13 +454,13 @@ win = g_malloc0(sizeof(GaimWindow)); + windows = g_list_append(windows, win); + win->ui_ops = gaim_get_win_ui_ops(); if (win->ui_ops != NULL && win->ui_ops->new_window != NULL) win->ui_ops->new_window(win); - windows = g_list_append(windows, win); - return win; } diff -r 022786c7ab53 -r 52d5fad43950 src/gtkconv.c --- a/src/gtkconv.c Sat Jun 14 06:06:40 2003 +0000 +++ b/src/gtkconv.c Sat Jun 14 06:38:30 2003 +0000 @@ -2016,7 +2016,8 @@ conv = gaim_window_get_active_conversation(win); - g_return_val_if_fail(conv != NULL, FALSE); + if (conv == NULL) + return FALSE; account = gaim_conversation_get_account(conv); gtkwin = GAIM_GTK_WINDOW(win); @@ -3682,7 +3683,6 @@ if (gaim_window_get_conversation_count(win) == 1) g_timeout_add(0, (GSourceFunc)update_send_as_selection, win); - } static void