summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-icon-info.c
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-11-22 15:02:51 -0500
committerlukefromdc <[email protected]>2016-11-22 15:02:51 -0500
commit276eb145ce96d5f75f8d3901daf6310f60ddbb81 (patch)
tree544f41e76c9a91973867065696fc2e414ca60170 /libcaja-private/caja-icon-info.c
parent969e4d021fe49654fe6e5ee7e88c920fec126505 (diff)
downloadcaja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.bz2
caja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.xz
move to GTK+3 (>= 3.14), drop libunique, GTK+2 code, and --with-gtk build option
*Remove GTK_VERSION_CHECK (3, 0, 0) and libunique selectors *Remove GTK2 and libunique specific code. *Leaves selector for specific GTK3 versions. *Remove #DEFINES for vbox/hbox previously required for GTK2 compatability *Keep vbox in caja-spatial-window.c, it is necessary for the desktop to work *spatial-window vbox issue at https://github.com/mate-desktop/caja/issues/591
Diffstat (limited to 'libcaja-private/caja-icon-info.c')
-rw-r--r--libcaja-private/caja-icon-info.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c
index 38e49798..3cb90c54 100644
--- a/libcaja-private/caja-icon-info.c
+++ b/libcaja-private/caja-icon-info.c
@@ -426,11 +426,7 @@ caja_icon_info_lookup (GIcon *icon,
filename = gtk_icon_info_get_filename (gtkicon_info);
if (filename == NULL) {
-#if GTK_CHECK_VERSION (3, 0, 0)
g_object_unref (gtkicon_info);
-#else
- gtk_icon_info_free (gtkicon_info);
-#endif
return caja_icon_info_new_for_pixbuf (NULL);
}
@@ -440,11 +436,7 @@ caja_icon_info_lookup (GIcon *icon,
icon_info = g_hash_table_lookup (themed_icon_cache, &lookup_key);
if (icon_info)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
g_object_unref (gtkicon_info);
-#else
- gtk_icon_info_free (gtkicon_info);
-#endif
return g_object_ref (icon_info);
}
@@ -453,11 +445,7 @@ caja_icon_info_lookup (GIcon *icon,
key = themed_icon_key_new (filename, size);
g_hash_table_insert (themed_icon_cache, key, icon_info);
-#if GTK_CHECK_VERSION (3, 0, 0)
g_object_unref (gtkicon_info);
-#else
- gtk_icon_info_free (gtkicon_info);
-#endif
return g_object_ref (icon_info);
}
@@ -473,11 +461,7 @@ caja_icon_info_lookup (GIcon *icon,
if (gtk_icon_info != NULL)
{
pixbuf = gtk_icon_info_load_icon (gtk_icon_info, NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
g_object_unref (gtk_icon_info);
-#else
- gtk_icon_info_free (gtk_icon_info);
-#endif
}
else
{