GError var is now only used by the color parsing
This commit is contained in:
		
							parent
							
								
									5f42dec963
								
							
						
					
					
						commit
						f0f135c77d
					
				@ -264,7 +264,6 @@ static void load_config(GtkWindow *window, VteTerminal *vte,
 | 
				
			|||||||
    const gchar *dir = g_get_user_config_dir();
 | 
					    const gchar *dir = g_get_user_config_dir();
 | 
				
			||||||
    gchar *path = g_build_filename(dir, filename, NULL);
 | 
					    gchar *path = g_build_filename(dir, filename, NULL);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    GError *error = NULL;
 | 
					 | 
				
			||||||
    GKeyFile *config = g_key_file_new();
 | 
					    GKeyFile *config = g_key_file_new();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if ((g_key_file_load_from_file(config, path, G_KEY_FILE_NONE, NULL) ||
 | 
					    if ((g_key_file_load_from_file(config, path, G_KEY_FILE_NONE, NULL) ||
 | 
				
			||||||
@ -349,6 +348,7 @@ static void load_config(GtkWindow *window, VteTerminal *vte,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        bool success = true;
 | 
					        bool success = true;
 | 
				
			||||||
        for (unsigned i = 0; i < 8; i++) {
 | 
					        for (unsigned i = 0; i < 8; i++) {
 | 
				
			||||||
 | 
					            GError *error = NULL;
 | 
				
			||||||
            gsize length;
 | 
					            gsize length;
 | 
				
			||||||
            gchar **pair = g_key_file_get_string_list(config, "colors", color_names[i], &length, &error);
 | 
					            gchar **pair = g_key_file_get_string_list(config, "colors", color_names[i], &length, &error);
 | 
				
			||||||
            if (error) {
 | 
					            if (error) {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user