casa-mp-base

--- gamt.c.old  2015-07-27 14:08:57.000000000 +0200

+++ gamt.c  2016-02-25 02:08:15.000000000 +0100

@@ -259,10 +259,9 @@ static void menu_cb_config_font(GtkActio

     char *fontname;

     int done = 0;

-    dialog = gtk_font_selection_dialog_new("Terminal font");

+    dialog = gtk_font_chooser_dialog_new("Terminal font", NULL);

     fontname = cfg_get_str(CFG_FONT);

-    gtk_font_selection_dialog_set_font_name

-   (GTK_FONT_SELECTION_DIALOG(dialog), fontname);

+    gtk_font_chooser_set_font(GTK_FONT_CHOOSER(dialog), fontname);

     gtk_widget_show_all(dialog);

     while (!done) {

@@ -271,8 +270,7 @@ static void menu_cb_config_font(GtkActio

             done=1;

             /* fall through */

         case GTK_RESPONSE_APPLY:

-            fontname = gtk_font_selection_dialog_get_font_name

-                (GTK_FONT_SELECTION_DIALOG(dialog));

+            fontname = gtk_font_chooser_get_font(GTK_FONT_CHOOSER(dialog));

             vte_terminal_set_font_from_string(VTE_TERMINAL(gamt->vte), fontname);

             cfg_set_str(CFG_FONT, fontname);

             break;

@@ -284,22 +282,19 @@ static void menu_cb_config_font(GtkActio

     gtk_widget_destroy(dialog);

 }

-static int pickcolor(char *title, GdkColor *color)

+static int pickcolor(char *title, GdkRGBA *color)

 {

     GtkWidget *dialog;

-    GtkColorSelection *csel;

     int rc = -1;

-    dialog = gtk_color_selection_dialog_new(title);

-    csel = GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel);

-    gtk_color_selection_set_has_opacity_control(csel, FALSE);

-    gtk_color_selection_set_current_color(csel, color);

+    dialog = gtk_color_chooser_dialog_new(title, NULL);

+    gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(dialog), color);

     gtk_widget_show_all(dialog);

     switch (gtk_dialog_run(GTK_DIALOG(dialog))) {

     case GTK_RESPONSE_OK:

-   gtk_color_selection_get_current_color(csel, color);

-   rc = 0;

+       gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(dialog), color);

+       rc = 0;

     }

     gtk_widget_destroy(dialog);

     return rc;

@@ -308,30 +303,34 @@ static int pickcolor(char *title, GdkCol

 static void menu_cb_config_fg(GtkAction *action, void *data)

 {

     struct gamt_window *gamt = data;

-    GdkColor color = {0,0,0,0};

+    GdkRGBA color = {};

     char name[16];

-    gdk_color_parse(cfg_get_str(CFG_FOREGROUND), &color);

+    gdk_rgba_parse(&color, cfg_get_str(CFG_FOREGROUND));

     if (0 != pickcolor("Text color", &color))

-   return;

-    vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color);

+       return;

+    vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color);

     snprintf(name, sizeof(name), "#%04x%04x%04x",

-        color.red, color.green, color.blue);

+        (int)(color.red * 65535),

+             (int)(color.green * 65535),

+             (int)(color.blue * 65535));

     cfg_set_str(CFG_FOREGROUND, name);

 }

 static void menu_cb_config_bg(GtkAction *action, void *data)

 {

     struct gamt_window *gamt = data;

-    GdkColor color = {0,0,0,0};

+    GdkRGBA color = {};

     char name[16];

-    gdk_color_parse(cfg_get_str(CFG_BACKGROUND), &color);

+    gdk_rgba_parse(&color, cfg_get_str(CFG_BACKGROUND));

     if (0 != pickcolor("Background color", &color))

    return;

-    vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color);

+    vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color);

     snprintf(name, sizeof(name), "#%04x%04x%04x",

-        color.red, color.green, color.blue);