Mercurial > pidgin.yaz
comparison src/gtkprefs.c @ 10356:393750603513
[gaim-migrate @ 11573]
Removed conversation buttons.`
committer: Tailor Script <tailor@pidgin.im>
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Mon, 13 Dec 2004 03:04:07 +0000 |
parents | d3545b0c6b1c |
children | 524674a4f6bb |
comparison
equal
deleted
inserted
replaced
10355:d3545b0c6b1c | 10356:393750603513 |
---|---|
884 gtk_container_set_border_width(GTK_CONTAINER(ret), 12); | 884 gtk_container_set_border_width(GTK_CONTAINER(ret), 12); |
885 | 885 |
886 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); | 886 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
887 vbox = gaim_gtk_make_frame(ret, _("Conversations")); | 887 vbox = gaim_gtk_make_frame(ret, _("Conversations")); |
888 | 888 |
889 label = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT, | |
890 "/gaim/gtk/conversations/button_type", | |
891 _("Pictures"), GAIM_BUTTON_IMAGE, | |
892 _("Text"), GAIM_BUTTON_TEXT, | |
893 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE, | |
894 _("None"), GAIM_BUTTON_NONE, | |
895 NULL); | |
896 gtk_size_group_add_widget(sg, label); | |
897 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | |
898 | |
899 #if 0 | |
900 gaim_gtk_prefs_checkbox(_("Enable \"_slash\" commands"), | |
901 "/gaim/gtk/conversations/enable_commands", vbox); | |
902 #endif | |
903 gaim_gtk_prefs_checkbox(_("Send unknown \"_slash\" commands as messages"), | 889 gaim_gtk_prefs_checkbox(_("Send unknown \"_slash\" commands as messages"), |
904 "/gaim/gtk/conversations/passthrough_unknown_commands", vbox); | 890 "/gaim/gtk/conversations/passthrough_unknown_commands", vbox); |
905 | 891 |
906 gaim_gtk_prefs_checkbox(_("Show _formatting toolbar"), | 892 gaim_gtk_prefs_checkbox(_("Show _formatting toolbar"), |
907 "/gaim/gtk/conversations/show_formatting_toolbar", vbox); | 893 "/gaim/gtk/conversations/show_formatting_toolbar", vbox); |
2355 "/gaim/gtk/conversations/placement"); | 2341 "/gaim/gtk/conversations/placement"); |
2356 | 2342 |
2357 gaim_prefs_rename("/gaim/gtk/conversations/use_custom_font", | 2343 gaim_prefs_rename("/gaim/gtk/conversations/use_custom_font", |
2358 "/gaim/gtk/conversations/send_formatting"); | 2344 "/gaim/gtk/conversations/send_formatting"); |
2359 | 2345 |
2360 gaim_prefs_rename("/gaim/gtk/conversations/im/button_type", | |
2361 "/gaim/gtk/conversations/button_type"); | |
2362 | |
2363 gaim_prefs_rename("/gaim/gtk/debug/timestamps", "/core/debug/timestamps"); | 2346 gaim_prefs_rename("/gaim/gtk/debug/timestamps", "/core/debug/timestamps"); |
2364 | 2347 |
2365 /* Remove some no-longer-used prefs */ | 2348 /* Remove some no-longer-used prefs */ |
2366 gaim_prefs_remove("/gaim/gtk/blist/button_style"); | 2349 gaim_prefs_remove("/gaim/gtk/blist/button_style"); |
2367 gaim_prefs_remove("/gaim/gtk/blist/grey_idle_buddies"); | 2350 gaim_prefs_remove("/gaim/gtk/blist/grey_idle_buddies"); |
2368 gaim_prefs_remove("/gaim/gtk/blist/raise_on_events"); | 2351 gaim_prefs_remove("/gaim/gtk/blist/raise_on_events"); |
2369 gaim_prefs_remove("/gaim/gtk/blist/show_group_count"); | 2352 gaim_prefs_remove("/gaim/gtk/blist/show_group_count"); |
2370 gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts"); | 2353 gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts"); |
2371 gaim_prefs_remove("/gaim/gtk/blist/show_idle_time"); | 2354 gaim_prefs_remove("/gaim/gtk/blist/show_idle_time"); |
2372 gaim_prefs_remove("/gaim/gtk/blist/show_warning_level"); | 2355 gaim_prefs_remove("/gaim/gtk/blist/show_warning_level"); |
2356 gaim_prefs_remove("/gaim/gtk/conversations/im/button_type"); | |
2373 gaim_prefs_remove("/gaim/gtk/conversations/html_shortcuts"); | 2357 gaim_prefs_remove("/gaim/gtk/conversations/html_shortcuts"); |
2374 gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs"); | 2358 gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs"); |
2375 gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links"); | 2359 gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links"); |
2376 gaim_prefs_remove("/gaim/gtk/conversations/show_smileys"); | 2360 gaim_prefs_remove("/gaim/gtk/conversations/show_smileys"); |
2377 gaim_prefs_remove("/gaim/gtk/conversations/smiley_shortcuts"); | 2361 gaim_prefs_remove("/gaim/gtk/conversations/smiley_shortcuts"); |