Commit 4491bdbb authored by Tor Lillqvist's avatar Tor Lillqvist

Drop Win32 DLL ABI compatibility cruft

No need for that any longer as we are changing DLL name.
parent 972f617b
......@@ -111,22 +111,12 @@ gtk_accel_map_foreach
gtk_accel_map_foreach_unfiltered
gtk_accel_map_get
gtk_accel_map_get_type G_GNUC_CONST
#ifndef _WIN64
gtk_accel_map_load PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_accel_map_load_utf8
#endif
gtk_accel_map_load
gtk_accel_map_load_fd
gtk_accel_map_load_scanner
gtk_accel_map_lock_path
gtk_accel_map_lookup_entry
#ifndef _WIN64
gtk_accel_map_save PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_accel_map_save_utf8
#endif
gtk_accel_map_save
gtk_accel_map_save_fd
gtk_accel_map_unlock_path
#endif
......@@ -1242,47 +1232,22 @@ gtk_expander_set_use_underline
#if IN_HEADER(__GTK_FILE_CHOOSER_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_C__)
gtk_file_chooser_add_filter
#ifndef _WIN64
gtk_file_chooser_add_shortcut_folder PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_file_chooser_add_shortcut_folder_utf8
#endif
gtk_file_chooser_add_shortcut_folder
gtk_file_chooser_add_shortcut_folder_uri
gtk_file_chooser_error_quark
gtk_file_chooser_get_action
#ifndef _WIN64
gtk_file_chooser_get_current_folder PRIVATE
#endif
gtk_file_chooser_get_current_folder
gtk_file_chooser_get_current_folder_file
#ifdef G_OS_WIN32
gtk_file_chooser_get_current_folder_utf8
#endif
gtk_file_chooser_get_current_folder_uri
gtk_file_chooser_get_extra_widget
gtk_file_chooser_get_file
#ifndef _WIN64
gtk_file_chooser_get_filename PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_file_chooser_get_filename_utf8
#endif
#ifndef _WIN64
gtk_file_chooser_get_filenames PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_file_chooser_get_filenames_utf8
#endif
gtk_file_chooser_get_filename
gtk_file_chooser_get_filenames
gtk_file_chooser_get_files
gtk_file_chooser_get_filter
gtk_file_chooser_get_local_only
gtk_file_chooser_get_preview_file
#ifndef _WIN64
gtk_file_chooser_get_preview_filename PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_file_chooser_get_preview_filename_utf8
#endif
gtk_file_chooser_get_preview_filename
gtk_file_chooser_get_preview_uri
gtk_file_chooser_get_preview_widget
gtk_file_chooser_get_preview_widget_active
......@@ -1297,48 +1262,23 @@ gtk_file_chooser_get_uri
gtk_file_chooser_get_uris
gtk_file_chooser_get_use_preview_label
gtk_file_chooser_list_filters
#ifndef _WIN64
gtk_file_chooser_list_shortcut_folders PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_file_chooser_list_shortcut_folders_utf8
#endif
gtk_file_chooser_list_shortcut_folders
gtk_file_chooser_list_shortcut_folder_uris
gtk_file_chooser_remove_filter
#ifndef _WIN64
gtk_file_chooser_remove_shortcut_folder PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_file_chooser_remove_shortcut_folder_utf8
#endif
gtk_file_chooser_remove_shortcut_folder
gtk_file_chooser_remove_shortcut_folder_uri
gtk_file_chooser_select_all
gtk_file_chooser_select_file
#ifndef _WIN64
gtk_file_chooser_select_filename PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_file_chooser_select_filename_utf8
#endif
gtk_file_chooser_select_filename
gtk_file_chooser_select_uri
gtk_file_chooser_set_action
#ifndef _WIN64
gtk_file_chooser_set_current_folder PRIVATE
#endif
gtk_file_chooser_set_current_folder
gtk_file_chooser_set_current_folder_file
#ifdef G_OS_WIN32
gtk_file_chooser_set_current_folder_utf8
#endif
gtk_file_chooser_set_current_folder_uri
gtk_file_chooser_set_current_name
gtk_file_chooser_set_extra_widget
gtk_file_chooser_set_file
#ifndef _WIN64
gtk_file_chooser_set_filename PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_file_chooser_set_filename_utf8
#endif
gtk_file_chooser_set_filename
gtk_file_chooser_set_filter
gtk_file_chooser_set_local_only
gtk_file_chooser_set_preview_widget
......@@ -1349,12 +1289,7 @@ gtk_file_chooser_set_uri
gtk_file_chooser_set_use_preview_label
gtk_file_chooser_unselect_all
gtk_file_chooser_unselect_file
#ifndef _WIN64
gtk_file_chooser_unselect_filename PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_file_chooser_unselect_filename_utf8
#endif
gtk_file_chooser_unselect_filename
gtk_file_chooser_unselect_uri
#endif
#endif
......@@ -1580,12 +1515,7 @@ gtk_icon_source_copy
gtk_icon_source_free
gtk_icon_source_get_direction
gtk_icon_source_get_direction_wildcarded
#ifndef _WIN64
gtk_icon_source_get_filename PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_icon_source_get_filename_utf8
#endif
gtk_icon_source_get_filename
gtk_icon_source_get_icon_name
gtk_icon_source_get_pixbuf
gtk_icon_source_get_size
......@@ -1596,12 +1526,7 @@ gtk_icon_source_get_type G_GNUC_CONST
gtk_icon_source_new
gtk_icon_source_set_direction
gtk_icon_source_set_direction_wildcarded
#ifndef _WIN64
gtk_icon_source_set_filename PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_icon_source_set_filename_utf8
#endif
gtk_icon_source_set_filename
gtk_icon_source_set_icon_name
gtk_icon_source_set_pixbuf
gtk_icon_source_set_size
......@@ -1621,35 +1546,20 @@ gtk_icon_info_get_base_size
gtk_icon_info_get_builtin_pixbuf
gtk_icon_info_get_display_name
gtk_icon_info_get_embedded_rect
#ifndef _WIN64
gtk_icon_info_get_filename PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_icon_info_get_filename_utf8
#endif
gtk_icon_info_get_filename
gtk_icon_info_get_type G_GNUC_CONST
gtk_icon_info_load_icon
gtk_icon_info_load_symbolic
gtk_icon_info_load_symbolic_for_style
gtk_icon_info_set_raw_coordinates
gtk_icon_theme_add_builtin_icon
#ifndef _WIN64
gtk_icon_theme_append_search_path PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_icon_theme_append_search_path_utf8
#endif
gtk_icon_theme_append_search_path
gtk_icon_theme_error_quark
gtk_icon_theme_get_default
gtk_icon_theme_get_example_icon_name
gtk_icon_theme_get_for_screen
gtk_icon_theme_get_icon_sizes
#ifndef _WIN64
gtk_icon_theme_get_search_path PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_icon_theme_get_search_path_utf8
#endif
gtk_icon_theme_get_search_path
gtk_icon_theme_get_type G_GNUC_CONST
gtk_icon_theme_has_icon
gtk_icon_theme_list_contexts
......@@ -1659,21 +1569,11 @@ gtk_icon_theme_lookup_icon
gtk_icon_theme_lookup_by_gicon
gtk_icon_theme_choose_icon
gtk_icon_theme_new
#ifndef _WIN64
gtk_icon_theme_prepend_search_path PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_icon_theme_prepend_search_path_utf8
#endif
gtk_icon_theme_prepend_search_path
gtk_icon_theme_rescan_if_needed
gtk_icon_theme_set_custom_theme
gtk_icon_theme_set_screen
#ifndef _WIN64
gtk_icon_theme_set_search_path PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_icon_theme_set_search_path_utf8
#endif
gtk_icon_theme_set_search_path
#endif
#endif
......@@ -1758,12 +1658,7 @@ gtk_image_get_storage_type
gtk_image_get_type G_GNUC_CONST
gtk_image_new
gtk_image_new_from_animation
#ifndef _WIN64
gtk_image_new_from_file PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_image_new_from_file_utf8
#endif
gtk_image_new_from_file
gtk_image_new_from_icon_name
gtk_image_new_from_icon_set
gtk_image_new_from_pixbuf
......@@ -1771,12 +1666,7 @@ gtk_image_new_from_pixmap
gtk_image_new_from_stock
gtk_image_new_from_gicon
gtk_image_set_from_animation
#ifndef _WIN64
gtk_image_set_from_file PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_image_set_from_file_utf8
#endif
gtk_image_set_from_file
gtk_image_set_from_icon_name
gtk_image_set_from_icon_set
gtk_image_set_from_pixbuf
......@@ -2784,12 +2674,7 @@ gtk_range_set_value
#if IN_HEADER(__GTK_RC_H__)
#if IN_FILE(__GTK_RC_C__)
#ifndef _WIN64
gtk_rc_add_default_file PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_rc_add_default_file_utf8
#endif
gtk_rc_add_default_file
gtk_rc_find_module_in_path
gtk_rc_find_pixmap_in_path
gtk_rc_get_default_files
......@@ -2799,12 +2684,7 @@ gtk_rc_get_module_dir
gtk_rc_get_style
gtk_rc_get_style_by_paths
gtk_rc_get_theme_dir
#ifndef _WIN64
gtk_rc_parse PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_rc_parse_utf8
#endif
gtk_rc_parse
gtk_rc_parse_color
gtk_rc_parse_color_full
gtk_rc_parse_priority
......@@ -2814,12 +2694,7 @@ gtk_rc_reparse_all
gtk_rc_reparse_all_for_settings
gtk_rc_reset_styles
gtk_rc_scanner_new
#ifndef _WIN64
gtk_rc_set_default_files PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_rc_set_default_files_utf8
#endif
gtk_rc_set_default_files
gtk_rc_style_copy
gtk_rc_style_get_type G_GNUC_CONST
gtk_rc_style_new
......@@ -4219,12 +4094,7 @@ gtk_identifier_get_type G_GNUC_CONST
#if IN_HEADER(__GTK_UI_MANAGER_H__)
#if IN_FILE(__GTK_UI_MANAGER_C__)
gtk_ui_manager_add_ui
#ifndef _WIN64
gtk_ui_manager_add_ui_from_file PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_ui_manager_add_ui_from_file_utf8
#endif
gtk_ui_manager_add_ui_from_file
gtk_ui_manager_add_ui_from_string
gtk_ui_manager_ensure_update
gtk_ui_manager_get_accel_group
......@@ -4577,12 +4447,7 @@ gtk_window_set_decorated
gtk_window_set_deletable
gtk_window_set_default
gtk_window_set_default_icon
#ifndef _WIN64
gtk_window_set_default_icon_from_file PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_window_set_default_icon_from_file_utf8
#endif
gtk_window_set_default_icon_from_file
gtk_window_set_default_icon_list
gtk_window_set_default_icon_name
gtk_window_set_default_size
......@@ -4595,12 +4460,7 @@ gtk_window_set_geometry_hints
gtk_window_set_gravity
gtk_window_set_has_frame
gtk_window_set_icon
#ifndef _WIN64
gtk_window_set_icon_from_file PRIVATE
#endif
#ifdef G_OS_WIN32
gtk_window_set_icon_from_file_utf8
#endif
gtk_window_set_icon_from_file
gtk_window_set_icon_list
gtk_window_set_icon_name
gtk_window_set_keep_above
......
......@@ -1003,31 +1003,3 @@ do_accel_map_changed (AccelEntry *entry)
entry->accel_key,
entry->accel_mods);
}
#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef gtk_accel_map_load
void
gtk_accel_map_load (const gchar *file_name)
{
gchar *utf8_file_name = g_locale_to_utf8 (file_name, -1, NULL, NULL, NULL);
gtk_accel_map_load_utf8 (utf8_file_name);
g_free (utf8_file_name);
}
#undef gtk_accel_map_save
void
gtk_accel_map_save (const gchar *file_name)
{
gchar *utf8_file_name = g_locale_to_utf8 (file_name, -1, NULL, NULL, NULL);
gtk_accel_map_save_utf8 (utf8_file_name);
g_free (utf8_file_name);
}
#endif
......@@ -50,12 +50,6 @@ typedef void (*GtkAccelMapForeach) (gpointer data,
/* --- public API --- */
#ifdef G_OS_WIN32
/* Reserve old names for DLL ABI backward compatibility */
#define gtk_accel_map_load gtk_accel_map_load_utf8
#define gtk_accel_map_save gtk_accel_map_save_utf8
#endif
void gtk_accel_map_add_entry (const gchar *accel_path,
guint accel_key,
GdkModifierType accel_mods);
......
......@@ -2567,172 +2567,3 @@ gtk_file_chooser_get_do_overwrite_confirmation (GtkFileChooser *chooser)
return do_overwrite_confirmation;
}
#if defined (G_OS_WIN32) && !defined (_WIN64)
/* DLL ABI stability backward compatibility versions */
#undef gtk_file_chooser_get_filename
gchar *
gtk_file_chooser_get_filename (GtkFileChooser *chooser)
{
gchar *utf8_filename = gtk_file_chooser_get_filename_utf8 (chooser);
gchar *retval = g_locale_from_utf8 (utf8_filename, -1, NULL, NULL, NULL);
g_free (utf8_filename);
return retval;
}
#undef gtk_file_chooser_set_filename
gboolean
gtk_file_chooser_set_filename (GtkFileChooser *chooser,
const gchar *filename)
{
gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
gboolean retval = gtk_file_chooser_set_filename_utf8 (chooser, utf8_filename);
g_free (utf8_filename);
return retval;
}
#undef gtk_file_chooser_select_filename
gboolean
gtk_file_chooser_select_filename (GtkFileChooser *chooser,
const gchar *filename)
{
gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
gboolean retval = gtk_file_chooser_select_filename_utf8 (chooser, utf8_filename);
g_free (utf8_filename);
return retval;
}
#undef gtk_file_chooser_unselect_filename
void
gtk_file_chooser_unselect_filename (GtkFileChooser *chooser,
const char *filename)
{
gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
gtk_file_chooser_unselect_filename_utf8 (chooser, utf8_filename);
g_free (utf8_filename);
}
#undef gtk_file_chooser_get_filenames
GSList *
gtk_file_chooser_get_filenames (GtkFileChooser *chooser)
{
GSList *list = gtk_file_chooser_get_filenames_utf8 (chooser);
GSList *rover = list;
while (rover)
{
gchar *tem = (gchar *) rover->data;
rover->data = g_locale_from_utf8 ((gchar *) rover->data, -1, NULL, NULL, NULL);
g_free (tem);
rover = rover->next;
}
return list;
}
#undef gtk_file_chooser_set_current_folder
gboolean
gtk_file_chooser_set_current_folder (GtkFileChooser *chooser,
const gchar *filename)
{
gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
gboolean retval = gtk_file_chooser_set_current_folder_utf8 (chooser, utf8_filename);
g_free (utf8_filename);
return retval;
}
#undef gtk_file_chooser_get_current_folder
gchar *
gtk_file_chooser_get_current_folder (GtkFileChooser *chooser)
{
gchar *utf8_folder = gtk_file_chooser_get_current_folder_utf8 (chooser);
gchar *retval = g_locale_from_utf8 (utf8_folder, -1, NULL, NULL, NULL);
g_free (utf8_folder);
return retval;
}
#undef gtk_file_chooser_get_preview_filename
char *
gtk_file_chooser_get_preview_filename (GtkFileChooser *chooser)
{
char *utf8_filename = gtk_file_chooser_get_preview_filename_utf8 (chooser);
char *retval = g_locale_from_utf8 (utf8_filename, -1, NULL, NULL, NULL);
g_free (utf8_filename);
return retval;
}
#undef gtk_file_chooser_add_shortcut_folder
gboolean
gtk_file_chooser_add_shortcut_folder (GtkFileChooser *chooser,
const char *folder,
GError **error)
{
char *utf8_folder = g_locale_to_utf8 (folder, -1, NULL, NULL, NULL);
gboolean retval =
gtk_file_chooser_add_shortcut_folder_utf8 (chooser, utf8_folder, error);
g_free (utf8_folder);
return retval;
}
#undef gtk_file_chooser_remove_shortcut_folder
gboolean
gtk_file_chooser_remove_shortcut_folder (GtkFileChooser *chooser,
const char *folder,
GError **error)
{
char *utf8_folder = g_locale_to_utf8 (folder, -1, NULL, NULL, NULL);
gboolean retval =
gtk_file_chooser_remove_shortcut_folder_utf8 (chooser, utf8_folder, error);
g_free (utf8_folder);
return retval;
}
#undef gtk_file_chooser_list_shortcut_folders
GSList *
gtk_file_chooser_list_shortcut_folders (GtkFileChooser *chooser)
{
GSList *list = gtk_file_chooser_list_shortcut_folders_utf8 (chooser);
GSList *rover = list;
while (rover)
{
gchar *tem = (gchar *) rover->data;
rover->data = g_locale_from_utf8 ((gchar *) rover->data, -1, NULL, NULL, NULL);
g_free (tem);
rover = rover->next;
}
return list;
}
#endif
......@@ -145,21 +145,6 @@ void gtk_file_chooser_set_current_name (GtkFileChooser *chooser,
/* Filename manipulation
*/
#ifdef G_OS_WIN32
/* Reserve old names for DLL ABI backward compatibility */
#define gtk_file_chooser_get_filename gtk_file_chooser_get_filename_utf8
#define gtk_file_chooser_set_filename gtk_file_chooser_set_filename_utf8
#define gtk_file_chooser_select_filename gtk_file_chooser_select_filename_utf8
#define gtk_file_chooser_unselect_filename gtk_file_chooser_unselect_filename_utf8
#define gtk_file_chooser_get_filenames gtk_file_chooser_get_filenames_utf8
#define gtk_file_chooser_set_current_folder gtk_file_chooser_set_current_folder_utf8
#define gtk_file_chooser_get_current_folder gtk_file_chooser_get_current_folder_utf8
#define gtk_file_chooser_get_preview_filename gtk_file_chooser_get_preview_filename_utf8
#define gtk_file_chooser_add_shortcut_folder gtk_file_chooser_add_shortcut_folder_utf8
#define gtk_file_chooser_remove_shortcut_folder gtk_file_chooser_remove_shortcut_folder_utf8
#define gtk_file_chooser_list_shortcut_folders gtk_file_chooser_list_shortcut_folders_utf8
#endif
gchar * gtk_file_chooser_get_filename (GtkFileChooser *chooser);
gboolean gtk_file_chooser_set_filename (GtkFileChooser *chooser,
const char *filename);
......
......@@ -78,13 +78,6 @@ struct _GtkIconSource
guint any_direction : 1;
guint any_state : 1;
guint any_size : 1;
#if defined (G_OS_WIN32) && !defined (_WIN64)
/* System codepage version of filename, for DLL ABI backward
* compatibility functions.
*/
gchar *cp_filename;
#endif
};
......@@ -1907,9 +1900,6 @@ gtk_icon_source_copy (const GtkIconSource *source)
break;
case GTK_ICON_SOURCE_FILENAME:
copy->source.filename = g_strdup (copy->source.filename);
#if defined (G_OS_WIN32) && !defined (_WIN64)
copy->cp_filename = g_strdup (copy->cp_filename);
#endif
if (copy->filename_pixbuf)
g_object_ref (copy->filename_pixbuf);
break;
......@@ -1959,10 +1949,6 @@ icon_source_clear (GtkIconSource *source)
case GTK_ICON_SOURCE_FILENAME:
g_free (source->source.filename);
source->source.filename = NULL;
#if defined (G_OS_WIN32) && !defined (_WIN64)
g_free (source->cp_filename);
source->cp_filename = NULL;
#endif
if (source->filename_pixbuf)
g_object_unref (source->filename_pixbuf);
source->filename_pixbuf = NULL;
......@@ -2003,9 +1989,6 @@ gtk_icon_source_set_filename (GtkIconSource *source,
{
source->type = GTK_ICON_SOURCE_FILENAME;
source->source.filename = g_strdup (filename);
#if defined (G_OS_WIN32) && !defined (_WIN64)
source->cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
#endif
}
}
......@@ -2948,35 +2931,3 @@ gtk_icon_factory_buildable_custom_tag_end (GtkBuildable *buildable,
gtk_icon_factory_add_default (icon_factory);
}
}
#if defined (G_OS_WIN32) && !defined (_WIN64)
/* DLL ABI stability backward compatibility versions */
#undef gtk_icon_source_set_filename
void
gtk_icon_source_set_filename (GtkIconSource *source,
const gchar *filename)
{
gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
gtk_icon_source_set_filename_utf8 (source, utf8_filename);
g_free (utf8_filename);
}
#undef gtk_icon_source_get_filename
G_CONST_RETURN gchar*
gtk_icon_source_get_filename (const GtkIconSource *source)
{
g_return_val_if_fail (source != NULL, NULL);
if (source->type == GTK_ICON_SOURCE_FILENAME)
return source->cp_filename;
else
return NULL;
}
#endif
......@@ -68,12 +68,6 @@ struct _GtkIconFactoryClass
void (*_gtk_reserved4) (void);
};
#ifdef G_OS_WIN32
/* Reserve old names for DLL ABI backward compatibility */
#define gtk_icon_source_set_filename gtk_icon_source_set_filename_utf8
#define gtk_icon_source_get_filename gtk_icon_source_get_filename_utf8
#endif
GType gtk_icon_factory_get_type (void) G_GNUC_CONST;
GtkIconFactory* gtk_icon_factory_new (void);
void gtk_icon_factory_add (GtkIconFactory *factory,
......
......@@ -109,12 +109,6 @@ struct _GtkIconInfo
/* Information about the source
*/
gchar *filename;
#if defined (G_OS_WIN32) && !defined (_WIN64)
/* System codepage version of filename, for DLL ABI backward
* compatibility functions.
*/
gchar *cp_filename;
#endif
GLoadableIcon *loadable;
GSList *emblem_infos;
......@@ -1322,10 +1316,6 @@ choose_icon (GtkIconTheme *icon_theme,
icon_info->filename = g_strdup (unthemed_icon->svg_filename);
else if (unthemed_icon->no_svg_filename)
icon_info->filename = g_strdup (unthemed_icon->no_svg_filename);
#if defined (G_OS_WIN32) && !defined (_WIN64)
icon_info->cp_filename = g_locale_from_utf8 (icon_info->filename,
-1, NULL, NULL, NULL);
#endif
icon_info->dir_type = ICON_THEME_DIR_UNTHEMED;
icon_info->dir_size = size;
......@@ -2209,17 +2199,10 @@ theme_lookup_icon (IconTheme *theme,
file = g_strconcat (icon_name, string_from_suffix (suffix), NULL);
icon_info->filename = g_build_filename (min_dir->dir, file, NULL);
g_free (file);
#if defined (G_OS_WIN32) && !defined (_WIN64)
icon_info->cp_filename = g_locale_from_utf8 (icon_info->filename,
-1, NULL, NULL, NULL);
#endif
}
else
{
icon_info->filename = NULL;
#if defined (G_OS_WIN32) && !defined (_WIN64)
icon_info->cp_filename = NULL;
#endif
}
if (min_dir->icon_data != NULL)
......@@ -2666,9 +2649,6 @@ gtk_icon_info_free (GtkIconInfo *icon_info)
return;
g_free (icon_info->filename);
#if defined (G_OS_WIN32) && !defined (_WIN64)
g_free (icon_info->cp_filename);
#endif
if (icon_info->loadable)
g_object_unref (icon_info->loadable);
g_slist_foreach (icon_info->emblem_infos, (GFunc)gtk_icon_info_free, NULL);
......@@ -3710,94 +3690,3 @@ gtk_icon_info_new_for_pixbuf (GtkIconTheme *icon_theme,
return info;
}
#if defined (G_OS_WIN32) && !defined (_WIN64)
/* DLL ABI stability backward compatibility versions */
#undef gtk_icon_theme_set_search_path
void
gtk_icon_theme_set_search_path (GtkIconTheme *icon_theme,
const gchar *path[],
gint n_elements)
{
const gchar **utf8_path;
gint i;
utf8_path = g_new (const gchar *, n_elements);
for (i = 0; i < n_elements; i++)
utf8_path[i] = g_locale_to_utf8 (path[i], -1, NULL, NULL, NULL);
gtk_icon_theme_set_search_path_utf8 (icon_theme, utf8_path, n_elements);
for (i = 0; i < n_elements; i++)
g_free ((gchar *) utf8_path[i]);
g_free (utf8_path);
}
#undef gtk_icon_theme_get_search_path
void
gtk_icon_theme_get_search_path (GtkIconTheme *icon_theme,
gchar **path[],
gint *n_elements)
{
gint i, n;
gtk_icon_theme_get_search_path_utf8 (icon_theme, path, &n);