git: Line endings of README.txt

[projects/chimara/chimara.git] / player / preferences.c

diff --git a/player/preferences.c b/player/preferences.c
index 1f39927082e077073dc8b0aa978a3434521e4595..b457c1ef5e37e0731f78fac8570f7d8033f75e20 100644 (file)
--- a/player/preferences.c
+++ b/player/preferences.c
@@ -104,11 +104,13 @@ parse_interpreter(const char *interp)
                return CHIMARA_IF_INTERPRETER_GLULXE;
        if(strcmp(interp, "git") == 0)
                return CHIMARA_IF_INTERPRETER_GIT;
+       if(strcmp(interp, "bocfel") == 0)
+               return CHIMARA_IF_INTERPRETER_BOCFEL;
        return CHIMARA_IF_INTERPRETER_NONE;
 }
 
 static const char *interpreter_strings[CHIMARA_IF_NUM_INTERPRETERS] = {
-       "frotz", "nitfol", "glulxe", "git"
+       "frotz", "nitfol", "glulxe", "git", "bocfel"
 };
 
 static const char *
@@ -123,7 +125,8 @@ static const char *interpreter_display_strings[CHIMARA_IF_NUM_INTERPRETERS] = {
        N_("Frotz"),
        N_("Nitfol"),
        N_("Glulxe"),
-       N_("Git")
+       N_("Git"),
+       N_("Bocfel")
 };
 
 static const char *
@@ -302,17 +305,23 @@ on_toggle_underline(GtkToggleButton *button, ChimaraGlk *glk) {
 void
 on_foreground_color_set(GtkColorButton *button, ChimaraGlk *glk)
 {
-       GdkColor color;
-    gtk_color_button_get_color(button, &color);
-       g_object_set(current_tag, "foreground-gdk", &color, "foreground-set", TRUE, NULL);
+       GdkRGBA color;
+       gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button), &color);
+       g_object_set(current_tag,
+               "foreground-rgba", &color,
+               "foreground-set", TRUE,
+               NULL);
 }
 
 void
 on_background_color_set(GtkColorButton *button, ChimaraGlk *glk)
 {
-       GdkColor color;
-    gtk_color_button_get_color(button, &color);
-       g_object_set(current_tag, "background-gdk", &color, "background-set", TRUE, NULL);
+       GdkRGBA color;
+       gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button), &color);
+       g_object_set(current_tag,
+               "background-rgba", &color,
+               "background-set", TRUE,
+               NULL);
 }
 
 void