Import newer upstream.
This commit is contained in:
@ -100,8 +100,8 @@ icon_themes_init (Pika *pika)
|
||||
while ((info = g_file_enumerator_next_file (enumerator,
|
||||
NULL, NULL)))
|
||||
{
|
||||
if (! g_file_info_get_is_hidden (info) &&
|
||||
g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
|
||||
if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) &&
|
||||
g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY)
|
||||
{
|
||||
GFile *file;
|
||||
GFile *index_theme;
|
||||
|
@ -599,7 +599,7 @@ splash_image_load_from_file (GFile *file,
|
||||
{
|
||||
const gchar *content_type;
|
||||
|
||||
content_type = g_file_info_get_content_type (info);
|
||||
content_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
|
||||
if (content_type)
|
||||
{
|
||||
gchar *mime_type;
|
||||
|
@ -104,6 +104,9 @@ themes_init (Pika *pika)
|
||||
g_signal_connect (config, "notify::custom-icon-size",
|
||||
G_CALLBACK (themes_theme_change_notify),
|
||||
pika);
|
||||
g_signal_connect (config, "notify::font-relative-size",
|
||||
G_CALLBACK (themes_theme_change_notify),
|
||||
pika);
|
||||
|
||||
themes_theme_change_notify (config, NULL, pika);
|
||||
}
|
||||
@ -377,6 +380,12 @@ themes_apply_theme (Pika *pika,
|
||||
button_icon_size);
|
||||
}
|
||||
|
||||
if (! error && config->font_relative_size != 1.0)
|
||||
g_output_stream_printf (output, NULL, NULL, &error,
|
||||
"\n"
|
||||
"* { font-size: %frem; }",
|
||||
config->font_relative_size);
|
||||
|
||||
if (! error)
|
||||
{
|
||||
g_output_stream_printf (
|
||||
@ -515,8 +524,8 @@ themes_theme_paths_notify (PikaExtensionManager *manager,
|
||||
while ((info = g_file_enumerator_next_file (enumerator,
|
||||
NULL, NULL)))
|
||||
{
|
||||
if (! g_file_info_get_is_hidden (info) &&
|
||||
g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
|
||||
if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) &&
|
||||
g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY)
|
||||
{
|
||||
GFile *file;
|
||||
const gchar *name;
|
||||
|
Reference in New Issue
Block a user