Mercurial > pidgin

comparison src/prefs.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 22875a399312
children 511c2b63caa4
comparison
equal deleted inserted replaced
4161:c79961f48063 4162:d3c8d2b40494
210 gtk_size_group_add_widget(sg, button); 210 gtk_size_group_add_widget(sg, button);
211 select = gtk_button_new_from_stock(GTK_STOCK_SELECT_FONT); 211 select = gtk_button_new_from_stock(GTK_STOCK_SELECT_FONT);
212 212
213 if (!(font_options & OPT_FONT_FACE)) 213 if (!(font_options & OPT_FONT_FACE))
214 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); 214 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
215 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), select); 215 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_sensitive), select);
216 gtk_signal_connect(GTK_OBJECT(select), "clicked", GTK_SIGNAL_FUNC(show_font_dialog), NULL); 216 g_signal_connect(GTK_OBJECT(select), "clicked", G_CALLBACK(show_font_dialog), NULL);
217 gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0); 217 gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0);
218 218
219 hbox = gtk_hbox_new(FALSE, 5); 219 hbox = gtk_hbox_new(FALSE, 5);
220 gtk_container_add(GTK_CONTAINER(vbox), hbox); 220 gtk_container_add(GTK_CONTAINER(vbox), hbox);
221 button = gaim_button(_("Use custom si_ze"), &font_options, OPT_FONT_SIZE, hbox); 221 button = gaim_button(_("Use custom si_ze"), &font_options, OPT_FONT_SIZE, hbox);
222 gtk_size_group_add_widget(sg, button); 222 gtk_size_group_add_widget(sg, button);
223 select = gaim_labeled_spin_button(hbox, NULL, &fontsize, 1, 7, NULL); 223 select = gaim_labeled_spin_button(hbox, NULL, &fontsize, 1, 7, NULL);
224 if (!(font_options & OPT_FONT_SIZE)) 224 if (!(font_options & OPT_FONT_SIZE))
225 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); 225 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
226 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), select); 226 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_sensitive), select);
227 227
228 vbox = make_frame(ret, _("Color")); 228 vbox = make_frame(ret, _("Color"));
229 hbox = gtk_hbox_new(FALSE, 5); 229 hbox = gtk_hbox_new(FALSE, 5);
230 gtk_container_add(GTK_CONTAINER(vbox), hbox); 230 gtk_container_add(GTK_CONTAINER(vbox), hbox);
231 231
234 gtk_size_group_add_widget(sg, button); 234 gtk_size_group_add_widget(sg, button);
235 235
236 select = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR); 236 select = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR);
237 gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0); 237 gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0);
238 pref_fg_picture = show_color_pref(hbox, TRUE); 238 pref_fg_picture = show_color_pref(hbox, TRUE);
239 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(update_color), 239 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(update_color),
240 pref_fg_picture); 240 pref_fg_picture);
241 241
242 if (!(font_options & OPT_FONT_FGCOL)) 242 if (!(font_options & OPT_FONT_FGCOL))
243 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); 243 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
244 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), select); 244 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_sensitive), select);
245 gtk_signal_connect(GTK_OBJECT(select), "clicked", GTK_SIGNAL_FUNC(show_fgcolor_dialog), NULL); 245 g_signal_connect(GTK_OBJECT(select), "clicked", G_CALLBACK(show_fgcolor_dialog), NULL);
246 hbox = gtk_hbox_new(FALSE, 5); 246 hbox = gtk_hbox_new(FALSE, 5);
247 gtk_container_add(GTK_CONTAINER(vbox), hbox); 247 gtk_container_add(GTK_CONTAINER(vbox), hbox);
248 248
249 button = gaim_button(_("Bac_kground color"), &font_options, OPT_FONT_BGCOL, hbox); 249 button = gaim_button(_("Bac_kground color"), &font_options, OPT_FONT_BGCOL, hbox);
250 gtk_size_group_add_widget(sg, button); 250 gtk_size_group_add_widget(sg, button);
251 select = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR); 251 select = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR);
252 gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0); 252 gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0);
253 pref_bg_picture = show_color_pref(hbox, FALSE); 253 pref_bg_picture = show_color_pref(hbox, FALSE);
254 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(update_color), 254 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(update_color),
255 pref_bg_picture); 255 pref_bg_picture);
256 256
257 if (!(font_options & OPT_FONT_BGCOL)) 257 if (!(font_options & OPT_FONT_BGCOL))
258 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); 258 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
259 gtk_signal_connect(GTK_OBJECT(select), "clicked", GTK_SIGNAL_FUNC(show_bgcolor_dialog), NULL); 259 g_signal_connect(GTK_OBJECT(select), "clicked", G_CALLBACK(show_bgcolor_dialog), NULL);
260 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), select); 260 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_sensitive), select);
261 261
262 gtk_widget_show_all(ret); 262 gtk_widget_show_all(ret);
263 return ret; 263 return ret;
264 } 264 }
265 265
498 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); 498 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
499 499
500 entry = gtk_entry_new(); 500 entry = gtk_entry_new();
501 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); 501 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
502 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); 502 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
503 gtk_signal_connect(GTK_OBJECT(entry), "changed", 503 g_signal_connect(GTK_OBJECT(entry), "changed",
504 GTK_SIGNAL_FUNC(proxy_print_option), (void *)PROXYHOST); 504 G_CALLBACK(proxy_print_option), (void *)PROXYHOST);
505 gtk_entry_set_text(GTK_ENTRY(entry), proxyhost); 505 gtk_entry_set_text(GTK_ENTRY(entry), proxyhost);
506 506
507 hbox = gtk_hbox_new(TRUE, 5); 507 hbox = gtk_hbox_new(TRUE, 5);
508 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 508 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
509 509
512 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); 512 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
513 513
514 entry = gtk_entry_new(); 514 entry = gtk_entry_new();
515 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); 515 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
516 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); 516 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
517 gtk_signal_connect(GTK_OBJECT(entry), "changed", 517 g_signal_connect(GTK_OBJECT(entry), "changed",
518 GTK_SIGNAL_FUNC(proxy_print_option), (void *)PROXYPORT); 518 G_CALLBACK(proxy_print_option), (void *)PROXYPORT);
519 519
520 if (proxyport) { 520 if (proxyport) {
521 char buf[128]; 521 char buf[128];
522 g_snprintf(buf, sizeof(buf), "%d", proxyport); 522 g_snprintf(buf, sizeof(buf), "%d", proxyport);
523 gtk_entry_set_text(GTK_ENTRY(entry), buf); 523 gtk_entry_set_text(GTK_ENTRY(entry), buf);
528 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); 528 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
529 529
530 entry = gtk_entry_new(); 530 entry = gtk_entry_new();
531 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); 531 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
532 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 2, 3, GTK_FILL, 0, 0, 0); 532 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
533 gtk_signal_connect(GTK_OBJECT(entry), "changed", 533 g_signal_connect(GTK_OBJECT(entry), "changed",
534 GTK_SIGNAL_FUNC(proxy_print_option), (void *)PROXYUSER); 534 G_CALLBACK(proxy_print_option), (void *)PROXYUSER);
535 gtk_entry_set_text(GTK_ENTRY(entry), proxyuser); 535 gtk_entry_set_text(GTK_ENTRY(entry), proxyuser);
536 536
537 hbox = gtk_hbox_new(TRUE, 5); 537 hbox = gtk_hbox_new(TRUE, 5);
538 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 538 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
539 539
543 543
544 entry = gtk_entry_new(); 544 entry = gtk_entry_new();
545 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); 545 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
546 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 3, 4, GTK_FILL , 0, 0, 0); 546 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 3, 4, GTK_FILL , 0, 0, 0);
547 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); 547 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
548 gtk_signal_connect(GTK_OBJECT(entry), "changed", 548 g_signal_connect(GTK_OBJECT(entry), "changed",
549 GTK_SIGNAL_FUNC(proxy_print_option), (void *)PROXYPASS); 549 G_CALLBACK(proxy_print_option), (void *)PROXYPASS);
550 gtk_entry_set_text(GTK_ENTRY(entry), proxypass); 550 gtk_entry_set_text(GTK_ENTRY(entry), proxypass);
551 551
552 gtk_widget_show_all(ret); 552 gtk_widget_show_all(ret);
553 return ret; 553 return ret;
554 } 554 }
598 if (web_browser != BROWSER_MANUAL) 598 if (web_browser != BROWSER_MANUAL)
599 gtk_widget_set_sensitive(browser_entry, FALSE); 599 gtk_widget_set_sensitive(browser_entry, FALSE);
600 gtk_box_pack_start (GTK_BOX (hbox), browser_entry, FALSE, FALSE, 0); 600 gtk_box_pack_start (GTK_BOX (hbox), browser_entry, FALSE, FALSE, 0);
601 601
602 gtk_entry_set_text(GTK_ENTRY(browser_entry), web_command); 602 gtk_entry_set_text(GTK_ENTRY(browser_entry), web_command);
603 gtk_signal_connect(GTK_OBJECT(browser_entry), "changed", 603 g_signal_connect(GTK_OBJECT(browser_entry), "changed",
604 GTK_SIGNAL_FUNC(browser_print_option), NULL); 604 G_CALLBACK(browser_print_option), NULL);
605 #endif /* end !_WIN32 */ 605 #endif /* end !_WIN32 */
606 vbox = make_frame (ret, _("Browser Options")); 606 vbox = make_frame (ret, _("Browser Options"));
607 label = gaim_button(_("Open new _window by default"), &misc_options, OPT_MISC_BROWSER_POPUP, vbox); 607 label = gaim_button(_("Open new _window by default"), &misc_options, OPT_MISC_BROWSER_POPUP, vbox);
608 #ifdef _WIN32 608 #ifdef _WIN32
609 /* Until I figure out how to implement this on windows */ 609 /* Until I figure out how to implement this on windows */
705 gtk_entry_set_text(GTK_ENTRY(sndcmd), sound_cmd); 705 gtk_entry_set_text(GTK_ENTRY(sndcmd), sound_cmd);
706 gtk_widget_set_size_request(sndcmd, 75, -1); 706 gtk_widget_set_size_request(sndcmd, 75, -1);
707 707
708 gtk_widget_set_sensitive(sndcmd, (sound_options & OPT_SOUND_CMD)); 708 gtk_widget_set_sensitive(sndcmd, (sound_options & OPT_SOUND_CMD));
709 gtk_box_pack_start(GTK_BOX(hbox), sndcmd, TRUE, TRUE, 5); 709 gtk_box_pack_start(GTK_BOX(hbox), sndcmd, TRUE, TRUE, 5);
710 gtk_signal_connect(GTK_OBJECT(sndcmd), "changed", GTK_SIGNAL_FUNC(sound_cmd_yeah), NULL); 710 g_signal_connect(GTK_OBJECT(sndcmd), "changed", G_CALLBACK(sound_cmd_yeah), NULL);
711 #endif /* _WIN32 */ 711 #endif /* _WIN32 */
712 gtk_widget_show_all(ret); 712 gtk_widget_show_all(ret);
713 return ret; 713 return ret;
714 } 714 }
715 715
763 vbox = make_frame (ret, _("Auto-away")); 763 vbox = make_frame (ret, _("Auto-away"));
764 button = gaim_button(_("Set away _when idle"), &away_options, OPT_AWAY_AUTO, vbox); 764 button = gaim_button(_("Set away _when idle"), &away_options, OPT_AWAY_AUTO, vbox);
765 select = gaim_labeled_spin_button(vbox, _("_Minutes before setting away:"), &auto_away, 1, 24 * 60, sg); 765 select = gaim_labeled_spin_button(vbox, _("_Minutes before setting away:"), &auto_away, 1, 24 * 60, sg);
766 if (!(away_options & OPT_AWAY_AUTO)) 766 if (!(away_options & OPT_AWAY_AUTO))
767 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); 767 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
768 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), select); 768 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_sensitive), select);
769 769
770 label = gtk_label_new_with_mnemonic(_("Away m_essage:")); 770 label = gtk_label_new_with_mnemonic(_("Away m_essage:"));
771 gtk_size_group_add_widget(sg, label); 771 gtk_size_group_add_widget(sg, label);
772 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 772 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
773 hbox = gtk_hbox_new(FALSE, 0); 773 hbox = gtk_hbox_new(FALSE, 0);
775 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); 775 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
776 prefs_away_menu = gtk_option_menu_new(); 776 prefs_away_menu = gtk_option_menu_new();
777 gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefs_away_menu); 777 gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefs_away_menu);
778 if (!(away_options & OPT_AWAY_AUTO)) 778 if (!(away_options & OPT_AWAY_AUTO))
779 gtk_widget_set_sensitive(GTK_WIDGET(prefs_away_menu), FALSE); 779 gtk_widget_set_sensitive(GTK_WIDGET(prefs_away_menu), FALSE);
780 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), prefs_away_menu); 780 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_sensitive), prefs_away_menu);
781 default_away_menu_init(prefs_away_menu); 781 default_away_menu_init(prefs_away_menu);
782 gtk_widget_show(prefs_away_menu); 782 gtk_widget_show(prefs_away_menu);
783 gtk_box_pack_start(GTK_BOX(hbox), prefs_away_menu, FALSE, FALSE, 0); 783 gtk_box_pack_start(GTK_BOX(hbox), prefs_away_menu, FALSE, FALSE, 0);
784 784
785 gtk_widget_show_all(ret); 785 gtk_widget_show_all(ret);
1111 1111
1112 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S, last_sound_dir ? last_sound_dir : gaim_home_dir()); 1112 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S, last_sound_dir ? last_sound_dir : gaim_home_dir());
1113 1113
1114 gtk_file_selection_set_filename(GTK_FILE_SELECTION(sounddialog), buf); 1114 gtk_file_selection_set_filename(GTK_FILE_SELECTION(sounddialog), buf);
1115 1115
1116 gtk_signal_connect(GTK_OBJECT(sounddialog), "destroy", 1116 g_signal_connect(GTK_OBJECT(sounddialog), "destroy",
1117 GTK_SIGNAL_FUNC(close_sounddialog), sounddialog); 1117 G_CALLBACK(close_sounddialog), sounddialog);
1118 1118
1119 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(sounddialog)->ok_button), 1119 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(sounddialog)->ok_button),
1120 "clicked", GTK_SIGNAL_FUNC(do_select_sound), (int *)sound_row_sel); 1120 "clicked", G_CALLBACK(do_select_sound), (int *)sound_row_sel);
1121 1121
1122 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(sounddialog)->cancel_button), 1122 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(sounddialog)->cancel_button),
1123 "clicked", GTK_SIGNAL_FUNC(close_sounddialog), sounddialog); 1123 "clicked", G_CALLBACK(close_sounddialog), sounddialog);
1124 } 1124 }
1125 1125
1126 g_free(buf); 1126 g_free(buf);
1127 gtk_widget_show(sounddialog); 1127 gtk_widget_show(sounddialog);
1128 gdk_window_raise(sounddialog->window); 1128 gdk_window_raise(sounddialog->window);
1213 gtk_entry_set_text(GTK_ENTRY(sound_entry), sound_file[0] ? sound_file[0] : "(default)"); 1213 gtk_entry_set_text(GTK_ENTRY(sound_entry), sound_file[0] ? sound_file[0] : "(default)");
1214 gtk_entry_set_editable(GTK_ENTRY(sound_entry), FALSE); 1214 gtk_entry_set_editable(GTK_ENTRY(sound_entry), FALSE);
1215 gtk_box_pack_start(GTK_BOX(hbox), sound_entry, FALSE, FALSE, 5); 1215 gtk_box_pack_start(GTK_BOX(hbox), sound_entry, FALSE, FALSE, 5);
1216 1216
1217 button = gtk_button_new_with_label(_("Test")); 1217 button = gtk_button_new_with_label(_("Test"));
1218 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(test_sound), NULL); 1218 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(test_sound), NULL);
1219 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); 1219 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);
1220 1220
1221 button = gtk_button_new_with_label(_("Reset")); 1221 button = gtk_button_new_with_label(_("Reset"));
1222 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(reset_sound), NULL); 1222 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(reset_sound), NULL);
1223 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); 1223 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);
1224 1224
1225 button = gtk_button_new_with_label(_("Choose...")); 1225 button = gtk_button_new_with_label(_("Choose..."));
1226 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(sel_sound), NULL); 1226 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(sel_sound), NULL);
1227 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); 1227 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);
1228 1228
1229 gtk_widget_show_all (ret); 1229 gtk_widget_show_all (ret);
1230 1230
1231 return ret; 1231 return ret;
1340 hbox = gtk_hbox_new(TRUE, 5); 1340 hbox = gtk_hbox_new(TRUE, 5);
1341 gtk_box_pack_start(GTK_BOX(ret), hbox, FALSE, FALSE, 0); 1341 gtk_box_pack_start(GTK_BOX(ret), hbox, FALSE, FALSE, 0);
1342 button = gtk_button_new_from_stock (GTK_STOCK_ADD); 1342 button = gtk_button_new_from_stock (GTK_STOCK_ADD);
1343 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1343 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1344 gtk_size_group_add_widget(sg, button); 1344 gtk_size_group_add_widget(sg, button);
1345 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_away_mess), NULL); 1345 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(create_away_mess), NULL);
1346 1346
1347 button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); 1347 button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
1348 gtk_size_group_add_widget(sg, button); 1348 gtk_size_group_add_widget(sg, button);
1349 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(remove_away_message), event_view); 1349 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(remove_away_message), event_view);
1350 1350
1351 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1351 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1352 1352
1353 button = gaim_pixbuf_button(_("_Edit"), "edit.png", GAIM_BUTTON_HORIZONTAL); 1353 button = gaim_pixbuf_button(_("_Edit"), "edit.png", GAIM_BUTTON_HORIZONTAL);
1354 gtk_size_group_add_widget(sg, button); 1354 gtk_size_group_add_widget(sg, button);
1355 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_away_mess), event_view); 1355 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(create_away_mess), event_view);
1356 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1356 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1357 1357
1358 gtk_widget_show_all(ret); 1358 gtk_widget_show_all(ret);
1359 return ret; 1359 return ret;
1360 } 1360 }
1444 prefs = gtk_window_new(GTK_WINDOW_TOPLEVEL); 1444 prefs = gtk_window_new(GTK_WINDOW_TOPLEVEL);
1445 gtk_window_set_role(GTK_WINDOW(prefs), "preferences"); 1445 gtk_window_set_role(GTK_WINDOW(prefs), "preferences");
1446 gtk_widget_realize(prefs); 1446 gtk_widget_realize(prefs);
1447 gtk_window_set_title(GTK_WINDOW(prefs), _("Gaim - Preferences")); 1447 gtk_window_set_title(GTK_WINDOW(prefs), _("Gaim - Preferences"));
1448 gtk_window_set_policy (GTK_WINDOW(prefs), FALSE, FALSE, TRUE); 1448 gtk_window_set_policy (GTK_WINDOW(prefs), FALSE, FALSE, TRUE);
1449 gtk_signal_connect(GTK_OBJECT(prefs), "destroy", GTK_SIGNAL_FUNC(delete_prefs), NULL); 1449 g_signal_connect(GTK_OBJECT(prefs), "destroy", G_CALLBACK(delete_prefs), NULL);
1450 1450
1451 vbox = gtk_vbox_new(FALSE, 5); 1451 vbox = gtk_vbox_new(FALSE, 5);
1452 gtk_container_border_width(GTK_CONTAINER(vbox), 5); 1452 gtk_container_border_width(GTK_CONTAINER(vbox), 5);
1453 gtk_container_add(GTK_CONTAINER(prefs), vbox); 1453 gtk_container_add(GTK_CONTAINER(prefs), vbox);
1454 gtk_widget_show(vbox); 1454 gtk_widget_show(vbox);
1525 gtk_container_add (GTK_CONTAINER(vbox), hbox); 1525 gtk_container_add (GTK_CONTAINER(vbox), hbox);
1526 gtk_widget_show (hbox); 1526 gtk_widget_show (hbox);
1527 1527
1528 button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); 1528 button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
1529 gtk_size_group_add_widget(sg, button); 1529 gtk_size_group_add_widget(sg, button);
1530 gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs); 1530 g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy), prefs);
1531 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1531 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1532 gtk_widget_show(button); 1532 gtk_widget_show(button);
1533 1533
1534 prefs_notebook_init(); 1534 prefs_notebook_init();
1535 1535
1739 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (*options & option)); 1739 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (*options & option));
1740 gtk_box_pack_start(GTK_BOX(page), button, FALSE, FALSE, 0); 1740 gtk_box_pack_start(GTK_BOX(page), button, FALSE, FALSE, 0);
1741 gtk_object_set_user_data(GTK_OBJECT(button), options); 1741 gtk_object_set_user_data(GTK_OBJECT(button), options);
1742 1742
1743 if (options == &misc_options) { 1743 if (options == &misc_options) {
1744 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_misc_option), 1744 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_misc_option),
1745 (int *)option); 1745 (int *)option);
1746 } else if (options == &logging_options) { 1746 } else if (options == &logging_options) {
1747 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_logging_option), 1747 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_logging_option),
1748 (int *)option); 1748 (int *)option);
1749 } else if (options == &blist_options) { 1749 } else if (options == &blist_options) {
1750 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_blist_option), 1750 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_blist_option),
1751 (int *)option); 1751 (int *)option);
1752 } else if (options == &convo_options) { 1752 } else if (options == &convo_options) {
1753 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_convo_option), 1753 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_convo_option),
1754 (int *)option); 1754 (int *)option);
1755 } else if (options == &im_options) { 1755 } else if (options == &im_options) {
1756 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_im_option), 1756 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_im_option),
1757 (int *)option); 1757 (int *)option);
1758 } else if (options == &chat_options) { 1758 } else if (options == &chat_options) {
1759 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_chat_option), 1759 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_chat_option),
1760 (int *)option); 1760 (int *)option);
1761 } else if (options == &font_options) { 1761 } else if (options == &font_options) {
1762 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_font_option), 1762 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_font_option),
1763 (int *)option); 1763 (int *)option);
1764 } else if (options == &sound_options) { 1764 } else if (options == &sound_options) {
1765 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_sound_option), 1765 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_sound_option),
1766 (int *)option); 1766 (int *)option);
1767 } else if (options == &away_options) { 1767 } else if (options == &away_options) {
1768 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_away_option), 1768 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_away_option),
1769 (int *)option); 1769 (int *)option);
1770 } else { 1770 } else {
1771 debug_printf("gaim_button: \"%s\" has no signal handler attached to it!\n", text); 1771 debug_printf("gaim_button: \"%s\" has no signal handler attached to it!\n", text);
1772 } 1772 }
1773 gtk_widget_show(button); 1773 gtk_widget_show(button);
1787 menu = gtk_menu_new(); 1787 menu = gtk_menu_new();
1788 1788
1789 while (awy) { 1789 while (awy) {
1790 a = (struct away_message *)awy->data; 1790 a = (struct away_message *)awy->data;
1791 opt = gtk_menu_item_new_with_label(a->name); 1791 opt = gtk_menu_item_new_with_label(a->name);
1792 gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_default_away), 1792 g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(set_default_away),
1793 (gpointer)index); 1793 (gpointer)index);
1794 gtk_widget_show(opt); 1794 gtk_widget_show(opt);
1795 gtk_menu_append(GTK_MENU(menu), opt); 1795 gtk_menu_append(GTK_MENU(menu), opt);
1796 1796
1797 awy = awy->next; 1797 awy = awy->next;
1905 adjust = gtk_adjustment_new(*val, min, max, 1, 1, 1); 1905 adjust = gtk_adjustment_new(*val, min, max, 1, 1, 1);
1906 spin = gtk_spin_button_new(GTK_ADJUSTMENT(adjust), 1, 0); 1906 spin = gtk_spin_button_new(GTK_ADJUSTMENT(adjust), 1, 0);
1907 gtk_object_set_user_data(GTK_OBJECT(spin), val); 1907 gtk_object_set_user_data(GTK_OBJECT(spin), val);
1908 gtk_widget_set_usize(spin, 50, -1); 1908 gtk_widget_set_usize(spin, 50, -1);
1909 gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); 1909 gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
1910 gtk_signal_connect(GTK_OBJECT(adjust), "value-changed", 1910 g_signal_connect(GTK_OBJECT(adjust), "value-changed",
1911 GTK_SIGNAL_FUNC(update_spin_value), GTK_WIDGET(spin)); 1911 G_CALLBACK(update_spin_value), GTK_WIDGET(spin));
1912 gtk_widget_show(spin); 1912 gtk_widget_show(spin);
1913 1913
1914 gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin); 1914 gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin);
1915 1915
1916 if (sg) { 1916 if (sg) {
1996 while (text) { 1996 while (text) {
1997 value = va_arg(menuitems, int); 1997 value = va_arg(menuitems, int);
1998 opt = gtk_menu_item_new_with_label(text); 1998 opt = gtk_menu_item_new_with_label(text);
1999 gtk_object_set_user_data(GTK_OBJECT(opt), (void *)value); 1999 gtk_object_set_user_data(GTK_OBJECT(opt), (void *)value);
2000 gtk_object_set_data(GTK_OBJECT(opt), "clear", (void *)clear); 2000 gtk_object_set_data(GTK_OBJECT(opt), "clear", (void *)clear);
2001 gtk_signal_connect(GTK_OBJECT(opt), "activate", 2001 g_signal_connect(GTK_OBJECT(opt), "activate",
2002 GTK_SIGNAL_FUNC(dropdown_set), (void *)option); 2002 G_CALLBACK(dropdown_set), (void *)option);
2003 gtk_widget_show(opt); 2003 gtk_widget_show(opt);
2004 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); 2004 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
2005 2005
2006 if (((clear > -1) && ((*option & value) == value)) || *option == value) { 2006 if (((clear > -1) && ((*option & value) == value)) || *option == value) {
2007 gtk_menu_set_active(GTK_MENU(menu), o); 2007 gtk_menu_set_active(GTK_MENU(menu), o);