diff -urN gnome-utils-1.2.1.orig/logview/config.c gnome-utils-1.2.1/logview/config.c --- gnome-utils-1.2.1.orig/logview/config.c Thu Apr 27 12:32:02 2000 +++ gnome-utils-1.2.1/logview/config.c Sun Sep 3 21:35:02 2000 @@ -29,10 +29,10 @@ * ------------------- */ -#define FIXED_12_FONT "-b&h-lucidatypewriter-medium-r-normal-*-12-*-*-*-*-*-*-*" -#define FIXED_12_BFONT "-b&h-lucidatypewriter-bold-r-normal-*-12-*-*-*-*-*-*-*" -#define FIXED_10_FONT "-b&h-lucidatypewriter-medium-r-normal-sans-10-*-*-*-*-*-*-*" -#define FIXED_10_BFONT "-b&h-lucidatypewriter-bold-r-normal-sans-10-*-*-*-*-*-*-*" +#define FIXED_12_FONT "-*-*-medium-r-normal-*-12-*-*-*-c-*-*-*" +#define FIXED_12_BFONT "-*-*-bold-r-normal-*-12-*-*-*-c-*-*-*" +#define FIXED_10_FONT "-*-*-medium-r-normal-*-10-*-*-*-c-*-*-*" +#define FIXED_10_BFONT "-*-*-bold-r-normal-*-10-*-*-*-c-*-*-*" #define HELVETICA_14_FONT "-adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-*-*" #define HELVETICA_14_BFONT "-adobe-helvetica-bold-r-normal-*-14-*-*-*-*-*-*-*" @@ -92,11 +92,11 @@ newcfg->white = white; /* Set up fonts used */ - newcfg->headingb = gdk_font_load (HELVETICA_12_BFONT); - newcfg->heading = gdk_font_load (HELVETICA_12_FONT); - newcfg->fixed = gdk_font_load (FIXED_10_FONT); - newcfg->fixedb = gdk_font_load (FIXED_10_BFONT); - newcfg->small = gdk_font_load (HELVETICA_10_FONT); + newcfg->headingb = gdk_fontset_load (FIXED_12_BFONT); + newcfg->heading = gdk_fontset_load (FIXED_12_FONT); + newcfg->fixed = gdk_fontset_load (FIXED_10_FONT); + newcfg->fixedb = gdk_fontset_load (FIXED_10_BFONT); + newcfg->small = gdk_fontset_load (FIXED_10_FONT); /* Create styles */ cs = newcfg->main_style = gtk_style_new (); @@ -130,7 +130,7 @@ /* } */ gdk_font_unref (cs->font); - newcfg->main_style->font = gdk_font_load (HELVETICA_10_FONT); + newcfg->main_style->font = gdk_fontset_load (FIXED_10_FONT); /* Set default style */ #if 0 @@ -143,7 +143,7 @@ cs->bg[GTK_STATE_NORMAL].green = (gushort) 65535; cs->bg[GTK_STATE_NORMAL].blue = (gushort) 65535; gdk_font_unref (cs->font); - cs->font = gdk_font_load (HELVETICA_10_FONT); + cs->font = gdk_fontset_load (FIXED_10_FONT); cs = newcfg->black_bg_style = gtk_style_new (); cs->bg[GTK_STATE_NORMAL].red = (gushort) 0; @@ -151,7 +151,7 @@ cs->bg[GTK_STATE_NORMAL].blue = (gushort) 0; cs->bg[GTK_STATE_NORMAL].pixel = black.pixel; gdk_font_unref (cs->font); - cs->font = gdk_font_load (HELVETICA_10_FONT); + cs->font = gdk_fontset_load (FIXED_10_FONT); /* Set paths */ newcfg->regexp_db_path = NULL; diff -urN gnome-utils-1.2.1.orig/mini-utils/gshutdown/gshutdown.c gnome-utils-1.2.1/mini-utils/gshutdown/gshutdown.c --- gnome-utils-1.2.1.orig/mini-utils/gshutdown/gshutdown.c Fri May 5 14:36:35 2000 +++ gnome-utils-1.2.1/mini-utils/gshutdown/gshutdown.c Sun Sep 3 21:38:29 2000 @@ -244,7 +244,7 @@ gtk_box_pack_end (GTK_BOX (warning_hbox), label, TRUE, TRUE, 0); - button = gtk_radio_button_new_with_label(NULL, human_readable[Reboot]); + button = gtk_radio_button_new_with_label(NULL, gettext(human_readable[Reboot])); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); requested_runlevel = Reboot; @@ -260,7 +260,7 @@ runlevel_radio_group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); button = gtk_radio_button_new_with_label (runlevel_radio_group, - human_readable[Halt]); + gettext(human_readable[Halt])); runlevel_radio_group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (vbox), @@ -295,7 +295,7 @@ i = SingleUser; while ( i < Reboot ) { button = gtk_radio_button_new_with_label (runlevel_radio_group, - human_readable[i]); + gettext(human_readable[i])); runlevel_radio_group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); gtk_signal_connect ( GTK_OBJECT(button), "clicked", @@ -345,7 +345,7 @@ row = 0; } - label = gtk_label_new(human_readable[i]); + label = gtk_label_new(gettext(human_readable[i])); gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, 0, 0, GNOME_PAD_SMALL, GNOME_PAD_SMALL); ++row; @@ -448,7 +448,7 @@ message = g_strdup_printf(_("%s" "\nYou will lose any unsaved work."), - confirm_questions[requested_runlevel]); + gettext(confirm_questions[requested_runlevel])); d = gnome_message_box_new(message, GNOME_MESSAGE_BOX_QUESTION, GNOME_STOCK_BUTTON_YES, GNOME_STOCK_BUTTON_NO,