PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

Remove parsing of xresource config settings via Xserver. 

This option is deprecated.
This commit is contained in:
Dave Davenport 2021-05-04 19:50:23 +02:00
parent 373e09e7d3
commit 2516173a3d
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/xrmoptions.h
View File

@ -80,16 +80,6 @@ typedef enum
xrm_Char = 4
} XrmOptionType;
/**
* @param xcb Handler object holding connection used to fetch the settings from.
*
* Parse the rofi related X resource options of the
* connected X server.
*
* @ingroup CONFXServer
*/
void config_parse_xresource_options ( xcb_stuff *xcb );
/**
* @param filename The xresources file to parse
*

2
source/rofi.c
View File

@ -947,8 +947,6 @@ int main ( int argc, char *argv[] )
}
g_free ( etc );
}
// Load in config from X resources.
config_parse_xresource_options ( xcb );
if ( config_path_new && g_file_test ( config_path_new, G_FILE_TEST_IS_REGULAR ) ) {
if ( rofi_theme_parse_file ( config_path_new ) ) {

18
source/xrmoptions.c
View File

@ -45,7 +45,6 @@
/** Different sources of configuration. */
const char * const ConfigSourceStr[] = {
"Default",
"XResources",
"File",
"Rasi File",
"Commandline",
@ -54,10 +53,9 @@ const char * const ConfigSourceStr[] = {
enum ConfigSource
{
CONFIG_DEFAULT = 0,
CONFIG_XRESOURCES = 1,
CONFIG_FILE = 2,
CONFIG_FILE_THEME = 3,
CONFIG_CMDLINE = 4
CONFIG_FILE = 1,
CONFIG_FILE_THEME = 2,
CONFIG_CMDLINE = 3
};
typedef struct
@ -335,15 +333,7 @@ static void __config_parse_xresource_options_dynamic ( xcb_xrm_database_t *xDB,
g_free ( name );
}
}
void config_parse_xresource_options ( xcb_stuff *xcb )
{
xcb_xrm_database_t *xDB = xcb_xrm_database_from_default ( xcb->connection );
if ( xDB ) {
__config_parse_xresource_options ( xDB, CONFIG_XRESOURCES );
__config_parse_xresource_options_dynamic ( xDB, CONFIG_XRESOURCES );
xcb_xrm_database_free ( xDB );
}
}
void config_parse_xresource_options_file ( const char *filename )
{
if ( !filename ) {