Mercurial > pidgin
comparison src/gtkprefs.c @ 9025:b24967757d46
[gaim-migrate @ 9801]
"
- Fixed text-decoration: underline; parsing from being dependent on font-size
specified
- IM HTML Toolbar dialogs now automatically fill with the color/font for the
current text
- Made most of the IMHTML formatting buttons fire signals where appropriate
- Implemented a global on or off "Send default formatting with outgoing
messages" option
- If user previously sent a font name, we assume they want formatting on,
otherwise it defaults to off.
- Removed font and color from the GaimGtkConversation struct, because this
wasn't being used anywhere, by anything and just resulted in more confusing
code.
- Removed three functions related to the struct, including one that was
declared, but never actually written.
- Added get_current_fontface, get_current_fontsize, get_current_forecolor,
get_current_backcolor to gtk_imhtml_* to get the formatting at the cursor
(or whole buffer when wbfo is on)
- Removed all dialogs used only by the old default formatting preferences from
dialogs.c
- When font background, color, or face are "disabled" they are stored as an
empty string in their prefs.
- Fixed a bug where NULL for background, color, or face did not remove the
tags in wbfo
" all that, quoth SimGuy
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Sun, 23 May 2004 03:54:20 +0000 |
parents | 3738d1eac0ad |
children | f01eef2c264a |
comparison
equal
deleted
inserted
replaced
9024:85caba2f820a | 9025:b24967757d46 |
---|---|
90 * PROTOTYPES | 90 * PROTOTYPES |
91 */ | 91 */ |
92 static GtkTreeIter *prefs_notebook_add_page(const char*, GdkPixbuf*, | 92 static GtkTreeIter *prefs_notebook_add_page(const char*, GdkPixbuf*, |
93 GtkWidget*, GtkTreeIter*, | 93 GtkWidget*, GtkTreeIter*, |
94 GtkTreeIter*, int); | 94 GtkTreeIter*, int); |
95 #if 0 /* PREFSLASH04 */ | |
96 static GtkWidget *show_color_pref(GtkWidget *, gboolean); | |
97 #endif | |
98 static void delete_prefs(GtkWidget *, void *); | 95 static void delete_prefs(GtkWidget *, void *); |
99 static void update_plugin_list(void *data); | 96 static void update_plugin_list(void *data); |
100 | 97 |
101 static void set_default_away(GtkWidget *, gpointer); | 98 static void set_default_away(GtkWidget *, gpointer); |
102 | 99 |
694 gaim_set_accessible_label (view, label); | 691 gaim_set_accessible_label (view, label); |
695 | 692 |
696 return ret; | 693 return ret; |
697 } | 694 } |
698 | 695 |
699 static void update_color(GtkWidget *w, GtkWidget *pic) | 696 static void |
700 { | 697 formatting_reset_cb(GtkWidget *w, GtkWidget* imhtml) { |
701 GdkColor c; | 698 gboolean bold, italic, uline; |
702 GtkStyle *style; | 699 bold = italic = uline = FALSE; |
703 GdkColor color; | 700 |
704 | 701 gtk_imhtml_get_current_format(GTK_IMHTML(imhtml), &bold, &italic, &uline); |
705 c.pixel = 0; | 702 if (bold) |
706 | 703 gtk_imhtml_toggle_bold(GTK_IMHTML(imhtml)); |
707 if (pic == pref_fg_picture) { | 704 if (italic) |
708 if (gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_fgcolor")) { | 705 gtk_imhtml_toggle_italic(GTK_IMHTML(imhtml)); |
709 gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"), | 706 if (uline) |
710 &color); | 707 gtk_imhtml_toggle_underline(GTK_IMHTML(imhtml)); |
711 c.red = color.red; | 708 |
712 c.blue = color.blue; | 709 gtk_imhtml_font_set_size(GTK_IMHTML(imhtml), 3); |
713 c.green = color.green; | 710 gtk_imhtml_toggle_forecolor(GTK_IMHTML(imhtml), NULL); |
714 } else { | 711 gtk_imhtml_toggle_backcolor(GTK_IMHTML(imhtml), NULL); |
715 c.red = 0; | 712 gtk_imhtml_toggle_fontface(GTK_IMHTML(imhtml), NULL); |
716 c.blue = 0; | 713 } |
717 c.green = 0; | 714 |
718 } | 715 static void |
719 } else { | 716 formatting_toggle_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons, void *bah) |
720 if (gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_bgcolor")) { | 717 { |
721 gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"), | 718 gboolean bold, italic, uline; |
722 &color); | 719 |
723 c.red = color.red; | 720 bold = italic = uline = FALSE; |
724 c.blue = color.blue; | 721 gtk_imhtml_get_current_format(GTK_IMHTML(imhtml), |
725 c.green = color.green; | 722 &bold, &italic, &uline); |
726 } else { | 723 |
727 c.red = 0xffff; | 724 if (buttons & GTK_IMHTML_BOLD) |
728 c.blue = 0xffff; | 725 gaim_prefs_set_bool("/gaim/gtk/conversations/send_bold", bold); |
729 c.green = 0xffff; | 726 if (buttons & GTK_IMHTML_ITALIC) |
730 } | 727 gaim_prefs_set_bool("/gaim/gtk/conversations/send_italic", italic); |
731 } | 728 if (buttons & GTK_IMHTML_UNDERLINE) |
732 | 729 gaim_prefs_set_bool("/gaim/gtk/conversations/send_underline", uline); |
733 style = gtk_style_new(); | 730 |
734 style->bg[0] = c; | 731 if (buttons & GTK_IMHTML_GROW || buttons & GTK_IMHTML_SHRINK) |
735 gtk_widget_set_style(pic, style); | 732 gaim_prefs_set_int("/gaim/gtk/conversations/font_size", |
736 g_object_unref(style); | 733 gtk_imhtml_get_current_fontsize(GTK_IMHTML(imhtml))); |
734 if (buttons & GTK_IMHTML_FACE) { | |
735 char *face = gtk_imhtml_get_current_fontface(GTK_IMHTML(imhtml)); | |
736 if (!face) | |
737 face = g_strdup(""); | |
738 | |
739 gaim_prefs_set_string("/gaim/gtk/conversations/font_face", face); | |
740 g_free(face); | |
741 } | |
742 | |
743 if (buttons & GTK_IMHTML_FORECOLOR) { | |
744 char *color = gtk_imhtml_get_current_forecolor(GTK_IMHTML(imhtml)); | |
745 if (!color) | |
746 color = g_strdup(""); | |
747 | |
748 gaim_prefs_set_string("/gaim/gtk/conversations/fgcolor", color); | |
749 g_free(color); | |
750 } | |
751 | |
752 if (buttons & GTK_IMHTML_BACKCOLOR) { | |
753 char *color = gtk_imhtml_get_current_backcolor(GTK_IMHTML(imhtml)); | |
754 if (!color) | |
755 color = g_strdup(""); | |
756 | |
757 gaim_prefs_set_string("/gaim/gtk/conversations/bgcolor", color); | |
758 g_free(color); | |
759 } | |
737 } | 760 } |
738 | 761 |
739 GtkWidget *messages_page() { | 762 GtkWidget *messages_page() { |
740 GtkWidget *ret; | 763 GtkWidget *ret; |
741 GtkWidget *vbox; | 764 GtkWidget *vbox, *fontvbox; |
742 GtkWidget *imhtml; | 765 GtkWidget *imhtml; |
743 GtkWidget *toolbar; | 766 GtkWidget *toolbar; |
744 GtkWidget *sw; | 767 GtkWidget *sw; |
745 GtkWidget *frame; | 768 GtkWidget *frame; |
769 GtkWidget *option; | |
770 GtkWidget *button; | |
746 | 771 |
747 ret = gtk_vbox_new(FALSE, 18); | 772 ret = gtk_vbox_new(FALSE, 18); |
748 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); | 773 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); |
749 | 774 |
750 vbox = gaim_gtk_make_frame (ret, _("Display")); | 775 vbox = gaim_gtk_make_frame (ret, _("Display")); |
752 "/gaim/gtk/conversations/show_timestamps", vbox); | 777 "/gaim/gtk/conversations/show_timestamps", vbox); |
753 #ifdef USE_GTKSPELL | 778 #ifdef USE_GTKSPELL |
754 gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"), | 779 gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"), |
755 "/gaim/gtk/conversations/spellcheck", vbox); | 780 "/gaim/gtk/conversations/spellcheck", vbox); |
756 #endif | 781 #endif |
757 gaim_gtk_prefs_checkbox(_("Ignore formatting on incoming messages"), | 782 gaim_gtk_prefs_checkbox(_("_Ignore formatting on incoming messages"), |
758 "/gaim/gtk/conversations/ignore_formatting", vbox); | 783 "/gaim/gtk/conversations/ignore_formatting", vbox); |
759 | 784 |
760 vbox = gaim_gtk_make_frame (ret, _("Default Formatting")); | 785 vbox = gaim_gtk_make_frame (ret, _("Default Formatting")); |
786 | |
787 option = gaim_gtk_prefs_checkbox(_("_Send default formatting with outgoing messages"), | |
788 "/gaim/gtk/conversations/send_formatting", vbox); | |
761 | 789 |
762 frame = gtk_frame_new(NULL); | 790 frame = gtk_frame_new(NULL); |
763 gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); | 791 gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); |
764 gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); | 792 gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); |
765 | 793 |
766 vbox = gtk_vbox_new(FALSE, 0); | 794 fontvbox = gtk_vbox_new(FALSE, 0); |
767 gtk_container_add(GTK_CONTAINER(frame), vbox); | 795 gtk_container_add(GTK_CONTAINER(frame), fontvbox); |
768 | 796 |
769 toolbar = gtk_imhtmltoolbar_new(); | 797 toolbar = gtk_imhtmltoolbar_new(); |
770 gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); | 798 gtk_box_pack_start(GTK_BOX(fontvbox), toolbar, FALSE, FALSE, 0); |
771 | 799 |
772 sw = gtk_scrolled_window_new(NULL, NULL); | 800 sw = gtk_scrolled_window_new(NULL, NULL); |
773 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), | 801 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), |
774 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); | 802 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); |
775 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE); | 803 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE); |
776 gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); | 804 gtk_box_pack_start(GTK_BOX(fontvbox), sw, TRUE, TRUE, 0); |
777 | 805 |
778 imhtml = gtk_imhtml_new(NULL, NULL); | 806 imhtml = gtk_imhtml_new(NULL, NULL); |
807 gtk_widget_set_name(imhtml, "gaim_gtkprefs_font_imhtml"); | |
779 gtk_imhtml_set_editable(GTK_IMHTML(imhtml), TRUE); | 808 gtk_imhtml_set_editable(GTK_IMHTML(imhtml), TRUE); |
780 gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE); | 809 gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE); |
781 gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE); | 810 gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE); |
782 | 811 |
783 gtk_imhtml_smiley_shortcuts(GTK_IMHTML(imhtml), | 812 gtk_imhtml_smiley_shortcuts(GTK_IMHTML(imhtml), |
785 gtk_imhtml_html_shortcuts(GTK_IMHTML(imhtml), | 814 gtk_imhtml_html_shortcuts(GTK_IMHTML(imhtml), |
786 gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts")); | 815 gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts")); |
787 gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(toolbar), imhtml); | 816 gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(toolbar), imhtml); |
788 gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(toolbar), "default"); | 817 gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(toolbar), "default"); |
789 gaim_setup_imhtml(imhtml); | 818 gaim_setup_imhtml(imhtml); |
790 gtk_imhtml_append_text(GTK_IMHTML(imhtml), "This is preview text", 0); | 819 gtk_imhtml_append_text(GTK_IMHTML(imhtml), _("This is how your outgoing message text will appear when you use protocols that support formatting. :)"), 0); |
791 gtk_container_add(GTK_CONTAINER(sw), imhtml); | 820 gtk_container_add(GTK_CONTAINER(sw), imhtml); |
821 | |
822 button = gtk_button_new_with_mnemonic("_Clear Formatting"); | |
823 gtk_box_pack_start(GTK_BOX(fontvbox), button, FALSE, FALSE, 0); | |
824 | |
825 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/send_formatting")) | |
826 gtk_widget_set_sensitive(fontvbox, FALSE); | |
792 | 827 |
793 if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_bold")) | 828 if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_bold")) |
794 gtk_imhtml_toggle_bold(GTK_IMHTML(imhtml)); | 829 gtk_imhtml_toggle_bold(GTK_IMHTML(imhtml)); |
795 if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_italic")) | 830 if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_italic")) |
796 gtk_imhtml_toggle_italic(GTK_IMHTML(imhtml)); | 831 gtk_imhtml_toggle_italic(GTK_IMHTML(imhtml)); |
799 | 834 |
800 gtk_imhtml_font_set_size(GTK_IMHTML(imhtml), gaim_prefs_get_int("/gaim/gtk/conversations/font_size")); | 835 gtk_imhtml_font_set_size(GTK_IMHTML(imhtml), gaim_prefs_get_int("/gaim/gtk/conversations/font_size")); |
801 gtk_imhtml_toggle_forecolor(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor")); | 836 gtk_imhtml_toggle_forecolor(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor")); |
802 gtk_imhtml_toggle_backcolor(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor")); | 837 gtk_imhtml_toggle_backcolor(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor")); |
803 gtk_imhtml_toggle_fontface(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/font_face")); | 838 gtk_imhtml_toggle_fontface(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/font_face")); |
839 | |
840 g_signal_connect(G_OBJECT(button), "clicked", | |
841 G_CALLBACK(formatting_reset_cb), imhtml); | |
842 | |
843 g_signal_connect(G_OBJECT(option), "clicked", | |
844 G_CALLBACK(gaim_gtk_toggle_sensitive), fontvbox); | |
845 | |
846 g_signal_connect(G_OBJECT(imhtml), "format_function_toggle", | |
847 G_CALLBACK(formatting_toggle_cb), NULL); | |
804 | 848 |
805 gtk_widget_show_all(ret); | 849 gtk_widget_show_all(ret); |
806 return ret; | 850 return ret; |
807 } | 851 } |
808 | 852 |
2698 gtk_option_menu_remove_menu(GTK_OPTION_MENU(omenu)); | 2742 gtk_option_menu_remove_menu(GTK_OPTION_MENU(omenu)); |
2699 gtk_option_menu_set_menu(GTK_OPTION_MENU(omenu), menu); | 2743 gtk_option_menu_set_menu(GTK_OPTION_MENU(omenu), menu); |
2700 gtk_option_menu_set_history(GTK_OPTION_MENU(omenu), default_index); | 2744 gtk_option_menu_set_history(GTK_OPTION_MENU(omenu), default_index); |
2701 } | 2745 } |
2702 | 2746 |
2703 GtkWidget *pref_fg_picture = NULL; | |
2704 GtkWidget *pref_bg_picture = NULL; | |
2705 | |
2706 void destroy_colorsel(GtkWidget *w, gpointer d) | |
2707 { | |
2708 if (d) { | |
2709 gtk_widget_destroy(fgcseld); | |
2710 fgcseld = NULL; | |
2711 } else { | |
2712 gtk_widget_destroy(bgcseld); | |
2713 bgcseld = NULL; | |
2714 } | |
2715 } | |
2716 | |
2717 void apply_color_dlg(GtkWidget *w, gpointer d) | |
2718 { | |
2719 char buf[14]; | |
2720 | |
2721 if (GPOINTER_TO_INT(d) == 1) { | |
2722 GdkColor fgcolor; | |
2723 | |
2724 gtk_color_selection_get_current_color(GTK_COLOR_SELECTION | |
2725 (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), | |
2726 &fgcolor); | |
2727 | |
2728 g_snprintf(buf, sizeof(buf), "#%04x%04x%04x", | |
2729 fgcolor.red, fgcolor.green, fgcolor.blue); | |
2730 | |
2731 gaim_prefs_set_string("/gaim/gtk/conversations/fgcolor", buf); | |
2732 | |
2733 destroy_colorsel(NULL, (void *)1); | |
2734 update_color(NULL, pref_fg_picture); | |
2735 } else { | |
2736 GdkColor bgcolor; | |
2737 | |
2738 gtk_color_selection_get_current_color(GTK_COLOR_SELECTION | |
2739 (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), | |
2740 &bgcolor); | |
2741 | |
2742 g_snprintf(buf, sizeof(buf), "#%04x%04x%04x", | |
2743 bgcolor.red, bgcolor.green, bgcolor.blue); | |
2744 | |
2745 gaim_prefs_set_string("/gaim/gtk/conversations/bgcolor", buf); | |
2746 | |
2747 destroy_colorsel(NULL, (void *)0); | |
2748 update_color(NULL, pref_bg_picture); | |
2749 } | |
2750 gaim_conversation_foreach(gaim_gtkconv_update_font_colors); | |
2751 } | |
2752 | |
2753 void set_default_away(GtkWidget *w, gpointer data) | 2747 void set_default_away(GtkWidget *w, gpointer data) |
2754 { | 2748 { |
2755 struct away_message *default_away = NULL; | 2749 struct away_message *default_away = NULL; |
2756 int length = g_slist_length(away_messages); | 2750 int length = g_slist_length(away_messages); |
2757 int i = GPOINTER_TO_INT(data); | 2751 int i = GPOINTER_TO_INT(data); |
2765 | 2759 |
2766 if(default_away) | 2760 if(default_away) |
2767 gaim_prefs_set_string("/core/away/default_message", default_away->name); | 2761 gaim_prefs_set_string("/core/away/default_message", default_away->name); |
2768 else | 2762 else |
2769 gaim_prefs_set_string("/core/away/default_message", ""); | 2763 gaim_prefs_set_string("/core/away/default_message", ""); |
2770 } | |
2771 | |
2772 #if 0 /* PREFSLASH04 */ | |
2773 static GtkWidget *show_color_pref(GtkWidget *box, gboolean fgc) | |
2774 { | |
2775 /* more stuff stolen from X-Chat */ | |
2776 GtkWidget *swid; | |
2777 GdkColor c; | |
2778 GtkStyle *style; | |
2779 c.pixel = 0; | |
2780 | |
2781 if (fgc) { | |
2782 if (gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_fgcolor")) { | |
2783 GdkColor fgcolor; | |
2784 | |
2785 gdk_color_parse( | |
2786 gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"), | |
2787 &fgcolor); | |
2788 | |
2789 c.red = fgcolor.red; | |
2790 c.blue = fgcolor.blue; | |
2791 c.green = fgcolor.green; | |
2792 } else { | |
2793 c.red = 0; | |
2794 c.blue = 0; | |
2795 c.green = 0; | |
2796 } | |
2797 } else { | |
2798 if (gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_bgcolor")) { | |
2799 GdkColor bgcolor; | |
2800 | |
2801 gdk_color_parse( | |
2802 gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"), | |
2803 &bgcolor); | |
2804 | |
2805 c.red = bgcolor.red; | |
2806 c.blue = bgcolor.blue; | |
2807 c.green = bgcolor.green; | |
2808 } else { | |
2809 c.red = 0xffff; | |
2810 c.blue = 0xffff; | |
2811 c.green = 0xffff; | |
2812 } | |
2813 } | |
2814 | |
2815 style = gtk_style_new(); | |
2816 style->bg[0] = c; | |
2817 | |
2818 swid = gtk_event_box_new(); | |
2819 gtk_widget_set_style(GTK_WIDGET(swid), style); | |
2820 g_object_unref(style); | |
2821 gtk_widget_set_size_request(GTK_WIDGET(swid), 40, -1); | |
2822 gtk_box_pack_start(GTK_BOX(box), swid, FALSE, FALSE, 5); | |
2823 gtk_widget_show(swid); | |
2824 return swid; | |
2825 } | |
2826 #endif /* PREFSLASH04 */ | |
2827 | |
2828 void apply_font_dlg(GtkWidget *w, GtkWidget *f) | |
2829 { | |
2830 char *fontname, *space; | |
2831 | |
2832 fontname = | |
2833 gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(f)); | |
2834 | |
2835 destroy_fontsel(0, 0); | |
2836 | |
2837 space = strrchr(fontname, ' '); | |
2838 if(space && isdigit(*(space+1))) | |
2839 *space = '\0'; | |
2840 | |
2841 gaim_prefs_set_string("/gaim/gtk/conversations/font_face", fontname); | |
2842 | |
2843 g_free(fontname); | |
2844 | |
2845 gaim_conversation_foreach(gaim_gtkconv_update_font_face); | |
2846 } | 2764 } |
2847 | 2765 |
2848 static void | 2766 static void |
2849 smiley_theme_pref_cb(const char *name, GaimPrefType type, gpointer value, | 2767 smiley_theme_pref_cb(const char *name, GaimPrefType type, gpointer value, |
2850 gpointer data) | 2768 gpointer data) |
2903 /* Rename some old prefs */ | 2821 /* Rename some old prefs */ |
2904 gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log_ims"); | 2822 gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log_ims"); |
2905 gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats"); | 2823 gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats"); |
2906 gaim_prefs_rename("/core/conversations/placement", | 2824 gaim_prefs_rename("/core/conversations/placement", |
2907 "/gaim/gtk/conversations/placement"); | 2825 "/gaim/gtk/conversations/placement"); |
2826 | |
2827 gaim_prefs_rename("/gaim/gtk/conversations/use_custom_font", | |
2828 "/gaim/gtk/conversations/send_formatting"); | |
2908 | 2829 |
2909 /* Remove some no-longer-used prefs */ | 2830 /* Remove some no-longer-used prefs */ |
2910 gaim_prefs_remove("/gaim/gtk/blist/show_group_count"); | 2831 gaim_prefs_remove("/gaim/gtk/blist/show_group_count"); |
2911 gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs"); | 2832 gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs"); |
2912 gaim_prefs_remove("/gaim/gtk/conversations/ignore_colors"); | 2833 gaim_prefs_remove("/gaim/gtk/conversations/ignore_colors"); |
2917 gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion"); | 2838 gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion"); |
2918 gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete"); | 2839 gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete"); |
2919 gaim_prefs_remove("/gaim/gtk/sound/signon"); | 2840 gaim_prefs_remove("/gaim/gtk/sound/signon"); |
2920 gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); | 2841 gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); |
2921 gaim_prefs_remove("/gaim/gtk/logging/individual_logs"); | 2842 gaim_prefs_remove("/gaim/gtk/logging/individual_logs"); |
2922 } | 2843 gaim_prefs_remove("/gaim/gtk/conversations/use_custom_bgcolor"); |
2844 gaim_prefs_remove("/gaim/gtk/conversations/use_custom_fgcolor"); | |
2845 gaim_prefs_remove("/gaim/gtk/conversations/use_custom_size"); | |
2846 } |