AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 07:04:29 +00:00
Code Issues Projects Releases Wiki Activity

inspector: be careful about gsize vs guint64

Browse Source 
Since gsize doesn't work as a typename in a ui file,
we have to be careful not to pass pointers to wrongly
sized variables when getting the guint64 values out
of the model.

https://bugzilla.gnome.org/show_bug.cgi?id=742664
This commit is contained in:
Matthias Clasen 2015-01-09 14:44:26 -05:00
parent 9a38fb79e5
commit c2ff89bbe3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/inspector/resource-list.c
View File

@ -83,6 +83,7 @@ load_resources_recurse (GtkInspectorResourceList *sl,
gchar **names; gchar **names;
gint i; gint i;
GtkTreeIter iter; GtkTreeIter iter;
guint64 stored_size;
names = g_resources_enumerate_children (path, 0, NULL); names = g_resources_enumerate_children (path, 0, NULL);
for (i = 0; names[i]; i++) for (i = 0; names[i]; i++)
@ -124,9 +125,10 @@ load_resources_recurse (GtkInspectorResourceList *sl,
*size_out += size; *size_out += size;
} }
stored_size = size;
gtk_tree_store_set (sl->priv->model, &iter, gtk_tree_store_set (sl->priv->model, &iter,
COLUMN_COUNT, count, COLUMN_COUNT, count,
COLUMN_SIZE, size, COLUMN_SIZE, stored_size,
-1); -1);
g_free (p); g_free (p);
@ -147,6 +149,7 @@ populate_details (GtkInspectorResourceList *rl,
gconstpointer data; gconstpointer data;
gint count; gint count;
gsize size; gsize size;
guint64 stored_size;
GError *error = NULL; GError *error = NULL;
gchar *markup; gchar *markup;
@ -157,8 +160,9 @@ populate_details (GtkInspectorResourceList *rl,
COLUMN_PATH, &path, COLUMN_PATH, &path,
COLUMN_NAME, &name, COLUMN_NAME, &name,
COLUMN_COUNT, &count, COLUMN_COUNT, &count,
COLUMN_SIZE, &size, COLUMN_SIZE, &stored_size,
-1); -1);
size = stored_size;
if (g_str_has_suffix (path, "/")) if (g_str_has_suffix (path, "/"))
{ {
@ -192,7 +196,7 @@ populate_details (GtkInspectorResourceList *rl,
text = g_format_size (size); text = g_format_size (size);
gtk_label_set_text (GTK_LABEL (rl->priv->size_label), text); gtk_label_set_text (GTK_LABEL (rl->priv->size_label), text);
g_free (text); g_free (text);
if (g_content_type_is_a (type, "text/*")) if (g_content_type_is_a (type, "text/*"))
{ {
gtk_text_buffer_set_text (rl->priv->buffer, data, -1); gtk_text_buffer_set_text (rl->priv->buffer, data, -1);
@ -340,10 +344,12 @@ size_data_func (GtkTreeViewColumn *col,
GtkTreeIter *iter, GtkTreeIter *iter,
gpointer data) gpointer data)
{ {
gint size; gsize size;
guint64 stored_size;
gchar *text; gchar *text;
gtk_tree_model_get (model, iter, COLUMN_SIZE, &size, -1); gtk_tree_model_get (model, iter, COLUMN_SIZE, &stored_size, -1);
size = stored_size;
text = g_format_size (size); text = g_format_size (size);
g_object_set (cell, "text", text, NULL); g_object_set (cell, "text", text, NULL);
g_free (text); g_free (text);