projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Update kdbus interface header (commit: b620b72c9127) 14/10/16
[platform/upstream/glib.git]
/
gio
/
gcontenttype.c
diff --git
a/gio/gcontenttype.c
b/gio/gcontenttype.c
index
0ac90cb
..
9586c31
100644
(file)
--- a/
gio/gcontenttype.c
+++ b/
gio/gcontenttype.c
@@
-382,7
+382,7
@@
g_content_type_get_description (const gchar *type)
*
* Gets the mime type for the content type, if one is registered.
*
*
* Gets the mime type for the content type, if one is registered.
*
- * Returns: (
allow-non
e): the registered mime type for the given @type,
+ * Returns: (
nullabl
e): the registered mime type for the given @type,
* or %NULL if unknown.
*/
char *
* or %NULL if unknown.
*/
char *
@@
-393,9
+393,6
@@
g_content_type_get_mime_type (const char *type)
return g_strdup (type);
}
return g_strdup (type);
}
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-
static GIcon *
g_content_type_get_icon_internal (const gchar *type,
gboolean symbolic)
static GIcon *
g_content_type_get_icon_internal (const gchar *type,
gboolean symbolic)
@@
-403,52
+400,49
@@
g_content_type_get_icon_internal (const gchar *type,
char *mimetype_icon;
char *generic_mimetype_icon = NULL;
char *q;
char *mimetype_icon;
char *generic_mimetype_icon = NULL;
char *q;
- char *xdg_mimetype_icon = NULL;
- char *xdg_mimetype_generic_icon;
- char *icon_names[3];
+ char *icon_names[6];
int n = 0;
GIcon *themed_icon;
const char *xdg_icon;
int n = 0;
GIcon *themed_icon;
const char *xdg_icon;
-
const char *suffix
;
+
int i
;
g_return_val_if_fail (type != NULL, NULL);
g_return_val_if_fail (type != NULL, NULL);
- if (symbolic)
- suffix = "-symbolic";
- else
- suffix = "";
-
G_LOCK (gio_xdgmime);
xdg_icon = xdg_mime_get_icon (type);
G_UNLOCK (gio_xdgmime);
G_LOCK (gio_xdgmime);
xdg_icon = xdg_mime_get_icon (type);
G_UNLOCK (gio_xdgmime);
- if (xdg_icon != NULL)
- xdg_mimetype_icon = g_strconcat (xdg_icon, suffix, NULL);
- if (xdg_
mimetype_
icon)
- icon_names[n++] =
xdg_mimetype_icon
;
+ if (xdg_icon)
+ icon_names[n++] =
g_strdup (xdg_icon)
;
- mimetype_icon = g_str
concat (type, suffix, NULL
);
+ mimetype_icon = g_str
dup (type
);
while ((q = strchr (mimetype_icon, '/')) != NULL)
*q = '-';
icon_names[n++] = mimetype_icon;
while ((q = strchr (mimetype_icon, '/')) != NULL)
*q = '-';
icon_names[n++] = mimetype_icon;
- xdg_mimetype_generic_icon = g_content_type_get_generic_icon_name (type);
- if (xdg_mimetype_generic_icon)
- generic_mimetype_icon = g_strconcat (xdg_mimetype_generic_icon, suffix, NULL);
+ generic_mimetype_icon = g_content_type_get_generic_icon_name (type);
if (generic_mimetype_icon)
icon_names[n++] = generic_mimetype_icon;
if (generic_mimetype_icon)
icon_names[n++] = generic_mimetype_icon;
+ if (symbolic)
+ {
+ for (i = 0; i < n; i++)
+ {
+ icon_names[n + i] = icon_names[i];
+ icon_names[i] = g_strconcat (icon_names[i], "-symbolic", NULL);
+ }
+
+ n += n;
+ }
+
themed_icon = g_themed_icon_new_from_names (icon_names, n);
themed_icon = g_themed_icon_new_from_names (icon_names, n);
- g_free (xdg_mimetype_icon);
- g_free (xdg_mimetype_generic_icon);
- g_free (mimetype_icon);
- g_free (generic_mimetype_icon);
+ for (i = 0; i < n; i++)
+ g_free (icon_names[i]);
return themed_icon;
}
return themed_icon;
}
-#pragma GCC diagnostic pop
/**
* g_content_type_get_icon:
/**
* g_content_type_get_icon:
@@
-575,8
+569,8
@@
looks_like_text (const guchar *data, gsize data_size)
*
* Tries to find a content type based on the mime type name.
*
*
* Tries to find a content type based on the mime type name.
*
- * Returns: (
allow-none): Newly allocated string with content type
- *
or
%NULL. Free with g_free()
+ * Returns: (
nullable): Newly allocated string with content type or
+ * %NULL. Free with g_free()
*
* Since: 2.18
**/
*
* Since: 2.18
**/