wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Don't present users with the hidden highlight languages (#167) 

Fixes a crash when choosing 'Defaults' as the the highlight language.

Adapted from 0434e2f918

Closes https://github.com/linuxmint/xed/issues/160
This commit is contained in:
JosephMcc 2017-09-05 00:21:09 -07:00 committed by Clement Lefebvre
parent 1f85332906
commit 54a8c6c616
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xed/xed-window.c
View File

@ -837,7 +837,11 @@ get_languages_sorted_by_section (XedWindow *window)
GtkSourceLanguage *lang; GtkSourceLanguage *lang;
lang = gtk_source_language_manager_get_language (lm, ids[i]); lang = gtk_source_language_manager_get_language (lm, ids[i]);
languages = g_slist_prepend (languages, lang);
if (!gtk_source_language_get_hidden (lang))
{
languages = g_slist_prepend (languages, lang);
}
} }
return g_slist_sort (languages, (GCompareFunc)language_compare); return g_slist_sort (languages, (GCompareFunc)language_compare);
@ -1691,14 +1695,18 @@ fill_language_combo (XedWindow *window)
GtkSourceLanguage *lang; GtkSourceLanguage *lang;
lang = gtk_source_language_manager_get_language (lm, ids[i]); lang = gtk_source_language_manager_get_language (lm, ids[i]);
name = gtk_source_language_get_name (lang);
menu_item = gtk_menu_item_new_with_label (name);
gtk_widget_show (menu_item);
g_object_set_data_full (G_OBJECT (menu_item), LANGUAGE_DATA, g_object_ref (lang), if (!gtk_source_language_get_hidden (lang))
(GDestroyNotify) g_object_unref); {
xed_status_combo_box_add_item (XED_STATUS_COMBO_BOX (window->priv->language_combo), name = gtk_source_language_get_name (lang);
GTK_MENU_ITEM (menu_item), name); menu_item = gtk_menu_item_new_with_label (name);
gtk_widget_show (menu_item);
g_object_set_data_full (G_OBJECT (menu_item), LANGUAGE_DATA, g_object_ref (lang),
(GDestroyNotify) g_object_unref);
xed_status_combo_box_add_item (XED_STATUS_COMBO_BOX (window->priv->language_combo),
GTK_MENU_ITEM (menu_item), name);
}
} }
} }