drun: Early return if already initialized

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2017-11-25 11:51:19 +01:00
parent 58ed481198
commit 53e0f957d0
No known key found for this signature in database
GPG Key ID: AC203F96E2C34BB7
1 changed files with 23 additions and 22 deletions

View File

@ -655,29 +655,30 @@ static void drun_mode_parse_entry_fields ()
static int drun_mode_init ( Mode *sw )
{
if ( mode_get_private_data ( sw ) == NULL ) {
static const gchar * const drun_icon_fallback_themes[] = {
"Adwaita",
"gnome",
NULL
};
const gchar *themes[2] = {
config.drun_icon_theme,
NULL
};
DRunModePrivateData *pd = g_malloc0 ( sizeof ( *pd ) );
pd->disabled_entries = g_hash_table_new_full ( g_str_hash, g_str_equal, g_free, NULL );
mode_set_private_data ( sw, (void *) pd );
// current destkop
const char *current_desktop = g_getenv ( "XDG_CURRENT_DESKTOP" );
pd->current_desktop_list = current_desktop ? g_strsplit ( current_desktop, ":", 0 ) : NULL;
if ( mode_get_private_data ( sw ) != NULL )
return TRUE;
// Theme
pd->xdg_context = nk_xdg_theme_context_new ( drun_icon_fallback_themes, NULL );
nk_xdg_theme_preload_themes_icon ( pd->xdg_context, themes );
get_apps ( pd );
drun_mode_parse_entry_fields ();
}
static const gchar * const drun_icon_fallback_themes[] = {
"Adwaita",
"gnome",
NULL
};
const gchar *themes[2] = {
config.drun_icon_theme,
NULL
};
DRunModePrivateData *pd = g_malloc0 ( sizeof ( *pd ) );
pd->disabled_entries = g_hash_table_new_full ( g_str_hash, g_str_equal, g_free, NULL );
mode_set_private_data ( sw, (void *) pd );
// current destkop
const char *current_desktop = g_getenv ( "XDG_CURRENT_DESKTOP" );
pd->current_desktop_list = current_desktop ? g_strsplit ( current_desktop, ":", 0 ) : NULL;
// Theme
pd->xdg_context = nk_xdg_theme_context_new ( drun_icon_fallback_themes, NULL );
nk_xdg_theme_preload_themes_icon ( pd->xdg_context, themes );
get_apps ( pd );
drun_mode_parse_entry_fields ();
return TRUE;
}
static void drun_entry_clear ( DRunModeEntry *e )