# HG changeset patch # User Christian Hammond # Date 1052200083 0 # Node ID 1f901484599d77ca2cc0e65e8a9c91005a4f277c # Parent 8d118c2b03c93f04aaca8f7d720d2bc3fe4873fe [gaim-migrate @ 5686] GTK_OBJECT -> G_OBJECT Also fixed a few compiler warnings. committer: Tailor Script diff -r 8d118c2b03c9 -r 1f901484599d plugins/chatlist.c --- a/plugins/chatlist.c Tue May 06 05:28:41 2003 +0000 +++ b/plugins/chatlist.c Tue May 06 05:48:03 2003 +0000 @@ -72,7 +72,7 @@ return; item = gtk_tree_item_new_with_label(_("Buddy Chat")); - g_signal_connect(GTK_OBJECT(item), "destroy", G_CALLBACK(des_item), NULL); + g_signal_connect(G_OBJECT(item), "destroy", G_CALLBACK(des_item), NULL); gtk_tree_append(GTK_TREE(buddies), item); gtk_tree_item_expand(GTK_TREE_ITEM(item)); gtk_widget_show(item); @@ -84,10 +84,10 @@ while (crs) { struct chat_room *cr = (struct chat_room *)crs->data; GtkWidget *titem = gtk_tree_item_new_with_label(cr->name); - gtk_object_set_user_data(GTK_OBJECT(titem), cr); + gtk_object_set_user_data(G_OBJECT(titem), cr); gtk_tree_append(GTK_TREE(tree), titem); gtk_widget_show(titem); - g_signal_connect(GTK_OBJECT(titem), "button_press_event", + g_signal_connect(G_OBJECT(titem), "button_press_event", G_CALLBACK(handle_click_chat), cr); crs = crs->next; } @@ -151,7 +151,7 @@ return; while (items) { - g_free(gtk_object_get_user_data(GTK_OBJECT(items->data))); + g_free(gtk_object_get_user_data(G_OBJECT(items->data))); items = items->next; } @@ -163,7 +163,7 @@ cr = g_new0(struct chat_room, 1); strcpy(cr->name, _("Gaim Chat")); cr->exchange = 4; - gtk_object_set_user_data(GTK_OBJECT(item), cr); + gtk_object_set_user_data(G_OBJECT(item), cr); gtk_widget_show(item); items = g_list_append(NULL, item); @@ -200,7 +200,7 @@ item = gtk_list_item_new_with_label(name); gtk_widget_show(item); items = g_list_append(items, item); - gtk_object_set_user_data(GTK_OBJECT(item), cr); + gtk_object_set_user_data(G_OBJECT(item), cr); g_free(name); } c++; @@ -221,7 +221,7 @@ GtkWidget *item; if (sel) { - cr = (struct chat_room *)gtk_object_get_user_data(GTK_OBJECT(sel->data)); + cr = (struct chat_room *)gtk_object_get_user_data(G_OBJECT(sel->data)); } else return; @@ -235,7 +235,7 @@ cr2 = g_new0(struct chat_room, 1); strcpy(cr2->name, cr->name); cr2->exchange = cr->exchange; - gtk_object_set_user_data(GTK_OBJECT(item), cr2); + gtk_object_set_user_data(G_OBJECT(item), cr2); gtk_widget_show(item); sel = g_list_append(NULL, item); gtk_list_append_items(GTK_LIST(cp->list2), sel); @@ -254,7 +254,7 @@ if (sel) { item = (GtkWidget *)sel->data; - cr = (struct chat_room *)gtk_object_get_user_data(GTK_OBJECT(item)); + cr = (struct chat_room *)gtk_object_get_user_data(G_OBJECT(item)); } else return; @@ -271,7 +271,7 @@ while (crs) { cr = (struct chat_room *)crs->data; item = gtk_list_item_new_with_label(cr->name); - gtk_object_set_user_data(GTK_OBJECT(item), cr); + gtk_object_set_user_data(G_OBJECT(item), cr); gtk_widget_show(item); gtk_list_append_items(GTK_LIST(cp->list2), g_list_append(NULL, item)); @@ -323,9 +323,9 @@ cp->list1 = list1; cp->list2 = list2; - g_signal_connect(GTK_OBJECT(ref_button), "clicked", G_CALLBACK(refresh_list), cp); - g_signal_connect(GTK_OBJECT(rem_button), "clicked", G_CALLBACK(remove_chat), cp); - g_signal_connect(GTK_OBJECT(add_button), "clicked", G_CALLBACK(add_chat), cp); + g_signal_connect(G_OBJECT(ref_button), "clicked", G_CALLBACK(refresh_list), cp); + g_signal_connect(G_OBJECT(rem_button), "clicked", G_CALLBACK(remove_chat), cp); + g_signal_connect(G_OBJECT(add_button), "clicked", G_CALLBACK(add_chat), cp); label = gtk_label_new(_("List of available chats")); @@ -348,14 +348,14 @@ cr = g_new0(struct chat_room, 1); strcpy(cr->name, _("Gaim Chat")); cr->exchange = 4; - gtk_object_set_user_data(GTK_OBJECT(item), cr); + gtk_object_set_user_data(G_OBJECT(item), cr); gtk_list_append_items(GTK_LIST(list1), g_list_append(NULL, item)); while (crs) { cr = (struct chat_room *)crs->data; item = gtk_list_item_new_with_label(cr->name); - gtk_object_set_user_data(GTK_OBJECT(item), cr); + gtk_object_set_user_data(G_OBJECT(item), cr); items = g_list_append(items, item); crs = crs->next; diff -r 8d118c2b03c9 -r 1f901484599d plugins/gtik.c --- a/plugins/gtik.c Tue May 06 05:28:41 2003 +0000 +++ b/plugins/gtik.c Tue May 06 05:48:03 2003 +0000 @@ -135,7 +135,7 @@ /*-----------------------------------------------------------------*/ void remove_self(GtkWidget *w, void *handle) { - gtk_signal_disconnect(GTK_OBJECT(applet), destroycb); + gtk_signal_disconnect(G_OBJECT(applet), destroycb); if (drawTimeID > 0) { g_source_remove(drawTimeID); } if (updateTimeID >0) { g_source_remove(updateTimeID); } gtk_widget_destroy(applet); @@ -735,11 +735,11 @@ gtk_box_pack_start_defaults( GTK_BOX(panel2), timeout_label ); gtk_box_pack_start_defaults( GTK_BOX(panel2), timeout_c ); - g_signal_connect_swapped(GTK_OBJECT(timeout_c), "changed",G_CALLBACK(changed_cb),GTK_OBJECT(pb)); + g_signal_connect_swapped(G_OBJECT(timeout_c), "changed",G_CALLBACK(changed_cb),G_OBJECT(pb)); - g_signal_connect( GTK_OBJECT(timeout_a),"value_changed", + g_signal_connect( G_OBJECT(timeout_a),"value_changed", G_CALLBACK(timeout_cb), timeout_c ); - g_signal_connect( GTK_OBJECT(timeout_c),"changed", + g_signal_connect( G_OBJECT(timeout_c),"changed", G_CALLBACK(timeout_cb), timeout_c ); gtk_spin_button_set_update_policy( GTK_SPIN_BUTTON(timeout_c), GTK_UPDATE_ALWAYS ); @@ -750,7 +750,7 @@ /* tik_syms var is her if want a default value */ gtk_entry_set_text(GTK_ENTRY(tik_syms_entry), props.tik_syms ? props.tik_syms : tik_syms); - g_signal_connect_swapped(GTK_OBJECT(tik_syms_entry), "changed",G_CALLBACK(changed_cb),GTK_OBJECT(pb)); + g_signal_connect_swapped(G_OBJECT(tik_syms_entry), "changed",G_CALLBACK(changed_cb),G_OBJECT(pb)); /* OUTPUT FORMAT and SCROLL DIRECTION */ @@ -767,18 +767,18 @@ if (strcmp(props.output,"default")!=0) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), TRUE); - g_signal_connect_swapped(GTK_OBJECT(check),"toggled", - G_CALLBACK(changed_cb),GTK_OBJECT(pb)); - g_signal_connect(GTK_OBJECT(check),"toggled", + g_signal_connect_swapped(G_OBJECT(check),"toggled", + G_CALLBACK(changed_cb),G_OBJECT(pb)); + g_signal_connect(G_OBJECT(check),"toggled", G_CALLBACK(toggle_output_cb),NULL); /* Set the checkbox according to current prefs */ if (strcmp(props.scroll,"right2left")!=0) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check2), TRUE); - g_signal_connect_swapped(GTK_OBJECT(check2),"toggled", - G_CALLBACK(changed_cb),GTK_OBJECT(pb)); - g_signal_connect(GTK_OBJECT(check2),"toggled", + g_signal_connect_swapped(G_OBJECT(check2),"toggled", + G_CALLBACK(changed_cb),G_OBJECT(pb)); + g_signal_connect(G_OBJECT(check2),"toggled", G_CALLBACK(toggle_scroll_cb),NULL); /* COLOR */ @@ -790,7 +790,7 @@ gnome_color_picker_set_i8(GNOME_COLOR_PICKER (upColor), ur, ug, ub, 255); - g_signal_connect(GTK_OBJECT(upColor), "color_set", + g_signal_connect(G_OBJECT(upColor), "color_set", G_CALLBACK(ucolor_set_cb), NULL); gtk_box_pack_start_defaults( GTK_BOX(panela), upLabel ); @@ -804,7 +804,7 @@ gnome_color_picker_set_i8(GNOME_COLOR_PICKER (downColor), dr, dg, db, 255); - g_signal_connect(GTK_OBJECT(downColor), "color_set", + g_signal_connect(G_OBJECT(downColor), "color_set", G_CALLBACK(dcolor_set_cb), NULL); gtk_box_pack_start_defaults( GTK_BOX(panela), downLabel ); @@ -830,11 +830,11 @@ gtk_container_add(GTK_CONTAINER(pb), vbox); - g_signal_connect_swapped(GTK_OBJECT(tik_syms_entry), + g_signal_connect_swapped(G_OBJECT(tik_syms_entry), "changed",G_CALLBACK(changed_cb), - GTK_OBJECT(pb)); + G_OBJECT(pb)); - g_signal_connect(GTK_OBJECT(pb), "apply", + g_signal_connect(G_OBJECT(pb), "apply", G_CALLBACK(apply_cb), NULL); gtk_widget_show_all(pb); @@ -869,14 +869,14 @@ /* applet_widget_add (APPLET_WIDGET (applet), vbox); */ gtk_container_add(GTK_CONTAINER(applet), vbox); - g_signal_connect(GTK_OBJECT(drawing_area),"expose_event", + g_signal_connect(G_OBJECT(drawing_area),"expose_event", (GtkSignalFunc) expose_event, NULL); - g_signal_connect(GTK_OBJECT(drawing_area),"configure_event", + g_signal_connect(G_OBJECT(drawing_area),"configure_event", (GtkSignalFunc) configure_event, NULL); - destroycb = g_signal_connect(GTK_OBJECT(applet), "destroy", + destroycb = g_signal_connect(G_OBJECT(applet), "destroy", G_CALLBACK(remove_self), handle); @@ -917,7 +917,7 @@ /* JHACK */ /*-----------------------------------------------------------------*/ void gaim_plugin_remove() { - gtk_signal_disconnect(GTK_OBJECT(applet), destroycb); + gtk_signal_disconnect(G_OBJECT(applet), destroycb); if (drawTimeID > 0) { g_source_remove(drawTimeID); } if (updateTimeID >0) { g_source_remove(updateTimeID); } gtk_widget_destroy(applet); diff -r 8d118c2b03c9 -r 1f901484599d plugins/idle.c --- a/plugins/idle.c Tue May 06 05:28:41 2003 +0000 +++ b/plugins/idle.c Tue May 06 05:48:03 2003 +0000 @@ -46,7 +46,7 @@ while (c) { g = (struct gaim_connection *)c->data; opt = gtk_menu_item_new_with_label(g->username); - g_signal_connect(GTK_OBJECT(opt), "activate", + g_signal_connect(G_OBJECT(opt), "activate", G_CALLBACK(sel_gc), g); gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); gtk_widget_show(opt); @@ -103,7 +103,7 @@ button = gtk_button_new_with_mnemonic(_("_Set")); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_idle), spinner); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_idle), spinner); gtk_widget_show_all(ret); diff -r 8d118c2b03c9 -r 1f901484599d plugins/mailchk.c --- a/plugins/mailchk.c Tue May 06 05:28:41 2003 +0000 +++ b/plugins/mailchk.c Tue May 06 05:48:03 2003 +0000 @@ -68,7 +68,7 @@ mail = gtk_label_new("No mail messages."); gtk_box_pack_start(GTK_BOX(vbox), mail, FALSE, FALSE, 0); gtk_box_reorder_child(GTK_BOX(vbox), mail, 1); - g_signal_connect(GTK_OBJECT(mail), "destroy", G_CALLBACK(destroy_cb), NULL); + g_signal_connect(G_OBJECT(mail), "destroy", G_CALLBACK(destroy_cb), NULL); gtk_widget_show(mail); } diff -r 8d118c2b03c9 -r 1f901484599d plugins/raw.c --- a/plugins/raw.c Tue May 06 05:28:41 2003 +0000 +++ b/plugins/raw.c Tue May 06 05:48:03 2003 +0000 @@ -110,7 +110,7 @@ gc = c; g_snprintf(buf, sizeof buf, "%s (%s)", c->username, c->prpl->name); opt = gtk_menu_item_new_with_label(buf); - g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(set_gc), c); + g_signal_connect(G_OBJECT(opt), "activate", G_CALLBACK(set_gc), c); gtk_widget_show(opt); gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); } @@ -131,7 +131,7 @@ gaim_signal_connect(h, event_signoff, redo_optmenu, me); window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(GTK_OBJECT(window), "delete_event", G_CALLBACK(goodbye), NULL); + g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(goodbye), NULL); hbox = gtk_hbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(window), hbox); @@ -143,7 +143,7 @@ entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(entry), "activate", G_CALLBACK(send_it), NULL); + g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(send_it), NULL); gtk_widget_show_all(window); diff -r 8d118c2b03c9 -r 1f901484599d plugins/timestamp.c --- a/plugins/timestamp.c Tue May 06 05:28:41 2003 +0000 +++ b/plugins/timestamp.c Tue May 06 05:48:03 2003 +0000 @@ -91,7 +91,7 @@ button = gtk_button_new_with_mnemonic(_("_Apply")); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_timestamp), spinner); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_timestamp), spinner); gtk_widget_show_all(ret); return ret; diff -r 8d118c2b03c9 -r 1f901484599d src/away.c --- a/src/away.c Tue May 06 05:28:41 2003 +0000 +++ b/src/away.c Tue May 06 05:48:03 2003 +0000 @@ -280,7 +280,7 @@ back = gaim_pixbuf_button_from_stock(_("I'm Back!"), GTK_STOCK_JUMP_TO, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_start(GTK_BOX(vbox), back, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(back), "clicked", G_CALLBACK(do_im_back), imaway); + g_signal_connect(G_OBJECT(back), "clicked", G_CALLBACK(do_im_back), imaway); gtk_window_set_focus(GTK_WINDOW(imaway), back); gtk_widget_show(back); @@ -383,7 +383,7 @@ menuitem = gtk_menu_item_new_with_label(_("New Away Message")); gtk_menu_shell_append(GTK_MENU_SHELL(awaymenu), menuitem); gtk_widget_show(menuitem); - g_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(create_away_mess), + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(create_away_mess), NULL); awy = away_messages; @@ -393,7 +393,7 @@ remitem = gtk_menu_item_new_with_label(a->name); gtk_menu_shell_append(GTK_MENU_SHELL(remmenu), remitem); gtk_widget_show(remitem); - g_signal_connect(GTK_OBJECT(remitem), "activate", + g_signal_connect(G_OBJECT(remitem), "activate", G_CALLBACK(rem_away_mess), a); awy = g_slist_next(awy); @@ -444,7 +444,7 @@ g_object_set_data(G_OBJECT(menuitem), "away_message", a); gtk_menu_shell_append(GTK_MENU_SHELL(awaymenu), menuitem); gtk_widget_show(menuitem); - g_signal_connect(GTK_OBJECT(menuitem), "activate", + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(do_away_message), a); awy = g_slist_next(awy); @@ -459,7 +459,7 @@ gtk_widget_show(menuitem); if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) { - g_signal_connect(GTK_OBJECT(menuitem), "activate", + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(set_gc_state), gc); } else { submenu = gtk_menu_new(); @@ -476,7 +476,7 @@ gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem); gtk_widget_show(menuitem); - g_signal_connect(GTK_OBJECT(menuitem), + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK (do_away_message), a); @@ -530,7 +530,7 @@ menuitem = gtk_menu_item_new_with_label(_("Back")); gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem); gtk_widget_show(menuitem); - g_signal_connect(GTK_OBJECT(menuitem), "activate", + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(set_gc_away), gc); gaim_separator(submenu); @@ -544,7 +544,7 @@ g_object_set_data(G_OBJECT(menuitem), "away_message", a); gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem); gtk_widget_show(menuitem); - g_signal_connect(GTK_OBJECT(menuitem), "activate", + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(set_gc_away), gc); awy = g_slist_next(awy); @@ -560,7 +560,7 @@ gtk_widget_show(menuitem); if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) { - g_signal_connect(GTK_OBJECT(menuitem), + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(set_gc_state), gc); @@ -581,7 +581,7 @@ gtk_menu_shell_append(GTK_MENU_SHELL(submenu2), menuitem); gtk_widget_show(menuitem); - g_signal_connect(GTK_OBJECT(menuitem), + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK (set_gc_away), gc); @@ -614,7 +614,7 @@ g_object_set_data(G_OBJECT(menuitem), "away_message", a); gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem); gtk_widget_show(menuitem); - g_signal_connect(GTK_OBJECT(menuitem), "activate", + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(do_away_message), a); awy = g_slist_next(awy); diff -r 8d118c2b03c9 -r 1f901484599d src/dialogs.c --- a/src/dialogs.c Tue May 06 05:28:41 2003 +0000 +++ b/src/dialogs.c Tue May 06 05:48:03 2003 +0000 @@ -759,7 +759,7 @@ opt = gtk_menu_item_new_with_label(buf); g_object_set_data(G_OBJECT(opt), "getuserinfo", info); - g_signal_connect(GTK_OBJECT(opt), "activate", + g_signal_connect(G_OBJECT(opt), "activate", G_CALLBACK(show_info_select_account), c); gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); @@ -861,7 +861,7 @@ opt = gtk_menu_item_new_with_label(buf); g_object_set_data(G_OBJECT(opt), "getuserinfo", info); - g_signal_connect(GTK_OBJECT(opt), "activate", + g_signal_connect(G_OBJECT(opt), "activate", G_CALLBACK(show_info_select_account), c); gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); @@ -1056,7 +1056,7 @@ c->username, c->prpl->info->name); opt = gtk_menu_item_new_with_label(buf); g_object_set_data(G_OBJECT(opt), "addbuddy", b); - g_signal_connect(GTK_OBJECT(opt), "activate", + g_signal_connect(G_OBJECT(opt), "activate", G_CALLBACK(addbuddy_select_account), c); gtk_widget_show(opt); @@ -1127,8 +1127,8 @@ hbox = gtk_hbox_new(FALSE, 6); gtk_container_add(GTK_CONTAINER(vbox), hbox); - g_signal_connect(GTK_OBJECT(a->window), "destroy", G_CALLBACK(destroy_dialog), a->window); - g_signal_connect(GTK_OBJECT(a->window), "destroy", G_CALLBACK(free_dialog), a); + g_signal_connect(G_OBJECT(a->window), "destroy", G_CALLBACK(destroy_dialog), a->window); + g_signal_connect(G_OBJECT(a->window), "destroy", G_CALLBACK(free_dialog), a); dialogwindows = g_list_prepend(dialogwindows, a->window); table = gtk_table_new(4, 2, FALSE); @@ -1345,7 +1345,7 @@ c->username, c->prpl->info->name); opt = gtk_menu_item_new_with_label(buf); g_object_set_data(G_OBJECT(opt), "addchat", ac); - g_signal_connect(GTK_OBJECT(opt), "activate", + g_signal_connect(G_OBJECT(opt), "activate", G_CALLBACK(addchat_select_account), c); gtk_widget_show(opt); @@ -1527,7 +1527,7 @@ GTK_RADIO_BUTTON(set)), label); - g_signal_connect(GTK_OBJECT(opt), "toggled", G_CALLBACK(set_deny_mode), (void *)which); + g_signal_connect(G_OBJECT(opt), "toggled", G_CALLBACK(set_deny_mode), (void *)which); gtk_widget_show(opt); if (current_deny_gc->account->permdeny == which) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(opt), TRUE); @@ -1657,7 +1657,7 @@ g_snprintf(buf, sizeof buf, "%s (%s)", gc->username, gc->prpl->info->name); opt = gtk_menu_item_new_with_label(buf); - g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(deny_gc_opt), gc); + g_signal_connect(G_OBJECT(opt), "activate", G_CALLBACK(deny_gc_opt), gc); gtk_widget_show(opt); gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); if (gc == current_deny_gc) @@ -1805,7 +1805,7 @@ gtk_window_set_resizable(GTK_WINDOW(pwin), FALSE); gtk_window_set_role(GTK_WINDOW(pwin), "privacy"); gtk_window_set_title(GTK_WINDOW(pwin), _("Privacy")); - g_signal_connect(GTK_OBJECT(pwin), "destroy", G_CALLBACK(destroy_privacy), NULL); + g_signal_connect(G_OBJECT(pwin), "destroy", G_CALLBACK(destroy_privacy), NULL); gtk_widget_realize(pwin); gtk_widget_set_size_request(pwin, -1, 400); @@ -1830,7 +1830,7 @@ deny_opt_menu = gtk_option_menu_new(); gtk_box_pack_start(GTK_BOX(deny_conn_hbox), deny_opt_menu, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(deny_opt_menu), "destroy", G_CALLBACK(des_deny_opt), NULL); + g_signal_connect(G_OBJECT(deny_opt_menu), "destroy", G_CALLBACK(des_deny_opt), NULL); gtk_widget_show(deny_opt_menu); build_deny_menu(); @@ -1878,13 +1878,13 @@ button = gtk_button_new_from_stock(GTK_STOCK_ADD); gtk_size_group_add_widget(sg2, button); gtk_widget_show(button); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_add), (void *)TRUE); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pref_deny_add), (void *)TRUE); gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); gtk_size_group_add_widget(sg2, button); gtk_widget_show(button); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_rem), (void *)TRUE); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pref_deny_rem), (void *)TRUE); gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); deny_type = deny_opt(_("Deny all users"), 2, deny_type); @@ -1920,13 +1920,13 @@ button = gtk_button_new_from_stock(GTK_STOCK_ADD); gtk_size_group_add_widget(sg2, button); gtk_widget_show(button); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_add), FALSE); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pref_deny_add), FALSE); gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); gtk_size_group_add_widget(sg2, button); gtk_widget_show(button); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_rem), FALSE); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pref_deny_rem), FALSE); gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); sep = gtk_hseparator_new(); @@ -1939,7 +1939,7 @@ close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_end(GTK_BOX(hbox), close_button, FALSE, FALSE, 0); - g_signal_connect_swapped(GTK_OBJECT(close_button), "clicked", G_CALLBACK(gtk_widget_destroy), pwin); + g_signal_connect_swapped(G_OBJECT(close_button), "clicked", G_CALLBACK(gtk_widget_destroy), pwin); gtk_widget_show(close_button); gtk_widget_show(pwin); @@ -2007,7 +2007,7 @@ gtk_window_set_role(GTK_WINDOW(b->window), "set_dir"); gtk_window_set_resizable(GTK_WINDOW(b->window), TRUE); gtk_window_set_title(GTK_WINDOW(b->window), _("Set Directory Info")); - g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); gtk_widget_realize(b->window); fbox = gtk_vbox_new(FALSE, 5); @@ -2139,11 +2139,11 @@ b->save = gaim_pixbuf_button_from_stock(_("Save"), GTK_STOCK_SAVE, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(bot), b->save, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(b->save), "clicked", G_CALLBACK(do_set_dir), b); + g_signal_connect(G_OBJECT(b->save), "clicked", G_CALLBACK(do_set_dir), b); b->cancel = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(bot), b->cancel, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window); gtk_window_set_focus(GTK_WINDOW(b->window), b->first); @@ -2192,7 +2192,7 @@ gtk_window_set_resizable(GTK_WINDOW(b->window), TRUE); gtk_window_set_role(GTK_WINDOW(b->window), "change_passwd"); gtk_window_set_title(GTK_WINDOW(b->window), _("Change Password")); - g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); gtk_widget_realize(b->window); dialogwindows = g_list_prepend(dialogwindows, b->window); @@ -2250,11 +2250,11 @@ b->ok = gaim_pixbuf_button_from_stock(_("OK"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), b->ok, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(b->ok), "clicked", G_CALLBACK(do_change_password), b); + g_signal_connect(G_OBJECT(b->ok), "clicked", G_CALLBACK(do_change_password), b); b->cancel = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), b->cancel, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window); gtk_widget_show_all(b->window); } @@ -2277,7 +2277,7 @@ gtk_window_set_role(GTK_WINDOW(b->window), "set_info"); dialogwindows = g_list_prepend(dialogwindows, b->window); gtk_window_set_title(GTK_WINDOW(b->window), _("Set User Info")); - g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); gtk_widget_realize(b->window); vbox = gtk_vbox_new(FALSE, 5); @@ -2310,11 +2310,11 @@ b->save = gaim_pixbuf_button_from_stock(_("Save"), GTK_STOCK_SAVE, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(buttons), b->save, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(b->save), "clicked", G_CALLBACK(do_save_info), b); + g_signal_connect(G_OBJECT(b->save), "clicked", G_CALLBACK(do_save_info), b); b->cancel = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(buttons), b->cancel, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window); gtk_widget_show_all(b->window); } @@ -2361,7 +2361,7 @@ gtk_window_set_title(GTK_WINDOW(b->window), "Gaim"); gtk_container_set_border_width(GTK_CONTAINER(b->window), 5); gtk_widget_realize(GTK_WIDGET(b->window)); - g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(info_dlg_free), b); + g_signal_connect(G_OBJECT(b->window), "destroy", G_CALLBACK(info_dlg_free), b); bbox = gtk_vbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(b->window), bbox); @@ -2381,8 +2381,8 @@ gaim_setup_imhtml(text); ok = gaim_pixbuf_button_from_stock(_("OK"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL); - g_signal_connect_swapped(GTK_OBJECT(ok), "clicked", G_CALLBACK(gtk_widget_destroy), - GTK_OBJECT(b->window)); + g_signal_connect_swapped(G_OBJECT(ok), "clicked", G_CALLBACK(gtk_widget_destroy), + G_OBJECT(b->window)); gtk_box_pack_start(GTK_BOX(bbox), ok, FALSE, FALSE, 0); gtk_widget_show_all(b->window); @@ -2499,10 +2499,10 @@ /* Handle closes right */ - g_signal_connect(GTK_OBJECT(p->window), "destroy", G_CALLBACK(destroy_dialog), p->window); - g_signal_connect(GTK_OBJECT(cancel), "clicked", G_CALLBACK(destroy_dialog), p->window); - g_signal_connect(GTK_OBJECT(add), "clicked", G_CALLBACK(do_add_perm), p); - g_signal_connect(GTK_OBJECT(p->entry), "activate", G_CALLBACK(do_add_perm), p); + g_signal_connect(G_OBJECT(p->window), "destroy", G_CALLBACK(destroy_dialog), p->window); + g_signal_connect(G_OBJECT(cancel), "clicked", G_CALLBACK(destroy_dialog), p->window); + g_signal_connect(G_OBJECT(add), "clicked", G_CALLBACK(do_add_perm), p); + g_signal_connect(G_OBJECT(p->entry), "activate", G_CALLBACK(do_add_perm), p); /* Finish up */ if (permit) @@ -2753,9 +2753,9 @@ gtk_box_pack_start(GTK_BOX(fbox), frame, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(fbox), bbox, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); - g_signal_connect(GTK_OBJECT(cancel), "clicked", G_CALLBACK(destroy_dialog), b->window); - g_signal_connect(GTK_OBJECT(ok), "clicked", G_CALLBACK(do_find_info), b); + g_signal_connect(G_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(cancel), "clicked", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(ok), "clicked", G_CALLBACK(do_find_info), b); gtk_window_set_title(GTK_WINDOW(b->window), _("Find Buddy By Info")); gtk_window_set_focus(GTK_WINDOW(b->window), b->firstentry); @@ -2783,7 +2783,7 @@ gtk_window_set_role(GTK_WINDOW(b->window), "find_email"); gtk_widget_realize(b->window); dialogwindows = g_list_prepend(dialogwindows, b->window); - g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window); gtk_window_set_title(GTK_WINDOW(b->window), _("Find Buddy By Email")); vbox = gtk_vbox_new(FALSE, 5); @@ -2802,18 +2802,18 @@ b->emailentry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(topbox), b->emailentry, TRUE, TRUE, 0); - g_signal_connect(GTK_OBJECT(b->emailentry), "activate", G_CALLBACK(do_find_email), b); + g_signal_connect(G_OBJECT(b->emailentry), "activate", G_CALLBACK(do_find_email), b); gtk_window_set_focus(GTK_WINDOW(b->window), b->emailentry); bbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); button = gaim_pixbuf_button_from_stock(_("OK"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_find_email), b); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(do_find_email), b); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); button = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), b->window); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), b->window); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); gtk_widget_show_all(b->window); @@ -3077,11 +3077,11 @@ fgcseld = gtk_color_selection_dialog_new(_("Select Text Color")); gtk_color_selection_set_current_color(GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), &fgcolor); - g_signal_connect(GTK_OBJECT(fgcseld), "delete_event", + g_signal_connect(G_OBJECT(fgcseld), "delete_event", G_CALLBACK(destroy_colorsel), (void *)1); - g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->cancel_button), + g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->cancel_button), "clicked", G_CALLBACK(destroy_colorsel), (void *)1); - g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->ok_button), "clicked", + g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->ok_button), "clicked", G_CALLBACK(apply_color_dlg), (void *)1); gtk_widget_realize(fgcseld); gtk_widget_show(fgcseld); @@ -3096,11 +3096,11 @@ gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &fgcolor); g_object_set_data(G_OBJECT(colorsel), "gaim_conversation", c); - g_signal_connect(GTK_OBJECT(gtkconv->dialogs.fg_color), "delete_event", + g_signal_connect(G_OBJECT(gtkconv->dialogs.fg_color), "delete_event", G_CALLBACK(delete_event_dialog), c); - g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(gtkconv->dialogs.fg_color)->ok_button), + g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(gtkconv->dialogs.fg_color)->ok_button), "clicked", G_CALLBACK(do_fgcolor), colorsel); - g_signal_connect(GTK_OBJECT + g_signal_connect(G_OBJECT (GTK_COLOR_SELECTION_DIALOG(gtkconv->dialogs.fg_color)->cancel_button), "clicked", G_CALLBACK(cancel_fgcolor), c); @@ -3125,11 +3125,11 @@ bgcseld = gtk_color_selection_dialog_new(_("Select Background Color")); gtk_color_selection_set_current_color(GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), &bgcolor); - g_signal_connect(GTK_OBJECT(bgcseld), "delete_event", + g_signal_connect(G_OBJECT(bgcseld), "delete_event", G_CALLBACK(destroy_colorsel), NULL); - g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->cancel_button), + g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->cancel_button), "clicked", G_CALLBACK(destroy_colorsel), NULL); - g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->ok_button), "clicked", + g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->ok_button), "clicked", G_CALLBACK(apply_color_dlg), (void *)2); gtk_widget_realize(bgcseld); gtk_widget_show(bgcseld); @@ -3144,11 +3144,11 @@ gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &bgcolor); g_object_set_data(G_OBJECT(colorsel), "gaim_conversation", c); - g_signal_connect(GTK_OBJECT(gtkconv->dialogs.bg_color), "delete_event", + g_signal_connect(G_OBJECT(gtkconv->dialogs.bg_color), "delete_event", G_CALLBACK(delete_event_dialog), c); - g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(gtkconv->dialogs.bg_color)->ok_button), + g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(gtkconv->dialogs.bg_color)->ok_button), "clicked", G_CALLBACK(do_bgcolor), colorsel); - g_signal_connect(GTK_OBJECT + g_signal_connect(G_OBJECT (GTK_COLOR_SELECTION_DIALOG(gtkconv->dialogs.bg_color)->cancel_button), "clicked", G_CALLBACK(cancel_bgcolor), c); @@ -3233,11 +3233,11 @@ DEFAULT_FONT_FACE " 12"); } - g_signal_connect(GTK_OBJECT(fontseld), "delete_event", + g_signal_connect(G_OBJECT(fontseld), "delete_event", G_CALLBACK(destroy_fontsel), NULL); - g_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->cancel_button), + g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->cancel_button), "clicked", G_CALLBACK(destroy_fontsel), NULL); - g_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->ok_button), "clicked", + g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->ok_button), "clicked", G_CALLBACK(apply_font_dlg), fontseld); gtk_widget_realize(fontseld); gtk_widget_show(fontseld); @@ -3259,11 +3259,11 @@ DEFAULT_FONT_FACE); } - g_signal_connect(GTK_OBJECT(gtkconv->dialogs.font), "delete_event", + g_signal_connect(G_OBJECT(gtkconv->dialogs.font), "delete_event", G_CALLBACK(delete_event_dialog), c); - g_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(gtkconv->dialogs.font)->ok_button), + g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(gtkconv->dialogs.font)->ok_button), "clicked", G_CALLBACK(apply_font), gtkconv->dialogs.font); - g_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(gtkconv->dialogs.font)->cancel_button), + g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(gtkconv->dialogs.font)->cancel_button), "clicked", G_CALLBACK(cancel_font), c); gtk_widget_realize(gtkconv->dialogs.font); @@ -3387,7 +3387,7 @@ gtk_container_set_border_width(GTK_CONTAINER(ca->window), 5); gtk_window_set_role(GTK_WINDOW(ca->window), "away_mess"); gtk_window_set_title(GTK_WINDOW(ca->window), _("New away message")); - g_signal_connect(GTK_OBJECT(ca->window), "delete_event", + g_signal_connect(G_OBJECT(ca->window), "delete_event", G_CALLBACK(destroy_dialog), ca->window); gtk_widget_realize(ca->window); @@ -3446,19 +3446,19 @@ gtk_box_pack_start(GTK_BOX(tbox), hbox, FALSE, FALSE, 0); button = gaim_pixbuf_button_from_stock(_("Save"), GTK_STOCK_SAVE, GAIM_BUTTON_HORIZONTAL); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(save_away_mess), ca); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(save_away_mess), ca); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); button = gaim_pixbuf_button_from_stock(_("Save & Use"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(su_away_mess), ca); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(su_away_mess), ca); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); button = gaim_pixbuf_button_from_stock(_("Use"), GTK_STOCK_EXECUTE, GAIM_BUTTON_HORIZONTAL); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(use_away_mess), ca); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(use_away_mess), ca); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); button = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), ca->window); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), ca->window); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show_all(ca->window); @@ -3876,14 +3876,14 @@ name ? normalize(name) : "system", name ? ".log" : ""); filesel = gtk_file_selection_new(_("Save Log File")); - g_signal_connect(GTK_OBJECT(filesel), "delete_event", + g_signal_connect(G_OBJECT(filesel), "delete_event", G_CALLBACK(destroy_dialog), filesel); gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(filesel)); gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), buf); - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked", G_CALLBACK(do_save_log), filesel); - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), "clicked", G_CALLBACK(destroy_dialog), filesel); g_object_set_data(G_OBJECT(filesel), "name", name); @@ -3927,7 +3927,7 @@ gtk_window_set_title(GTK_WINDOW(window), _("Clear Log")); gtk_container_set_border_width(GTK_CONTAINER(window), 10); gtk_window_set_resizable(GTK_WINDOW(window), TRUE); - g_signal_connect(GTK_OBJECT(window), "delete_event", G_CALLBACK(destroy_dialog), window); + g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(destroy_dialog), window); gtk_widget_realize(window); box = gtk_vbox_new(FALSE, 5); @@ -3945,12 +3945,12 @@ button = gaim_pixbuf_button_from_stock(_("OK"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL); g_object_set_data(G_OBJECT(button), "log_window", g_object_get_data(G_OBJECT(w), "log_window")); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_clear_log_file), name); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), window); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(do_clear_log_file), name); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), window); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); button = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), window); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), window); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); gtk_widget_show_all(window); @@ -3990,7 +3990,7 @@ gtk_widget_set_sensitive(view->bbox, FALSE); g_signal_handlers_disconnect_by_func(G_OBJECT(view->window), G_CALLBACK(destroy_dialog), view->window); - block = g_signal_connect(GTK_OBJECT(view->window), "delete_event", + block = g_signal_connect(G_OBJECT(view->window), "delete_event", G_CALLBACK(dont_destroy), view->window); fseek(fp, view->offset, SEEK_SET); @@ -4027,7 +4027,7 @@ gtk_widget_set_sensitive(view->bbox, TRUE); g_signal_handler_disconnect(G_OBJECT(view->window), block); - g_signal_connect(GTK_OBJECT(view->window), "delete_event", + g_signal_connect(G_OBJECT(view->window), "delete_event", G_CALLBACK(destroy_dialog), view->window); g_string_free(string, TRUE); fclose(fp); @@ -4114,7 +4114,7 @@ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); g_object_set_data(G_OBJECT(window), "name", name); - g_signal_connect(GTK_OBJECT(window), "destroy", G_CALLBACK(des_log_win), NULL); + g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(des_log_win), NULL); gtk_window_set_role(GTK_WINDOW(window), "log"); if (name) g_snprintf(buf, BUF_LONG, _("Conversations with %s"), name); @@ -4123,7 +4123,7 @@ gtk_window_set_title(GTK_WINDOW(window), buf); gtk_container_set_border_width(GTK_CONTAINER(window), 10); gtk_window_set_resizable(GTK_WINDOW(window), TRUE); - block = g_signal_connect(GTK_OBJECT(window), "delete_event", + block = g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(dont_destroy), window); gtk_widget_realize(window); @@ -4215,8 +4215,8 @@ } - g_signal_handler_disconnect(GTK_OBJECT(window), block); - g_signal_connect(GTK_OBJECT(window), "delete_event", G_CALLBACK(destroy_dialog), window); + g_signal_handler_disconnect(G_OBJECT(window), block); + g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(destroy_dialog), window); frame = gtk_frame_new(_("Conversation")); gtk_widget_show(frame); @@ -4229,7 +4229,7 @@ gtk_container_add(GTK_CONTAINER(frame), sw); gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0); - g_signal_connect(GTK_OBJECT(layout), "url_clicked", G_CALLBACK(open_url), NULL); + g_signal_connect(G_OBJECT(layout), "url_clicked", G_CALLBACK(open_url), NULL); gtk_container_add(GTK_CONTAINER(sw), layout); gaim_setup_imhtml(layout); @@ -4238,16 +4238,16 @@ close_button = gaim_pixbuf_button_from_stock(_("Close"), GTK_STOCK_CLOSE, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(bbox), close_button, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(close_button), "clicked", G_CALLBACK(destroy_dialog), window); + g_signal_connect(G_OBJECT(close_button), "clicked", G_CALLBACK(destroy_dialog), window); clear_button = gaim_pixbuf_button_from_stock(_("Clear"), GTK_STOCK_CLEAR, GAIM_BUTTON_HORIZONTAL); g_object_set_data(G_OBJECT(clear_button), "log_window", window); gtk_box_pack_end(GTK_BOX(bbox), clear_button, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(clear_button), "clicked", G_CALLBACK(show_clear_log), name); + g_signal_connect(G_OBJECT(clear_button), "clicked", G_CALLBACK(show_clear_log), name); save_button = gaim_pixbuf_button_from_stock(_("Save"), GTK_STOCK_SAVE, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(bbox), save_button, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(save_button), "clicked", G_CALLBACK(show_save_log), name); + g_signal_connect(G_OBJECT(save_button), "clicked", G_CALLBACK(show_save_log), name); gtk_widget_show_all(window); @@ -4259,7 +4259,7 @@ view->window = window; view->layout = layout; log_show_convo(view); - g_signal_connect(GTK_OBJECT(layout), "destroy", G_CALLBACK(des_view_item), view); + g_signal_connect(G_OBJECT(layout), "destroy", G_CALLBACK(des_view_item), view); } gtk_widget_set_sensitive(bbox, TRUE); @@ -4418,7 +4418,7 @@ gtk_window_set_role(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog"); gtk_window_set_resizable(GTK_WINDOW(rename_bud_dialog), TRUE); gtk_window_set_title(GTK_WINDOW(rename_bud_dialog), _("Rename Buddy")); - g_signal_connect(GTK_OBJECT(rename_bud_dialog), "destroy", + g_signal_connect(G_OBJECT(rename_bud_dialog), "destroy", G_CALLBACK(destroy_dialog), rename_bud_dialog); gtk_widget_realize(rename_bud_dialog); @@ -4440,7 +4440,7 @@ gtk_box_pack_start(GTK_BOX(fbox), name_entry, TRUE, TRUE, 0); g_object_set_data(G_OBJECT(name_entry), "buddy", b); gtk_entry_set_text(GTK_ENTRY(name_entry), b->name); - g_signal_connect(GTK_OBJECT(name_entry), "activate", + g_signal_connect(G_OBJECT(name_entry), "activate", G_CALLBACK(do_rename_buddy), name_entry); gtk_widget_grab_focus(name_entry); @@ -4450,12 +4450,12 @@ button = gaim_pixbuf_button_from_stock(_("OK"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL); g_object_set_data(G_OBJECT(button), "buddy", b); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(do_rename_buddy), name_entry); button = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), rename_bud_dialog); } @@ -4997,7 +4997,7 @@ gtk_window_set_title(GTK_WINDOW (b->window), b->title); /* Clean up if user dismisses window via window manager! */ - g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(b->cancel), (gpointer) b); + g_signal_connect(G_OBJECT(b->window), "destroy", G_CALLBACK(b->cancel), (gpointer) b); gtk_widget_realize(b->window); vbox = gtk_vbox_new(FALSE, 5); @@ -5022,15 +5022,15 @@ gtk_box_pack_start(GTK_BOX (vbox), hbox, FALSE, FALSE, 5); button = gaim_pixbuf_button_from_stock(_("Save"), GTK_STOCK_SAVE, GAIM_BUTTON_HORIZONTAL); - g_signal_connect(GTK_OBJECT (button), "clicked", + g_signal_connect(G_OBJECT (button), "clicked", G_CALLBACK (b->ok), (gpointer) b); gtk_box_pack_end(GTK_BOX (hbox), button, FALSE, FALSE, 5); button = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); /* Let "destroy handling" (set above) handle cleanup */ - g_signal_connect_swapped(GTK_OBJECT (button), "clicked", - G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (b->window)); + g_signal_connect_swapped(G_OBJECT (button), "clicked", + G_CALLBACK (gtk_widget_destroy), G_OBJECT (b->window)); gtk_box_pack_end(GTK_BOX (hbox), button, FALSE, FALSE, 5); gtk_widget_show_all(b->window); diff -r 8d118c2b03c9 -r 1f901484599d src/gtkconv.c --- a/src/gtkconv.c Tue May 06 05:28:41 2003 +0000 +++ b/src/gtkconv.c Tue May 06 05:48:03 2003 +0000 @@ -4705,7 +4705,7 @@ if (gtkconv->u.im->icon_timer) { button = gtk_menu_item_new_with_label(_("Disable Animation")); - g_signal_connect(GTK_OBJECT(button), "activate", + g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(stop_anim), conv); gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); gtk_widget_show(button); @@ -4714,20 +4714,20 @@ !(gdk_pixbuf_animation_is_static_image(gtkconv->u.im->anim))) { button = gtk_menu_item_new_with_label(_("Enable Animation")); - g_signal_connect(GTK_OBJECT(button), "activate", + g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(start_anim), conv); gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); gtk_widget_show(button); } button = gtk_menu_item_new_with_label(_("Hide Icon")); - g_signal_connect_swapped(GTK_OBJECT(button), "activate", + g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(remove_icon), gtkconv); gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); gtk_widget_show(button); button = gtk_menu_item_new_with_label(_("Save Icon As...")); - g_signal_connect(GTK_OBJECT(button), "activate", + g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(gaim_gtk_save_icon_dialog), conv); gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); gtk_widget_show(button); @@ -4860,7 +4860,7 @@ event = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(frame), event); - g_signal_connect(GTK_OBJECT(event), "button-press-event", + g_signal_connect(G_OBJECT(event), "button-press-event", G_CALLBACK(icon_menu), conv); gtk_widget_show(event); diff -r 8d118c2b03c9 -r 1f901484599d src/gtkdebug.c --- a/src/gtkdebug.c Tue May 06 05:28:41 2003 +0000 +++ b/src/gtkdebug.c Tue May 06 05:48:03 2003 +0000 @@ -108,7 +108,6 @@ gaim_gtk_debug_print(GaimDebugLevel level, const char *category, const char *format, va_list args) { - va_list ap; gchar *esc_s, *arg_s, *cat_s, *s; arg_s = g_strdup_vprintf(format, args); diff -r 8d118c2b03c9 -r 1f901484599d src/gtkutils.c --- a/src/gtkutils.c Tue May 06 05:28:41 2003 +0000 +++ b/src/gtkutils.c Tue May 06 05:48:03 2003 +0000 @@ -327,11 +327,11 @@ gtk_file_selection_set_filename( GTK_FILE_SELECTION(gtkconv->u.im->save_icon), buf); - g_signal_connect(GTK_OBJECT(gtkconv->u.im->save_icon), "delete_event", + g_signal_connect(G_OBJECT(gtkconv->u.im->save_icon), "delete_event", G_CALLBACK(des_save_icon), gtkconv); - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(gtkconv->u.im->save_icon)->ok_button), "clicked", + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(gtkconv->u.im->save_icon)->ok_button), "clicked", G_CALLBACK(do_save_icon), conv); - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(gtkconv->u.im->save_icon)->cancel_button), "clicked", + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(gtkconv->u.im->save_icon)->cancel_button), "clicked", G_CALLBACK(cancel_save_icon), gtkconv); gtk_widget_show(gtkconv->u.im->save_icon); @@ -393,6 +393,24 @@ gtk_widget_set_sensitive(to_toggle, !sensitivity); } +void +gtk_toggle_sensitive_array(GtkWidget *w, GPtrArray *data) +{ + gboolean sensitivity; + gpointer element; + int i; + + for (i=0; i < data->len; i++) { + element = g_ptr_array_index(data,i); + if (element == NULL) + continue; + + sensitivity = GTK_WIDGET_IS_SENSITIVE(element); + + gtk_widget_set_sensitive(element, !sensitivity); + } +} + void gaim_separator(GtkWidget *menu) { GtkWidget *menuitem; @@ -441,7 +459,7 @@ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); if (sf) - g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data); + g_signal_connect(G_OBJECT(menuitem), "activate", sf, data); if (icon != NULL) { image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU); diff -r 8d118c2b03c9 -r 1f901484599d src/log.c --- a/src/log.c Tue May 06 05:28:41 2003 +0000 +++ b/src/log.c Tue May 06 05:48:03 2003 +0000 @@ -120,9 +120,9 @@ gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf); g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(window)->ok_button), "gaim_conversation", c); - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(window)->ok_button), "clicked", G_CALLBACK(do_save_convo), window); - g_signal_connect_swapped(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button), + g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(window)->cancel_button), "clicked", G_CALLBACK(gtk_widget_destroy), (gpointer)window); gtk_widget_show(window); } diff -r 8d118c2b03c9 -r 1f901484599d src/multi.c --- a/src/multi.c Tue May 06 05:28:41 2003 +0000 +++ b/src/multi.c Tue May 06 05:48:03 2003 +0000 @@ -359,8 +359,8 @@ gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0); mao->ma = ma; mao->opt = option; - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(mod_opt), mao); - g_signal_connect(GTK_OBJECT(button), "destroy", G_CALLBACK(free_mao), mao); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(mod_opt), mao); + g_signal_connect(G_OBJECT(button), "destroy", G_CALLBACK(free_mao), mao); gtk_widget_show(button); return button; } @@ -572,8 +572,8 @@ else opt = gtk_menu_item_new_with_label("Unknown"); g_object_set_data(G_OBJECT(opt), "mod_account", ma); - g_signal_connect(GTK_OBJECT(opt), "activate", - G_CALLBACK(set_prot), (void *)prpl_info->protocol); + g_signal_connect(G_OBJECT(opt), "activate", + G_CALLBACK(set_prot), (void *)prpl_info->protocol); gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); gtk_widget_show(opt); } @@ -629,11 +629,12 @@ } gtk_file_selection_set_filename(GTK_FILE_SELECTION(dlg), buf); - g_signal_connect(GTK_OBJECT(dlg), "destroy", G_CALLBACK(des_icon_sel), ma); - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(dlg)->cancel_button), "clicked", - G_CALLBACK(des_icon_sel), ma); - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(dlg)->ok_button), "clicked", - G_CALLBACK(set_icon), ma); + g_signal_connect(G_OBJECT(dlg), "destroy", + G_CALLBACK(des_icon_sel), ma); + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dlg)->cancel_button), "clicked", + G_CALLBACK(des_icon_sel), ma); + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dlg)->ok_button), "clicked", + G_CALLBACK(set_icon), ma); ma->icondlg = dlg; @@ -675,12 +676,14 @@ ma->iconentry = name; browse = gtk_button_new_with_label(_("Browse")); - g_signal_connect(GTK_OBJECT(browse), "clicked", G_CALLBACK(sel_icon_dlg), ma); + g_signal_connect(G_OBJECT(browse), "clicked", + G_CALLBACK(sel_icon_dlg), ma); gtk_box_pack_start(GTK_BOX(hbox), browse, FALSE, FALSE, 0); gtk_widget_show(browse); reset = gtk_button_new_with_label(_("Reset")); - g_signal_connect(GTK_OBJECT(reset), "clicked", G_CALLBACK(reset_icon), ma); + g_signal_connect(G_OBJECT(reset), "clicked", + G_CALLBACK(reset_icon), ma); gtk_box_pack_start(GTK_BOX(hbox), reset, FALSE, FALSE, 0); gtk_widget_show(reset); @@ -1204,7 +1207,8 @@ gtk_widget_realize(ma->mod); gtk_window_set_title(GTK_WINDOW(ma->mod), _("Modify Account")); gtk_window_set_resizable(GTK_WINDOW(ma->mod), FALSE); /* nothing odd here :) */ - g_signal_connect(GTK_OBJECT(ma->mod), "destroy", G_CALLBACK(delmod), ma); + g_signal_connect(G_OBJECT(ma->mod), "destroy", + G_CALLBACK(delmod), ma); vbox = gtk_vbox_new(FALSE, 6); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); @@ -1239,12 +1243,14 @@ button = gtk_button_new_from_stock(GTK_STOCK_OK); gtk_size_group_add_widget(button_sg, button); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(ok_mod), ma); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(ok_mod), ma); button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); gtk_size_group_add_widget(button_sg, button); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(cancel_mod), ma); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(cancel_mod), ma); sep = gtk_hseparator_new(); gtk_box_pack_end (GTK_BOX (vbox), sep, FALSE, FALSE, 0); @@ -1531,7 +1537,8 @@ gtk_widget_realize(acctedit); gtk_widget_set_size_request(acctedit, -1, 250); gtk_window_set_default_size(GTK_WINDOW(acctedit), 550, 250); - g_signal_connect(GTK_OBJECT(acctedit), "delete_event", G_CALLBACK(on_delete_acctedit), W); + g_signal_connect(G_OBJECT(acctedit), "delete_event", + G_CALLBACK(on_delete_acctedit), W); vbox = gtk_vbox_new(FALSE, 6); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); @@ -1543,35 +1550,6 @@ gtk_box_pack_start(GTK_BOX(hbox), sw, TRUE, TRUE, 0); -#if 0 - vbox2 = gtk_vbox_new(TRUE, 5); - gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 0); - - button = gtk_button_new_from_stock(GTK_STOCK_REFRESH); - gtk_button_set_use_stock(GTK_BUTTON(button), FALSE); - gtk_button_set_label(GTK_BUTTON(button), "Select All"); -// button = picture_button2(acctedit, _("Select All"), tb_refresh_xpm, 2); - gtk_box_pack_start(GTK_BOX(vbox2), button, TRUE, TRUE, 0); - g_signal_connect_swapped(GTK_OBJECT(button), "clicked", - G_CALLBACK(gtk_clist_select_all), GTK_OBJECT(list)); - - button = gtk_button_new_from_stock(GTK_STOCK_REDO); - gtk_button_set_use_stock(GTK_BUTTON(button), FALSE); -// gtk_button_set_label(button, "Select Autos"); -// button = picture_button2(acctedit, _("Select Autos"), tb_redo_xpm, 2); - gtk_box_pack_start(GTK_BOX(vbox2), button, TRUE, TRUE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(sel_auto), NULL); - - button = gtk_button_new_from_stock(GTK_STOCK_UNDO); - gtk_button_set_use_stock(GTK_BUTTON(button), FALSE); - gtk_button_set_label(GTK_BUTTON(button), "Select None"); -// button = picture_button2(acctedit, _("Select None"), tb_undo_xpm, 2); - gtk_box_pack_start(GTK_BOX(vbox2), button, TRUE, TRUE, 0); - g_signal_connect_swapped(GTK_OBJECT(button), "clicked", - G_CALLBACK(gtk_clist_unselect_all), GTK_OBJECT(list)); - -#endif - sep = gtk_hseparator_new(); gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0); @@ -1584,23 +1562,27 @@ button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_size_group_add_widget(sg, button); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(on_close_acctedit), W); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(on_close_acctedit), W); button = gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_size_group_add_widget(sg, button); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(del_acct), NULL); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(del_acct), NULL); button = gaim_pixbuf_button_from_stock(_("_Modify"), GTK_STOCK_PREFERENCES, GAIM_BUTTON_HORIZONTAL); gtk_size_group_add_widget(sg, button); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(mod_acct), NULL); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(mod_acct), NULL); button = gtk_button_new_from_stock(GTK_STOCK_ADD); gtk_size_group_add_widget(sg, button); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(add_acct), NULL); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(add_acct), NULL); gtk_widget_show_all(acctedit); } @@ -1886,7 +1868,8 @@ meter->progress = gtk_progress_bar_new (); meter->button = gaim_pixbuf_button_from_stock (_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); - g_signal_connect (GTK_OBJECT (meter->button), "clicked", G_CALLBACK (cancel_signon), meter); + g_signal_connect(G_OBJECT (meter->button), "clicked", + G_CALLBACK (cancel_signon), meter); gtk_table_attach (GTK_TABLE (table), graphic, 0, 1, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_table_attach (GTK_TABLE (table), nest_vbox, 1, 2, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -1946,10 +1929,12 @@ gtk_table_set_col_spacings (GTK_TABLE (meter_win->table), 10); cancel_button = gaim_pixbuf_button_from_stock (_("Cancel All"), GTK_STOCK_QUIT, GAIM_BUTTON_HORIZONTAL); - g_signal_connect_swapped (GTK_OBJECT (cancel_button), "clicked", G_CALLBACK (loop_cancel), NULL); - gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (cancel_button), FALSE, FALSE, 0); + g_signal_connect_swapped(G_OBJECT(cancel_button), "clicked", + G_CALLBACK (loop_cancel), NULL); + gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(cancel_button), FALSE, FALSE, 0); - g_signal_connect (GTK_OBJECT (meter_win->window), "delete_event", G_CALLBACK (meter_destroy), NULL); + g_signal_connect(G_OBJECT(meter_win->window), "delete_event", + G_CALLBACK(meter_destroy), NULL); } if (!meter) { @@ -2005,7 +1990,8 @@ k->account = gc->account; k->dlg = do_error_dialog(title, buf, GAIM_ERROR); kicks = g_slist_append(kicks, k); - g_signal_connect(GTK_OBJECT(k->dlg), "destroy", G_CALLBACK(set_kick_null), k); + g_signal_connect(G_OBJECT(k->dlg), "destroy", + G_CALLBACK(set_kick_null), k); if (meter) { kill_meter(meter); meters = g_slist_remove(meters, meter); diff -r 8d118c2b03c9 -r 1f901484599d src/prefs.c --- a/src/prefs.c Tue May 06 05:28:41 2003 +0000 +++ b/src/prefs.c Tue May 06 05:48:03 2003 +0000 @@ -38,6 +38,7 @@ #include "gaim.h" #include "gtkblist.h" #include "gtkplugin.h" +#include "gtkdebug.h" #include "prpl.h" #include "proxy.h" #include "sound.h" @@ -466,9 +467,9 @@ if (!(font_options & OPT_FONT_FACE)) gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); - g_signal_connect(GTK_OBJECT(button), "clicked", + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gaim_gtk_toggle_sensitive), select); - g_signal_connect(GTK_OBJECT(select), "clicked", + g_signal_connect(G_OBJECT(select), "clicked", G_CALLBACK(show_font_dialog), NULL); gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0); @@ -479,7 +480,7 @@ select = gaim_labeled_spin_button(hbox, NULL, &fontsize, 1, 7, NULL); if (!(font_options & OPT_FONT_SIZE)) gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); - g_signal_connect(GTK_OBJECT(button), "clicked", + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gaim_gtk_toggle_sensitive), select); vbox = make_frame(ret, _("Color")); @@ -493,14 +494,14 @@ select = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR); gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0); pref_fg_picture = show_color_pref(hbox, TRUE); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(update_color), + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(update_color), pref_fg_picture); if (!(font_options & OPT_FONT_FGCOL)) gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); - g_signal_connect(GTK_OBJECT(button), "clicked", + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gaim_gtk_toggle_sensitive), select); - g_signal_connect(GTK_OBJECT(select), "clicked", G_CALLBACK(show_fgcolor_dialog), NULL); + g_signal_connect(G_OBJECT(select), "clicked", G_CALLBACK(show_fgcolor_dialog), NULL); hbox = gtk_hbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(vbox), hbox); @@ -509,13 +510,14 @@ select = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR); gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0); pref_bg_picture = show_color_pref(hbox, FALSE); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(update_color), - pref_bg_picture); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(update_color), pref_bg_picture); if (!(font_options & OPT_FONT_BGCOL)) gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); - g_signal_connect(GTK_OBJECT(select), "clicked", G_CALLBACK(show_bgcolor_dialog), NULL); - g_signal_connect(GTK_OBJECT(button), "clicked", + g_signal_connect(G_OBJECT(select), "clicked", + G_CALLBACK(show_bgcolor_dialog), NULL); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gaim_gtk_toggle_sensitive), select); gtk_widget_show_all(ret); @@ -593,13 +595,13 @@ b2 = gaim_button(_("Show _warning levels"), &blist_options, OPT_BLIST_SHOW_WARN, vbox); if (blist_options & OPT_BLIST_SHOW_ICONS) gtk_widget_set_sensitive(GTK_WIDGET(b2), FALSE); - g_signal_connect(GTK_OBJECT(button), "clicked", - G_CALLBACK(gaim_gtk_toggle_sensitive), b2); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(gaim_gtk_toggle_sensitive), b2); b2 = gaim_button(_("Show idle _times"), &blist_options, OPT_BLIST_SHOW_IDLETIME, vbox); if (blist_options & OPT_BLIST_SHOW_ICONS) gtk_widget_set_sensitive(GTK_WIDGET(b2), FALSE); - g_signal_connect(GTK_OBJECT(button), "clicked", - G_CALLBACK(gaim_gtk_toggle_sensitive), b2); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(gaim_gtk_toggle_sensitive), b2); gaim_button(_("Dim i_dle buddies"), &blist_options, OPT_BLIST_GREY_IDLERS, vbox); gtk_widget_show_all(ret); @@ -799,8 +801,8 @@ entry = gtk_entry_new(); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); - g_signal_connect(GTK_OBJECT(entry), "changed", - G_CALLBACK(proxy_print_option), (void *)PROXYHOST); + g_signal_connect(G_OBJECT(entry), "changed", + G_CALLBACK(proxy_print_option), (void *)PROXYHOST); gtk_entry_set_text(GTK_ENTRY(entry), global_proxy_info.proxyhost); hbox = gtk_hbox_new(TRUE, 5); @@ -813,8 +815,8 @@ entry = gtk_entry_new(); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); - g_signal_connect(GTK_OBJECT(entry), "changed", - G_CALLBACK(proxy_print_option), (void *)PROXYPORT); + g_signal_connect(G_OBJECT(entry), "changed", + G_CALLBACK(proxy_print_option), (void *)PROXYPORT); if (global_proxy_info.proxyport) { char buf[128]; @@ -829,8 +831,8 @@ entry = gtk_entry_new(); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 2, 3, GTK_FILL, 0, 0, 0); - g_signal_connect(GTK_OBJECT(entry), "changed", - G_CALLBACK(proxy_print_option), (void *)PROXYUSER); + g_signal_connect(G_OBJECT(entry), "changed", + G_CALLBACK(proxy_print_option), (void *)PROXYUSER); gtk_entry_set_text(GTK_ENTRY(entry), global_proxy_info.proxyuser); hbox = gtk_hbox_new(TRUE, 5); @@ -844,8 +846,8 @@ gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 3, 4, GTK_FILL , 0, 0, 0); gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); - g_signal_connect(GTK_OBJECT(entry), "changed", - G_CALLBACK(proxy_print_option), (void *)PROXYPASS); + g_signal_connect(G_OBJECT(entry), "changed", + G_CALLBACK(proxy_print_option), (void *)PROXYPASS); gtk_entry_set_text(GTK_ENTRY(entry), global_proxy_info.proxypass); gtk_widget_show_all(ret); @@ -1045,7 +1047,8 @@ gtk_widget_set_sensitive(sndcmd, (sound_options & OPT_SOUND_CMD)); gtk_box_pack_start(GTK_BOX(hbox), sndcmd, TRUE, TRUE, 5); - g_signal_connect(GTK_OBJECT(sndcmd), "changed", G_CALLBACK(sound_cmd_yeah), NULL); + g_signal_connect(G_OBJECT(sndcmd), "changed", + G_CALLBACK(sound_cmd_yeah), NULL); #endif /* _WIN32 */ gtk_widget_show_all(ret); return ret; @@ -1102,7 +1105,7 @@ select = gaim_labeled_spin_button(vbox, _("_Minutes before setting away:"), &auto_away, 1, 24 * 60, sg); if (!(away_options & OPT_AWAY_AUTO)) gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); - g_signal_connect(GTK_OBJECT(button), "clicked", + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gaim_gtk_toggle_sensitive), select); label = gtk_label_new_with_mnemonic(_("Away m_essage:")); @@ -1115,7 +1118,7 @@ gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefs_away_menu); if (!(away_options & OPT_AWAY_AUTO)) gtk_widget_set_sensitive(GTK_WIDGET(prefs_away_menu), FALSE); - g_signal_connect(GTK_OBJECT(button), "clicked", + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gaim_gtk_toggle_sensitive), prefs_away_menu); default_away_menu_init(prefs_away_menu); gtk_widget_show(prefs_away_menu); @@ -1500,14 +1503,16 @@ gtk_file_selection_set_filename(GTK_FILE_SELECTION(sounddialog), buf); - g_signal_connect(GTK_OBJECT(sounddialog), "destroy", - G_CALLBACK(close_sounddialog), sounddialog); - - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(sounddialog)->ok_button), - "clicked", G_CALLBACK(do_select_sound), (int *)sound_row_sel); - - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(sounddialog)->cancel_button), - "clicked", G_CALLBACK(close_sounddialog), sounddialog); + g_signal_connect(G_OBJECT(sounddialog), "destroy", + G_CALLBACK(close_sounddialog), sounddialog); + + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(sounddialog)->ok_button), + "clicked", + G_CALLBACK(do_select_sound), (int *)sound_row_sel); + + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(sounddialog)->cancel_button), + "clicked", + G_CALLBACK(close_sounddialog), sounddialog); } g_free(buf); @@ -1607,15 +1612,15 @@ gtk_box_pack_start(GTK_BOX(hbox), sound_entry, FALSE, FALSE, 5); button = gtk_button_new_with_label(_("Test")); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(test_sound), NULL); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(test_sound), NULL); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); button = gtk_button_new_with_label(_("Reset")); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(reset_sound), NULL); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(reset_sound), NULL); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); button = gtk_button_new_with_label(_("Choose...")); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(sel_sound), NULL); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(sel_sound), NULL); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); gtk_widget_show_all (ret); @@ -1728,17 +1733,20 @@ button = gtk_button_new_from_stock (GTK_STOCK_ADD); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_size_group_add_widget(sg, button); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(create_away_mess), NULL); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(create_away_mess), NULL); button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); gtk_size_group_add_widget(sg, button); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(remove_away_message), event_view); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(remove_away_message), event_view); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); button = gaim_pixbuf_button_from_stock(_("_Edit"), GAIM_STOCK_EDIT, GAIM_BUTTON_HORIZONTAL); gtk_size_group_add_widget(sg, button); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(create_away_mess), event_view); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(create_away_mess), event_view); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show_all(ret); @@ -1845,7 +1853,8 @@ gtk_widget_realize(prefs); gtk_window_set_title(GTK_WINDOW(prefs), _("Preferences")); gtk_window_set_resizable (GTK_WINDOW(prefs), FALSE); - g_signal_connect(GTK_OBJECT(prefs), "destroy", G_CALLBACK(delete_prefs), NULL); + g_signal_connect(G_OBJECT(prefs), "destroy", + G_CALLBACK(delete_prefs), NULL); vbox = gtk_vbox_new(FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); @@ -1928,7 +1937,8 @@ button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); gtk_size_group_add_widget(sg, button); - g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy), prefs); + g_signal_connect_swapped(G_OBJECT(button), "clicked", + G_CALLBACK(gtk_widget_destroy), prefs); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); @@ -2068,32 +2078,32 @@ g_object_set_data(G_OBJECT(button), "options", options); if (options == &misc_options) { - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_misc_option), - (int *)option); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(set_misc_option), (int *)option); } else if (options == &logging_options) { - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_logging_option), - (int *)option); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(set_logging_option), (int *)option); } else if (options == &blist_options) { - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_blist_option), - (int *)option); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(set_blist_option), (int *)option); } else if (options == &convo_options) { - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_convo_option), - (int *)option); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(set_convo_option), (int *)option); } else if (options == &im_options) { - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_im_option), - (int *)option); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(set_im_option), (int *)option); } else if (options == &chat_options) { - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_chat_option), - (int *)option); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(set_chat_option), (int *)option); } else if (options == &font_options) { - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_font_option), - (int *)option); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(set_font_option), (int *)option); } else if (options == &sound_options) { - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_sound_option), - (int *)option); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(set_sound_option), (int *)option); } else if (options == &away_options) { - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_away_option), - (int *)option); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(set_away_option), (int *)option); } else { gaim_debug(GAIM_DEBUG_WARNING, "gaim_button", "\"%s\" has no signal handler attached to it!\n", text); @@ -2115,8 +2125,8 @@ while (awy) { a = (struct away_message *)awy->data; opt = gtk_menu_item_new_with_label(a->name); - g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(set_default_away), - (gpointer)index); + g_signal_connect(G_OBJECT(opt), "activate", + G_CALLBACK(set_default_away), (gpointer)index); gtk_widget_show(opt); gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); @@ -2268,8 +2278,8 @@ g_object_set_data(G_OBJECT(spin), "val", val); gtk_widget_set_size_request(spin, 50, -1); gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(adjust), "value-changed", - G_CALLBACK(update_spin_value), GTK_WIDGET(spin)); + g_signal_connect(G_OBJECT(adjust), "value-changed", + G_CALLBACK(update_spin_value), GTK_WIDGET(spin)); gtk_widget_show(spin); gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin); @@ -2391,8 +2401,8 @@ opt = gtk_menu_item_new_with_label(text); g_object_set_data(G_OBJECT(opt), "value", GINT_TO_POINTER(value)); g_object_set_data(G_OBJECT(opt), "clear", GINT_TO_POINTER(clear)); - g_signal_connect(GTK_OBJECT(opt), "activate", - G_CALLBACK(dropdown_set), (void *)option); + g_signal_connect(G_OBJECT(opt), "activate", + G_CALLBACK(dropdown_set), (void *)option); gtk_widget_show(opt); gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); diff -r 8d118c2b03c9 -r 1f901484599d src/prpl.c --- a/src/prpl.c Tue May 06 05:28:41 2003 +0000 +++ b/src/prpl.c Tue May 06 05:48:03 2003 +0000 @@ -217,7 +217,8 @@ gtk_window_set_role(GTK_WINDOW(window), "prompt"); gtk_window_set_resizable(GTK_WINDOW(window), TRUE); gtk_window_set_title(GTK_WINDOW(window), _("Gaim - Prompt")); - g_signal_connect(GTK_OBJECT(window), "destroy", G_CALLBACK(des_prompt), p); + g_signal_connect(G_OBJECT(window), "destroy", + G_CALLBACK(des_prompt), p); gtk_widget_realize(window); vbox = gtk_vbox_new(FALSE, 5); @@ -234,7 +235,8 @@ gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); if (def) gtk_entry_set_text(GTK_ENTRY(entry), def); - g_signal_connect(GTK_OBJECT(entry), "activate", G_CALLBACK(act_prompt), p); + g_signal_connect(G_OBJECT(entry), "activate", + G_CALLBACK(act_prompt), p); p->entry = entry; hbox = gtk_hbox_new(FALSE, 5); @@ -242,11 +244,13 @@ button = gaim_pixbuf_button_from_stock(_("OK"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(act_prompt), p); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(act_prompt), p); button = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(des_win), window); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(des_win), window); gtk_widget_show_all(window); } @@ -322,8 +326,8 @@ struct proto_actions_menu *pam = act->data; menuitem = gtk_menu_item_new_with_label(pam->label); gtk_menu_shell_append(GTK_MENU_SHELL(protomenu), menuitem); - g_signal_connect(GTK_OBJECT(menuitem), "activate", - G_CALLBACK(proto_act), pam); + g_signal_connect(G_OBJECT(menuitem), "activate", + G_CALLBACK(proto_act), pam); g_object_set_data(G_OBJECT(menuitem), "proto_actions_menu", pam); gtk_widget_show(menuitem); } else { @@ -375,8 +379,8 @@ struct proto_actions_menu *pam = act->data; menuitem = gtk_menu_item_new_with_label(pam->label); gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem); - g_signal_connect(GTK_OBJECT(menuitem), "activate", - G_CALLBACK(proto_act), pam); + g_signal_connect(G_OBJECT(menuitem), "activate", + G_CALLBACK(proto_act), pam); g_object_set_data(G_OBJECT(menuitem), "proto_actions_menu", pam); gtk_widget_show(menuitem); @@ -467,7 +471,8 @@ gtk_window_set_role(GTK_WINDOW(mn->email_win), "mail"); gtk_window_set_resizable(GTK_WINDOW(mn->email_win), TRUE); gtk_window_set_title(GTK_WINDOW(mn->email_win), _("Gaim - New Mail")); - g_signal_connect(GTK_OBJECT(mn->email_win), "destroy", G_CALLBACK(des_email_win), mn); + g_signal_connect(G_OBJECT(mn->email_win), "destroy", + G_CALLBACK(des_email_win), mn); gtk_widget_realize(mn->email_win); vbox = gtk_vbox_new(FALSE, 5); @@ -486,14 +491,17 @@ mn->url = g_strdup(url); urlbut = gaim_pixbuf_button_from_stock(_("Open Mail"), GTK_STOCK_JUMP_TO, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), urlbut, 0, 0, 5); - g_signal_connect(GTK_OBJECT(urlbut), "clicked", G_CALLBACK(open_url), mn->url); - g_signal_connect(GTK_OBJECT(urlbut), "clicked", G_CALLBACK(des_email_win), mn); + g_signal_connect(G_OBJECT(urlbut), "clicked", + G_CALLBACK(open_url), mn->url); + g_signal_connect(G_OBJECT(urlbut), "clicked", + G_CALLBACK(des_email_win), mn); } close = gaim_pixbuf_button_from_stock(_("Close"), GTK_STOCK_CLOSE, GAIM_BUTTON_HORIZONTAL); gtk_window_set_focus(GTK_WINDOW(mn->email_win), close); gtk_box_pack_end(GTK_BOX(hbox), close, 0, 0, 5); - g_signal_connect(GTK_OBJECT(close), "clicked", G_CALLBACK(des_email_win), mn); + g_signal_connect(G_OBJECT(close), "clicked", + G_CALLBACK(des_email_win), mn); gtk_widget_show_all(mn->email_win); } @@ -776,7 +784,8 @@ gtk_window_set_title(GTK_WINDOW(regdlg), _("Gaim - Registration")); gtk_window_set_role(GTK_WINDOW(regdlg), "register"); gtk_widget_realize(regdlg); - g_signal_connect(GTK_OBJECT(regdlg), "destroy", G_CALLBACK(delete_regdlg), NULL); + g_signal_connect(G_OBJECT(regdlg), "destroy", + G_CALLBACK(delete_regdlg), NULL); vbox = gtk_vbox_new(FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); @@ -796,7 +805,8 @@ close = gaim_pixbuf_button_from_stock(_("Close"), GTK_STOCK_CLOSE, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), close, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(close), "clicked", G_CALLBACK(delete_regdlg), NULL); + g_signal_connect(G_OBJECT(close), "clicked", + G_CALLBACK(delete_regdlg), NULL); reg_reg = gaim_pixbuf_button_from_stock(_("Register"), GTK_STOCK_JUMP_TO, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), reg_reg, FALSE, FALSE, 5); diff -r 8d118c2b03c9 -r 1f901484599d src/server.c --- a/src/server.c Tue May 06 05:28:41 2003 +0000 +++ b/src/server.c Tue May 06 05:48:03 2003 +0000 @@ -1400,7 +1400,8 @@ gtk_window_set_resizable(GTK_WINDOW(window), FALSE); gtk_window_set_title(GTK_WINDOW(window), "Gaim - Popup"); gtk_container_set_border_width(GTK_CONTAINER(window), 5); - g_signal_connect(GTK_OBJECT(window), "destroy", G_CALLBACK(des_popup), window); + g_signal_connect(G_OBJECT(window), "destroy", + G_CALLBACK(des_popup), window); g_object_set_data(G_OBJECT(window), "url", url); gtk_widget_realize(window); @@ -1421,11 +1422,13 @@ button = gaim_pixbuf_button_from_stock(_("Close"), GTK_STOCK_CLOSE, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(des_popup), window); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(des_popup), window); button = gaim_pixbuf_button_from_stock(_("More Info"), GTK_STOCK_FIND, GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); - g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(open_url), url); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(open_url), url); gtk_widget_show_all(window);