Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Fix MSVC warning about function prototypes

Browse Source 
We're using custom sorters and those want int as the return value,
not GtkOrdering.
This commit is contained in:
Benjamin Otte
2024-10-21 06:01:48 +02:00
parent 591bc5edc0
commit 66e059ae52
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gtk-demo/font_features.c
View File

@@ -811,7 +811,7 @@ tag_pair_equal (gconstpointer a, gconstpointer b)
}
static GtkOrdering
static int
script_sort (const void *item1,
const void *item2,
void *data)

22
gtk/gtkfilechooserwidget.c
View File

@@ -6959,7 +6959,7 @@ match_func (gpointer item, gpointer user_data)
return g_file_info_get_attribute_boolean (G_FILE_INFO (item), "filechooser::visible");
}
static GtkOrdering
static int
directory_sort_func (gconstpointer a,
gconstpointer b,
gpointer user_data)
@@ -6980,13 +6980,13 @@ directory_sort_func (gconstpointer a,
return GTK_ORDERING_EQUAL;
}
static GtkOrdering
static int
name_sort_func (gconstpointer a,
gconstpointer b,
gpointer user_data)
{
char *key_a, *key_b;
GtkOrdering result;
int result;
/* FIXME: use sortkeys for these */
key_a = g_utf8_collate_key_for_filename (g_file_info_get_display_name ((GFileInfo *)a), -1);
@@ -7026,7 +7026,7 @@ location_sort_func (gconstpointer a,
return result;
}
static GtkOrdering
static int
size_sort_func (gconstpointer a,
gconstpointer b,
gpointer user_data)
@@ -7044,14 +7044,14 @@ size_sort_func (gconstpointer a,
return GTK_ORDERING_EQUAL;
}
static GtkOrdering
static int
type_sort_func (gconstpointer a,
gconstpointer b,
gpointer user_data)
{
GtkFileChooserWidget *impl = user_data;
char *key_a, *key_b;
GtkOrdering result;
int result;
/* FIXME: use sortkeys for these */
key_a = get_type_information (impl, (GFileInfo *)a);
@@ -7065,7 +7065,7 @@ type_sort_func (gconstpointer a,
return result;
}
static GtkOrdering
static int
time_sort_func (gconstpointer a,
gconstpointer b,
gpointer user_data)
@@ -7094,12 +7094,12 @@ time_sort_func (gconstpointer a,
return GTK_ORDERING_EQUAL;
}
static GtkOrdering
static int
recent_sort_func (gconstpointer a,
gconstpointer b,
gpointer user_data)
{
GtkOrdering result;
int result;
result = time_sort_func (a, b, user_data);
@@ -7116,12 +7116,12 @@ recent_sort_func (gconstpointer a,
return result;
}
static GtkOrdering
static int
search_sort_func (gconstpointer a,
gconstpointer b,
gpointer user_data)
{
GtkOrdering result;
int result;
result = location_sort_func (a, b, user_data);