--- /usr/src/spacefm_DEV/absoluteFM-20210904.0NoHal/src/pref-dialog.c	2018-03-04 11:04:33.000000000 -0500
+++ /usr/src/spacefm_DEV/absoluteFM.80/src/pref-dialog.c	2021-09-10 00:08:30.217773000 -0400
@@ -22,8 +22,7 @@
 #include <string.h>
 #include <malloc.h>
 
-#include "glib-utils.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "pref-dialog.h"
 #include "settings.h"
@@ -33,7 +32,7 @@
 #include "desktop.h"
 #include "ptk-location-view.h"
 
-#include "gtk2-compat.h"
+
 
 
 typedef struct _FMPrefDlg FMPrefDlg;
@@ -79,10 +78,6 @@
     GtkWidget* margin_bottom;
     GtkWidget* margin_pad;
 
-    GtkWidget* bg_color1;
-    GtkWidget* text_color;
-    GtkWidget* shadow_color;
-    
     //MOD
     GtkWidget* confirm_delete;
     GtkWidget* click_exec;
@@ -118,16 +113,7 @@
     "%Y-%m-%d %H:%M:%S"
 };
 static const int drag_actions[] = { 0, 1, 2, 3 };
-/*
-static void
-on_show_desktop_toggled( GtkToggleButton* show_desktop, GtkWidget* desktop_page )
-{
-    gtk_container_foreach( GTK_CONTAINER(desktop_page),
-                           (GtkCallback) gtk_widget_set_sensitive,
-                           (gpointer) gtk_toggle_button_get_active( show_desktop ) );
-    gtk_widget_set_sensitive( GTK_WIDGET(show_desktop), TRUE );
-}
-*/
+
 static void set_preview_image( GtkImage* img, const char* file )
 {
     GdkPixbuf* pix = NULL;
@@ -175,7 +161,7 @@
     if ( !font_desc && !font_name )
     {
         gtk_button_set_label( GTK_BUTTON( button ), _("Default") );
-        gtk_widget_modify_font( GTK_WIDGET( button ), NULL );
+        gtk_widget_override_font( GTK_WIDGET( button ), NULL );
     }
     else
     {
@@ -250,22 +236,6 @@
 
     if ( response == GTK_RESPONSE_OK )
     {
-        /* file name encoding */
-        //filename_encoding = gtk_entry_get_text( GTK_ENTRY( data->encoding ) );
-        //if ( filename_encoding
-        //    && g_ascii_strcasecmp ( filename_encoding, "UTF-8" ) )
-        //{
-        //    strcpy( app_settings.encoding, filename_encoding );
-        //    setenv( "G_FILENAME_ENCODING", app_settings.encoding, 1 );
-        //}
-        //else
-        //{
-        //    app_settings.encoding[ 0 ] = '\0';
-        //    unsetenv( "G_FILENAME_ENCODING" );
-        //}
-
-        //app_settings.open_bookmark_method = gtk_combo_box_get_active( GTK_COMBO_BOX( data->bm_open_method ) ) + 1;
-
         show_thumbnail = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( data->show_thumbnail ) );
         max_thumb = ( ( int ) gtk_spin_button_get_value( GTK_SPIN_BUTTON( data->max_thumb_size ) ) ) << 10;
 
@@ -316,59 +286,6 @@
                 }
             }
         }
-/*
-        hide_folder_content_border = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( data->hide_folder_content_border ) );
-        if ( hide_folder_content_border != app_settings.hide_folder_content_border )
-        {
-            app_settings.hide_folder_content_border = hide_folder_content_border;
-            // update all windows/all panels/all browsers
-            for ( l = fm_main_window_get_all(); l; l = l->next )
-            {
-                a_window = FM_MAIN_WINDOW( l->data );
-                for ( p = 1; p < 5; p++ )
-                {
-                    notebook = a_window->panel[p-1];
-                    n = gtk_notebook_get_n_pages( notebook );
-                    for ( i = 0; i < n; ++i )
-                    {
-                        file_browser = PTK_FILE_BROWSER( gtk_notebook_get_nth_page(
-                                                         notebook, i ) );
-                        if ( hide_folder_content_border )
-                            ptk_file_browser_hide_shadow( file_browser );
-                        else
-                            ptk_file_browser_show_shadow( file_browser );
-                    }
-                }
-            }
-        }
-*/
-/*        hide_side_pane_buttons = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( data->hide_side_pane_buttons ) );
-        if ( hide_side_pane_buttons != app_settings.hide_side_pane_buttons )
-        {
-            app_settings.hide_side_pane_buttons = hide_side_pane_buttons;
-            for ( l = fm_main_window_get_all(); l; l = l->next )
-            {
-                FMMainWindow* main_window = FM_MAIN_WINDOW( l->data );
-                GtkNotebook* notebook = main_window->notebook;
-                n = gtk_notebook_get_n_pages( notebook );
-
-                for ( i = 0; i < n; ++i )
-                {
-                  file_browser = PTK_FILE_BROWSER( gtk_notebook_get_nth_page( notebook, i ) );
-
-                  if ( hide_side_pane_buttons)
-                  {
-                    ptk_file_browser_hide_side_pane_buttons( file_browser );
-                  }
-                  else
-                  {
-                    ptk_file_browser_show_side_pane_buttons( file_browser );
-                  }
-
-                }
-            }
-        }
-*/
 
         // Desktop settings =================================================
 
@@ -397,11 +314,6 @@
         wallpaper_mode = gtk_combo_box_get_active(
                                         (GtkComboBox*)data->wallpaper_mode );
 
-        // colors
-        gtk_color_button_get_color(GTK_COLOR_BUTTON(data->bg_color1), &bg1);
-        gtk_color_button_get_color(GTK_COLOR_BUTTON(data->text_color), &text);
-        gtk_color_button_get_color(GTK_COLOR_BUTTON(data->shadow_color), &shadow);
-
         // need update ?
         gboolean need_update_bg = FALSE;
         // are desktop colors are changed ?
@@ -664,24 +576,9 @@
         app_settings.no_confirm = !gtk_toggle_button_get_active(
                                             (GtkToggleButton*)data->confirm_delete );
 
-        /*
-        rubberband = gtk_toggle_button_get_active(
-                                            (GtkToggleButton*)data->rubberband );
-        if ( !!rubberband != !!xset_get_b( "rubberband" ) )
-        {
-            xset_set_b( "rubberband", rubberband );
-            main_window_rubberband_all();
-        }
-        */
-        
         root_bar = gtk_toggle_button_get_active(
                                             (GtkToggleButton*)data->root_bar );
-        if ( !!root_bar != !!xset_get_b( "root_bar" ) )
-        {
-            xset_set_b( "root_bar", root_bar );
-            main_window_root_bar_all();
-        }
-        
+
         char* s = g_strdup_printf( "%d",
                     gtk_combo_box_get_active( GTK_COMBO_BOX( data->drag_action ) ) );
         xset_set( "drag_action", "x", s );
@@ -787,7 +684,7 @@
             }
         }
         // report missing terminal
-        if ( str = strchr( terminal, ' ' ) )
+        if ((str = strchr(terminal, ' ')))
             str[0] = '\0';
         str = g_find_program_in_path( terminal );
         if ( !str )
@@ -819,18 +716,6 @@
         // root settings saved?
         if ( geteuid() != 0 )
         {
-            /*
-            char* root_set_path= g_strdup_printf(
-                                    "/etc/spacefm/%s-as-root", g_get_user_name() );
-            if ( !g_file_test( root_set_path, G_FILE_TEST_EXISTS ) )
-            {
-                g_free( root_set_path );
-                root_set_path= g_strdup_printf(
-                                            "/etc/spacefm/%d-as-root", geteuid() );
-                if ( !g_file_test( root_set_path, G_FILE_TEST_EXISTS ) )
-                    root_set_change = TRUE;
-            }
-            */
             if ( root_set_change )
             {
                 // task
@@ -922,11 +807,7 @@
     {
         GtkTreeModel* model;
         // this invokes GVFS-RemoteVolumeMonitor via IsSupported
-#if GTK_CHECK_VERSION(2, 24, 0)
-        GtkBuilder* builder = _gtk_builder_new_from_file( PACKAGE_UI_DIR "/prefdlg2.ui", NULL );
-#else
-        GtkBuilder* builder = _gtk_builder_new_from_file( PACKAGE_UI_DIR "/prefdlg.ui", NULL );
-#endif
+        GtkBuilder* builder = _gtk_builder_new_from_file( PACKAGE_UI_DIR, "/prefdlg2.ui", NULL );
         if ( !builder )
             return FALSE;
         pcmanfm_ref();
@@ -966,24 +847,6 @@
         gtk_combo_box_set_entry_text_column( GTK_COMBO_BOX( data->terminal ), 0 );
         g_object_unref( model );
 
-        //if ( '\0' == ( char ) app_settings.encoding[ 0 ] )
-        //    gtk_entry_set_text( GTK_ENTRY( data->encoding ), "UTF-8" );
-        //else
-        //    gtk_entry_set_text( GTK_ENTRY( data->encoding ), app_settings.encoding );
-        
-        /*
-        if ( app_settings.open_bookmark_method >= 1 &&
-                app_settings.open_bookmark_method <= 2 )
-        {
-            gtk_combo_box_set_active( GTK_COMBO_BOX( data->bm_open_method ),
-                                      app_settings.open_bookmark_method - 1 );
-        }
-        else
-        {
-            gtk_combo_box_set_active( GTK_COMBO_BOX( data->bm_open_method ), 0 );
-        }
-        */
-        
         gtk_spin_button_set_value ( GTK_SPIN_BUTTON( data->max_thumb_size ),
                                     app_settings.max_thumb_size >> 10 );
 
@@ -1130,12 +993,6 @@
                                                         "desk_single_hover" );
         data->desk_open_mime = (GtkWidget*)gtk_builder_get_object( builder,
                                                         "desk_open_mime" );
-        data->bg_color1 = (GtkWidget*)gtk_builder_get_object( builder,
-                                                        "bg_color1" );
-        data->text_color = (GtkWidget*)gtk_builder_get_object( builder,
-                                                        "text_color" );
-        data->shadow_color = (GtkWidget*)gtk_builder_get_object( builder,
-                                                        "shadow_color" );
         data->desk_font = (GtkWidget*)gtk_builder_get_object( builder,
                                                         "desk_font" );
         data->margin_top = (GtkWidget*)gtk_builder_get_object( builder,
@@ -1184,17 +1041,6 @@
         g_signal_connect( data->desk_font, "clicked",
                                 G_CALLBACK(on_font_button_clicked), data );
         
-        // colors
-        data->bg_color1 = (GtkWidget*)gtk_builder_get_object( builder, "bg_color1" );
-        data->text_color = (GtkWidget*)gtk_builder_get_object( builder, "text_color" );
-        data->shadow_color = (GtkWidget*)gtk_builder_get_object( builder, "shadow_color" );
-        gtk_color_button_set_color(GTK_COLOR_BUTTON(data->bg_color1),
-                                   &app_settings.desktop_bg1);
-        gtk_color_button_set_color(GTK_COLOR_BUTTON(data->text_color),
-                                   &app_settings.desktop_text);
-        gtk_color_button_set_color(GTK_COLOR_BUTTON(data->shadow_color),
-                                   &app_settings.desktop_shadow);
-
         // wallpaper signals
         on_wallpaper_toggled( GTK_TOGGLE_BUTTON( data->show_wallpaper ), data );
         g_signal_connect( data->show_wallpaper, "toggled",
