callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Report errors about integer parsing back up. (#452988)

Browse Source 
2007-07-03  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkcelllayout.c (attributes_text_element): Report
        errors about integer parsing back up.  (#452988)

        * tests/buildertest.c: Add an extra check.


svn path=/trunk/; revision=18364
This commit is contained in:
Matthias Clasen 2007-07-03 17:22:24 +00:00 committed by Matthias Clasen
parent 34e44d63ea
commit 22fa07d55d
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-07-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcelllayout.c (attributes_text_element): Report
errors about integer parsing back up. (#452988)
* tests/buildertest.c: Add an extra check.
2007-07-03 Matthias Clasen <mclasen@redhat.com> 2007-07-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't leave * gtk/gtkbutton.c (gtk_button_construct_child): Don't leave

20
gtk/gtkcelllayout.c
View File

@ -17,9 +17,10 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <config.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <config.h> #include <errno.h>
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h" #include "gtkalias.h"
@ -346,12 +347,27 @@ attributes_text_element (GMarkupParseContext *context,
GError **error) GError **error)
{ {
AttributesSubParserData *parser_data = (AttributesSubParserData*)user_data; AttributesSubParserData *parser_data = (AttributesSubParserData*)user_data;
glong l;
gchar *endptr;
if (!parser_data->attr_name) if (!parser_data->attr_name)
return; return;
errno = 0;
l = strtol (text, &endptr, 0);
if (errno || endptr == text)
{
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
"Could not parse integer `%s'",
text);
return;
}
gtk_cell_layout_add_attribute (parser_data->cell_layout, gtk_cell_layout_add_attribute (parser_data->cell_layout,
parser_data->renderer, parser_data->renderer,
parser_data->attr_name, atoi (text)); parser_data->attr_name, l);
g_free (parser_data->attr_name); g_free (parser_data->attr_name);
parser_data->attr_name = NULL; parser_data->attr_name = NULL;
} }

1
tests/buildertest.c
View File

@ -1038,6 +1038,7 @@ gboolean test_treeview_column (void)
g_return_val_if_fail (treeview, FALSE); g_return_val_if_fail (treeview, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (treeview), FALSE); g_return_val_if_fail (GTK_IS_TREE_VIEW (treeview), FALSE);
column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 0); column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 0);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), FALSE);
g_return_val_if_fail (strcmp (gtk_tree_view_column_get_title (column), g_return_val_if_fail (strcmp (gtk_tree_view_column_get_title (column),
"Test") == 0, FALSE); "Test") == 0, FALSE);