Mercurial > pidgin

comparison src/multi.c @ 4162:d3c8d2b40494

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4391] gtk_signal_connect() to g_signal_connect() Everything seems fine, and nothing should be broken. However, please let me know if anything strange happens. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Tue, 31 Dec 2002 19:32:38 +0000
parents fa5075168c23
children 40d35a98f481
comparison
equal deleted inserted replaced
4161:c79961f48063 4162:d3c8d2b40494
324 button = gtk_check_button_new_with_label(text); 324 button = gtk_check_button_new_with_label(text);
325 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (u->options & option)); 325 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (u->options & option));
326 gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0); 326 gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
327 muo->user = u; 327 muo->user = u;
328 muo->opt = option; 328 muo->opt = option;
329 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(mod_opt), muo); 329 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(mod_opt), muo);
330 gtk_signal_connect(GTK_OBJECT(button), "destroy", GTK_SIGNAL_FUNC(free_muo), muo); 330 g_signal_connect(GTK_OBJECT(button), "destroy", G_CALLBACK(free_muo), muo);
331 gtk_widget_show(button); 331 gtk_widget_show(button);
332 return button; 332 return button;
333 } 333 }
334 334
335 static void ok_mod(GtkWidget *w, struct mod_user *u) 335 static void ok_mod(GtkWidget *w, struct mod_user *u)
490 if (e->name) 490 if (e->name)
491 opt = gtk_menu_item_new_with_label(e->name); 491 opt = gtk_menu_item_new_with_label(e->name);
492 else 492 else
493 opt = gtk_menu_item_new_with_label("Unknown"); 493 opt = gtk_menu_item_new_with_label("Unknown");
494 gtk_object_set_user_data(GTK_OBJECT(opt), u); 494 gtk_object_set_user_data(GTK_OBJECT(opt), u);
495 gtk_signal_connect(GTK_OBJECT(opt), "activate", 495 g_signal_connect(GTK_OBJECT(opt), "activate",
496 GTK_SIGNAL_FUNC(set_prot), (void *)e->protocol); 496 G_CALLBACK(set_prot), (void *)e->protocol);
497 gtk_menu_append(GTK_MENU(menu), opt); 497 gtk_menu_append(GTK_MENU(menu), opt);
498 gtk_widget_show(opt); 498 gtk_widget_show(opt);
499 p = p->next; 499 p = p->next;
500 } 500 }
501 501
548 } else { 548 } else {
549 g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S, gaim_home_dir()); 549 g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S, gaim_home_dir());
550 gtk_file_selection_set_filename(GTK_FILE_SELECTION(dlg), buf); 550 gtk_file_selection_set_filename(GTK_FILE_SELECTION(dlg), buf);
551 } 551 }
552 552
553 gtk_signal_connect(GTK_OBJECT(dlg), "destroy", GTK_SIGNAL_FUNC(des_icon_sel), u); 553 g_signal_connect(GTK_OBJECT(dlg), "destroy", G_CALLBACK(des_icon_sel), u);
554 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(dlg)->cancel_button), "clicked", 554 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(dlg)->cancel_button), "clicked",
555 GTK_SIGNAL_FUNC(des_icon_sel), u); 555 G_CALLBACK(des_icon_sel), u);
556 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(dlg)->ok_button), "clicked", 556 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(dlg)->ok_button), "clicked",
557 GTK_SIGNAL_FUNC(set_icon), u); 557 G_CALLBACK(set_icon), u);
558 558
559 u->icondlg = dlg; 559 u->icondlg = dlg;
560 560
561 gtk_widget_show(dlg); 561 gtk_widget_show(dlg);
562 } 562 }
594 gtk_box_pack_start(GTK_BOX(hbox), name, TRUE, TRUE, 5); 594 gtk_box_pack_start(GTK_BOX(hbox), name, TRUE, TRUE, 5);
595 gtk_widget_show(name); 595 gtk_widget_show(name);
596 u->iconentry = name; 596 u->iconentry = name;
597 597
598 browse = gtk_button_new_with_label(_("Browse")); 598 browse = gtk_button_new_with_label(_("Browse"));
599 gtk_signal_connect(GTK_OBJECT(browse), "clicked", GTK_SIGNAL_FUNC(sel_icon_dlg), u); 599 g_signal_connect(GTK_OBJECT(browse), "clicked", G_CALLBACK(sel_icon_dlg), u);
600 gtk_box_pack_start(GTK_BOX(hbox), browse, FALSE, FALSE, 0); 600 gtk_box_pack_start(GTK_BOX(hbox), browse, FALSE, FALSE, 0);
601 gtk_widget_show(browse); 601 gtk_widget_show(browse);
602 602
603 reset = gtk_button_new_with_label(_("Reset")); 603 reset = gtk_button_new_with_label(_("Reset"));
604 gtk_signal_connect(GTK_OBJECT(reset), "clicked", GTK_SIGNAL_FUNC(reset_icon), u); 604 g_signal_connect(GTK_OBJECT(reset), "clicked", G_CALLBACK(reset_icon), u);
605 gtk_box_pack_start(GTK_BOX(hbox), reset, FALSE, FALSE, 0); 605 gtk_box_pack_start(GTK_BOX(hbox), reset, FALSE, FALSE, 0);
606 gtk_widget_show(reset); 606 gtk_widget_show(reset);
607 607
608 return hbox; 608 return hbox;
609 } 609 }
865 u->mod = gtk_window_new(GTK_WINDOW_TOPLEVEL); 865 u->mod = gtk_window_new(GTK_WINDOW_TOPLEVEL);
866 gtk_window_set_role(GTK_WINDOW(u->mod), "account"); 866 gtk_window_set_role(GTK_WINDOW(u->mod), "account");
867 gtk_widget_realize(u->mod); 867 gtk_widget_realize(u->mod);
868 gtk_window_set_title(GTK_WINDOW(u->mod), _("Gaim - Modify Account")); 868 gtk_window_set_title(GTK_WINDOW(u->mod), _("Gaim - Modify Account"));
869 gtk_window_set_policy(GTK_WINDOW(u->mod), FALSE, FALSE, TRUE); /* nothing odd here :) */ 869 gtk_window_set_policy(GTK_WINDOW(u->mod), FALSE, FALSE, TRUE); /* nothing odd here :) */
870 gtk_signal_connect(GTK_OBJECT(u->mod), "destroy", GTK_SIGNAL_FUNC(delmod), u); 870 g_signal_connect(GTK_OBJECT(u->mod), "destroy", G_CALLBACK(delmod), u);
871 871
872 vbox = gtk_vbox_new(FALSE, 6); 872 vbox = gtk_vbox_new(FALSE, 6);
873 gtk_container_border_width(GTK_CONTAINER(vbox), 6); 873 gtk_container_border_width(GTK_CONTAINER(vbox), 6);
874 gtk_container_add(GTK_CONTAINER(u->mod), vbox); 874 gtk_container_add(GTK_CONTAINER(u->mod), vbox);
875 gtk_widget_show(vbox); 875 gtk_widget_show(vbox);
892 button_sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); 892 button_sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
893 893
894 button = gtk_button_new_from_stock(GTK_STOCK_OK); 894 button = gtk_button_new_from_stock(GTK_STOCK_OK);
895 gtk_size_group_add_widget(button_sg, button); 895 gtk_size_group_add_widget(button_sg, button);
896 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 896 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
897 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_mod), u); 897 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(ok_mod), u);
898 898
899 button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); 899 button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
900 gtk_size_group_add_widget(button_sg, button); 900 gtk_size_group_add_widget(button_sg, button);
901 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 901 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
902 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(cancel_mod), u); 902 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(cancel_mod), u);
903 903
904 sep = gtk_hseparator_new(); 904 sep = gtk_hseparator_new();
905 gtk_box_pack_end (GTK_BOX (vbox), sep, FALSE, FALSE, 0); 905 gtk_box_pack_end (GTK_BOX (vbox), sep, FALSE, FALSE, 0);
906 gtk_widget_show(sep); 906 gtk_widget_show(sep);
907 907
1005 passes = g_slist_append(passes, p); 1005 passes = g_slist_append(passes, p);
1006 1006
1007 GAIM_DIALOG(p->win); 1007 GAIM_DIALOG(p->win);
1008 gtk_window_set_role(GTK_WINDOW(p->win), "password"); 1008 gtk_window_set_role(GTK_WINDOW(p->win), "password");
1009 gtk_container_border_width(GTK_CONTAINER(p->win), 5); 1009 gtk_container_border_width(GTK_CONTAINER(p->win), 5);
1010 gtk_signal_connect(GTK_OBJECT(p->win), "destroy", GTK_SIGNAL_FUNC(pass_des), p); 1010 g_signal_connect(GTK_OBJECT(p->win), "destroy", G_CALLBACK(pass_des), p);
1011 gtk_widget_realize(p->win); 1011 gtk_widget_realize(p->win);
1012 1012
1013 frame = make_frame(p->win, _("Enter Password")); 1013 frame = make_frame(p->win, _("Enter Password"));
1014 gtk_widget_show(frame); 1014 gtk_widget_show(frame);
1015 1015
1027 gtk_widget_show(label); 1027 gtk_widget_show(label);
1028 1028
1029 p->entry = gtk_entry_new(); 1029 p->entry = gtk_entry_new();
1030 gtk_entry_set_visibility(GTK_ENTRY(p->entry), FALSE); 1030 gtk_entry_set_visibility(GTK_ENTRY(p->entry), FALSE);
1031 gtk_box_pack_start(GTK_BOX(hbox), p->entry, FALSE, FALSE, 5); 1031 gtk_box_pack_start(GTK_BOX(hbox), p->entry, FALSE, FALSE, 5);
1032 gtk_signal_connect(GTK_OBJECT(p->entry), "activate", GTK_SIGNAL_FUNC(pass_signon), p); 1032 g_signal_connect(GTK_OBJECT(p->entry), "activate", G_CALLBACK(pass_signon), p);
1033 gtk_widget_grab_focus(p->entry); 1033 gtk_widget_grab_focus(p->entry);
1034 gtk_widget_show(p->entry); 1034 gtk_widget_show(p->entry);
1035 1035
1036 hbox = gtk_hbox_new(FALSE, 5); 1036 hbox = gtk_hbox_new(FALSE, 5);
1037 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); 1037 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
1038 gtk_widget_show(hbox); 1038 gtk_widget_show(hbox);
1039 1039
1040 button = picture_button(p->win, _("Cancel"), cancel_xpm); 1040 button = picture_button(p->win, _("Cancel"), cancel_xpm);
1041 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pass_cancel), p); 1041 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pass_cancel), p);
1042 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); 1042 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
1043 1043
1044 button = picture_button(p->win, _("Signon"), ok_xpm); 1044 button = picture_button(p->win, _("Signon"), ok_xpm);
1045 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pass_signon), p); 1045 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pass_signon), p);
1046 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); 1046 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
1047 1047
1048 gtk_widget_show(p->win); 1048 gtk_widget_show(p->win);
1049 } 1049 }
1050 1050
1187 gtk_window_set_title(GTK_WINDOW(acctedit), _("Gaim - Account Editor")); 1187 gtk_window_set_title(GTK_WINDOW(acctedit), _("Gaim - Account Editor"));
1188 gtk_window_set_role(GTK_WINDOW(acctedit), "accounteditor"); 1188 gtk_window_set_role(GTK_WINDOW(acctedit), "accounteditor");
1189 gtk_widget_realize(acctedit); 1189 gtk_widget_realize(acctedit);
1190 gtk_widget_set_usize(acctedit, -1, 250); 1190 gtk_widget_set_usize(acctedit, -1, 250);
1191 gtk_window_set_default_size(GTK_WINDOW(acctedit), 550, 250); 1191 gtk_window_set_default_size(GTK_WINDOW(acctedit), 550, 250);
1192 gtk_signal_connect(GTK_OBJECT(acctedit), "destroy", GTK_SIGNAL_FUNC(delete_acctedit), W); 1192 g_signal_connect(GTK_OBJECT(acctedit), "destroy", G_CALLBACK(delete_acctedit), W);
1193 1193
1194 vbox = gtk_vbox_new(FALSE, 6); 1194 vbox = gtk_vbox_new(FALSE, 6);
1195 gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); 1195 gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
1196 gtk_container_add(GTK_CONTAINER(acctedit), vbox); 1196 gtk_container_add(GTK_CONTAINER(acctedit), vbox);
1197 1197
1213 button = gtk_button_new_from_stock(GTK_STOCK_REFRESH); 1213 button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
1214 gtk_button_set_use_stock(GTK_BUTTON(button), FALSE); 1214 gtk_button_set_use_stock(GTK_BUTTON(button), FALSE);
1215 gtk_button_set_label(GTK_BUTTON(button), "Select All"); 1215 gtk_button_set_label(GTK_BUTTON(button), "Select All");
1216 // button = picture_button2(acctedit, _("Select All"), tb_refresh_xpm, 2); 1216 // button = picture_button2(acctedit, _("Select All"), tb_refresh_xpm, 2);
1217 gtk_box_pack_start(GTK_BOX(vbox2), button, TRUE, TRUE, 0); 1217 gtk_box_pack_start(GTK_BOX(vbox2), button, TRUE, TRUE, 0);
1218 gtk_signal_connect_object(GTK_OBJECT(button), "clicked", 1218 g_signal_connect_swapped(GTK_OBJECT(button), "clicked",
1219 GTK_SIGNAL_FUNC(gtk_clist_select_all), GTK_OBJECT(list)); 1219 G_CALLBACK(gtk_clist_select_all), GTK_OBJECT(list));
1220 1220
1221 button = gtk_button_new_from_stock(GTK_STOCK_REDO); 1221 button = gtk_button_new_from_stock(GTK_STOCK_REDO);
1222 gtk_button_set_use_stock(GTK_BUTTON(button), FALSE); 1222 gtk_button_set_use_stock(GTK_BUTTON(button), FALSE);
1223 // gtk_button_set_label(button, "Select Autos"); 1223 // gtk_button_set_label(button, "Select Autos");
1224 // button = picture_button2(acctedit, _("Select Autos"), tb_redo_xpm, 2); 1224 // button = picture_button2(acctedit, _("Select Autos"), tb_redo_xpm, 2);
1225 gtk_box_pack_start(GTK_BOX(vbox2), button, TRUE, TRUE, 0); 1225 gtk_box_pack_start(GTK_BOX(vbox2), button, TRUE, TRUE, 0);
1226 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(sel_auto), NULL); 1226 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(sel_auto), NULL);
1227 1227
1228 button = gtk_button_new_from_stock(GTK_STOCK_UNDO); 1228 button = gtk_button_new_from_stock(GTK_STOCK_UNDO);
1229 gtk_button_set_use_stock(GTK_BUTTON(button), FALSE); 1229 gtk_button_set_use_stock(GTK_BUTTON(button), FALSE);
1230 gtk_button_set_label(GTK_BUTTON(button), "Select None"); 1230 gtk_button_set_label(GTK_BUTTON(button), "Select None");
1231 // button = picture_button2(acctedit, _("Select None"), tb_undo_xpm, 2); 1231 // button = picture_button2(acctedit, _("Select None"), tb_undo_xpm, 2);
1232 gtk_box_pack_start(GTK_BOX(vbox2), button, TRUE, TRUE, 0); 1232 gtk_box_pack_start(GTK_BOX(vbox2), button, TRUE, TRUE, 0);
1233 gtk_signal_connect_object(GTK_OBJECT(button), "clicked", 1233 g_signal_connect_swapped(GTK_OBJECT(button), "clicked",
1234 GTK_SIGNAL_FUNC(gtk_clist_unselect_all), GTK_OBJECT(list)); 1234 G_CALLBACK(gtk_clist_unselect_all), GTK_OBJECT(list));
1235 1235
1236 #endif 1236 #endif
1237 1237
1238 sep = gtk_hseparator_new(); 1238 sep = gtk_hseparator_new();
1239 gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0); 1239 gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
1245 sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); 1245 sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
1246 1246
1247 button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); 1247 button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
1248 gtk_size_group_add_widget(sg, button); 1248 gtk_size_group_add_widget(sg, button);
1249 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1249 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1250 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(acctedit_close), W); 1250 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(acctedit_close), W);
1251 1251
1252 button = gtk_button_new_from_stock(GTK_STOCK_DELETE); 1252 button = gtk_button_new_from_stock(GTK_STOCK_DELETE);
1253 gtk_size_group_add_widget(sg, button); 1253 gtk_size_group_add_widget(sg, button);
1254 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1254 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1255 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(del_acct), NULL); 1255 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(del_acct), NULL);
1256 1256
1257 button = gaim_pixbuf_button_from_stock(_("_Modify"), GTK_STOCK_PREFERENCES, 1257 button = gaim_pixbuf_button_from_stock(_("_Modify"), GTK_STOCK_PREFERENCES,
1258 GAIM_BUTTON_HORIZONTAL); 1258 GAIM_BUTTON_HORIZONTAL);
1259 gtk_size_group_add_widget(sg, button); 1259 gtk_size_group_add_widget(sg, button);
1260 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1260 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1261 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(mod_acct), NULL); 1261 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(mod_acct), NULL);
1262 1262
1263 button = gtk_button_new_from_stock(GTK_STOCK_ADD); 1263 button = gtk_button_new_from_stock(GTK_STOCK_ADD);
1264 gtk_size_group_add_widget(sg, button); 1264 gtk_size_group_add_widget(sg, button);
1265 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1265 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1266 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(add_acct), NULL); 1266 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(add_acct), NULL);
1267 1267
1268 gtk_widget_show_all(acctedit); 1268 gtk_widget_show_all(acctedit);
1269 } 1269 }
1270 1270
1271 struct signon_meter { 1271 struct signon_meter {
1453 gtk_widget_set_usize(meter->status, 250, 0); 1453 gtk_widget_set_usize(meter->status, 250, 0);
1454 1454
1455 meter->progress = gtk_progress_bar_new (); 1455 meter->progress = gtk_progress_bar_new ();
1456 1456
1457 meter->button = gtk_button_new_with_label (_("Cancel")); 1457 meter->button = gtk_button_new_with_label (_("Cancel"));
1458 gtk_signal_connect (GTK_OBJECT (meter->button), "clicked", GTK_SIGNAL_FUNC (cancel_signon), meter); 1458 g_signal_connect (GTK_OBJECT (meter->button), "clicked", G_CALLBACK (cancel_signon), meter);
1459 1459
1460 gtk_table_attach (GTK_TABLE (table), graphic, 0, 1, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); 1460 gtk_table_attach (GTK_TABLE (table), graphic, 0, 1, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
1461 gtk_table_attach (GTK_TABLE (table), nest_vbox, 1, 2, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); 1461 gtk_table_attach (GTK_TABLE (table), nest_vbox, 1, 2, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
1462 gtk_box_pack_start (GTK_BOX (nest_vbox), GTK_WIDGET (label), FALSE, FALSE, 0); 1462 gtk_box_pack_start (GTK_BOX (nest_vbox), GTK_WIDGET (label), FALSE, FALSE, 0);
1463 gtk_box_pack_start (GTK_BOX (nest_vbox), GTK_WIDGET (meter->status), FALSE, FALSE, 0); 1463 gtk_box_pack_start (GTK_BOX (nest_vbox), GTK_WIDGET (meter->status), FALSE, FALSE, 0);
1513 gtk_container_set_border_width (GTK_CONTAINER (meter_win->table), 5); 1513 gtk_container_set_border_width (GTK_CONTAINER (meter_win->table), 5);
1514 gtk_table_set_row_spacings (GTK_TABLE (meter_win->table), 5); 1514 gtk_table_set_row_spacings (GTK_TABLE (meter_win->table), 5);
1515 gtk_table_set_col_spacings (GTK_TABLE (meter_win->table), 10); 1515 gtk_table_set_col_spacings (GTK_TABLE (meter_win->table), 10);
1516 1516
1517 cancel_button = gtk_button_new_with_label (_("Cancel All")); 1517 cancel_button = gtk_button_new_with_label (_("Cancel All"));
1518 gtk_signal_connect_object (GTK_OBJECT (cancel_button), "clicked", GTK_SIGNAL_FUNC (loop_cancel), NULL); 1518 g_signal_connect_swapped (GTK_OBJECT (cancel_button), "clicked", G_CALLBACK (loop_cancel), NULL);
1519 gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (cancel_button), FALSE, FALSE, 0); 1519 gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (cancel_button), FALSE, FALSE, 0);
1520 1520
1521 gtk_signal_connect (GTK_OBJECT (meter_win->window), "delete_event", GTK_SIGNAL_FUNC (meter_destroy), NULL); 1521 g_signal_connect (GTK_OBJECT (meter_win->window), "delete_event", G_CALLBACK (meter_destroy), NULL);
1522 } 1522 }
1523 1523
1524 if (!meter) { 1524 if (!meter) {
1525 char buf[256]; 1525 char buf[256];
1526 1526
1576 gtk_widget_destroy(k->dlg); 1576 gtk_widget_destroy(k->dlg);
1577 k = g_new0(struct kick_dlg, 1); 1577 k = g_new0(struct kick_dlg, 1);
1578 k->user = gc->user; 1578 k->user = gc->user;
1579 k->dlg = do_error_dialog(title, buf, GAIM_ERROR); 1579 k->dlg = do_error_dialog(title, buf, GAIM_ERROR);
1580 kicks = g_slist_append(kicks, k); 1580 kicks = g_slist_append(kicks, k);
1581 gtk_signal_connect(GTK_OBJECT(k->dlg), "destroy", GTK_SIGNAL_FUNC(set_kick_null), k); 1581 g_signal_connect(GTK_OBJECT(k->dlg), "destroy", G_CALLBACK(set_kick_null), k);
1582 if (meter) { 1582 if (meter) {
1583 kill_meter(meter); 1583 kill_meter(meter);
1584 meters = g_slist_remove(meters, meter); 1584 meters = g_slist_remove(meters, meter);
1585 g_free(meter); 1585 g_free(meter);
1586 } 1586 }