AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 21:21:21 +00:00
Code Issues Projects Releases Wiki Activity

GtkFontChooser: Fix segmentation fault in deprecated size list population

Browse Source
This commit is contained in:
Alberto Ruiz 2011-04-28 01:20:44 +01:00 committed by Matthias Clasen
parent 29a0685ee8
commit 915b442dc1
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkfontchooser.c
View File

@ -442,7 +442,7 @@ set_range_marks (GtkFontSelectionPrivate *priv,
{ {
GtkTreeIter iter; GtkTreeIter iter;
g_string_printf ("%d", sizes[i]); g_string_printf (size_str, "%d", sizes[i]);
gtk_scale_add_mark (GTK_SCALE (size_slider), gtk_scale_add_mark (GTK_SCALE (size_slider),
(gdouble) sizes[i], (gdouble) sizes[i],
@ -471,7 +471,7 @@ cursor_changed_cb (GtkTreeView *treeview, gpointer data)
GtkTreeIter iter; GtkTreeIter iter;
GtkTreePath *path = gtk_tree_path_new (); GtkTreePath *path = gtk_tree_path_new ();
GtkFontSelection *fontsel = (GtkFontSelection*)data; GtkFontSelection *fontsel = (GtkFontSelection*)data;
gtk_tree_view_get_cursor (treeview, &path, NULL); gtk_tree_view_get_cursor (treeview, &path, NULL);
@ -1032,8 +1032,10 @@ gtk_font_selection_get_family_list (GtkFontSelection *fontsel)
{ {
GtkFontSelectionPrivate *priv = fontsel->priv; GtkFontSelectionPrivate *priv = fontsel->priv;
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL); g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
if (!priv->font_list)
initialize_deprecated_widgets (fontsel);
return NULL; return priv->font_list;
} }
/** /**
@ -1052,8 +1054,10 @@ gtk_font_selection_get_face_list (GtkFontSelection *fontsel)
{ {
GtkFontSelectionPrivate *priv = fontsel->priv; GtkFontSelectionPrivate *priv = fontsel->priv;
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL); g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
if (!priv->face_list)
initialize_deprecated_widgets (fontsel);
return NULL; return priv->face_list;
} }
/** /**
@ -1091,8 +1095,10 @@ gtk_font_selection_get_size_list (GtkFontSelection *fontsel)
{ {
GtkFontSelectionPrivate *priv = fontsel->priv; GtkFontSelectionPrivate *priv = fontsel->priv;
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL); g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
if (!priv->size_list)
initialize_deprecated_widgets (fontsel);
return NULL; return priv->size_list;
} }
/** /**
@ -1132,7 +1138,7 @@ gtk_font_selection_get_family (GtkFontSelection *fontsel)
{ {
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL); g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
return NULL; return fontsel->priv->family;
} }
/** /**
@ -1153,7 +1159,7 @@ gtk_font_selection_get_face (GtkFontSelection *fontsel)
{ {
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL); g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
return NULL; return fontsel->priv->face;
} }
/** /**

7
tests/testfontselection.c
View File

@ -35,13 +35,14 @@ main (int argc, char *argv[])
dialog = gtk_font_selection_dialog_new (NULL); dialog = gtk_font_selection_dialog_new (NULL);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_size_request (window, 300, 300);
vbox = gtk_vbox_new (TRUE, 6); vbox = gtk_vbox_new (TRUE, 6);
gtk_container_add (GTK_CONTAINER (window), vbox); gtk_container_add (GTK_CONTAINER (window), vbox);
fontsel = gtk_font_selection_dialog_get_font_selection (GTK_FONT_SELECTION_DIALOG (dialog)); fontsel = gtk_font_selection_dialog_get_font_selection (GTK_FONT_SELECTION_DIALOG (dialog));
gtk_container_add (GTK_CONTAINER (window), gtk_font_selection_get_size_list (GTK_FONT_SELECTION (fontsel))); gtk_container_add (GTK_CONTAINER (vbox), gtk_font_selection_get_size_list (GTK_FONT_SELECTION (fontsel)));
gtk_container_add (GTK_CONTAINER (window), gtk_font_selection_get_family_list (GTK_FONT_SELECTION (fontsel))); gtk_container_add (GTK_CONTAINER (vbox), gtk_font_selection_get_family_list (GTK_FONT_SELECTION (fontsel)));
gtk_container_add (GTK_CONTAINER (window), gtk_font_selection_get_face_list (GTK_FONT_SELECTION (fontsel))); gtk_container_add (GTK_CONTAINER (vbox), gtk_font_selection_get_face_list (GTK_FONT_SELECTION (fontsel)));
gtk_widget_show_all (window); gtk_widget_show_all (window);