1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
--- gtk/gtkbuilder.c.orig Sun Jun 17 16:01:32 2007
+++ gtk/gtkbuilder.c Sun Jun 17 16:01:38 2007
@@ -47,7 +47,7 @@ static void gtk_builder_get_property (
GValue *value,
GParamSpec *pspec);
static GType gtk_builder_real_get_type_from_name (GtkBuilder *builder,
- const char *typename);
+ const char *type_name);
static gint _gtk_builder_enum_from_string (GType type, const char *string);
@@ -214,15 +214,15 @@ _gtk_builder_resolve_type_lazily (const
*/
static GType
-gtk_builder_real_get_type_from_name (GtkBuilder *builder, const char *typename)
+gtk_builder_real_get_type_from_name (GtkBuilder *builder, const char *type_name)
{
GType gtype;
- gtype = g_type_from_name (typename);
+ gtype = g_type_from_name (type_name);
if (gtype != G_TYPE_INVALID)
return gtype;
- return _gtk_builder_resolve_type_lazily (typename);
+ return _gtk_builder_resolve_type_lazily (type_name);
}
typedef struct
@@ -1238,23 +1238,23 @@ _gtk_builder_flags_from_string (GType ty
/**
* gtk_builder_get_type_from_name:
* @builder: a #GtkBuilder
- * @typename: Type name to lookup
+ * @type_name: Type name to lookup
*
* This method is used to lookup a type. It can be implemented in a
* subclass to override the #GType of an object created by the builder.
*
- * Returns: the #GType found for @typename or #G_TYPE_INVALID if no
+ * Returns: the #GType found for @type_name or #G_TYPE_INVALID if no
* type was found
*
* Since 2.12
*/
GType
-gtk_builder_get_type_from_name (GtkBuilder *builder, const gchar *typename)
+gtk_builder_get_type_from_name (GtkBuilder *builder, const gchar *type_name)
{
g_return_val_if_fail (GTK_IS_BUILDER (builder), G_TYPE_INVALID);
- g_return_val_if_fail (typename != NULL, G_TYPE_INVALID);
+ g_return_val_if_fail (type_name != NULL, G_TYPE_INVALID);
- return GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, typename);
+ return GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
}
/**
--- gtk/gtkbuilder.h.orig Sun Jun 17 16:02:12 2007
+++ gtk/gtkbuilder.h Sun Jun 17 16:02:23 2007
@@ -60,7 +60,7 @@ struct _GtkBuilderClass
GObjectClass parent_class;
GType (* get_type_from_name) (GtkBuilder *builder,
- const char *typename);
+ const char *type_name);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
@@ -103,7 +103,7 @@ void gtk_builder_set_translation
const gchar *domain);
const gchar* gtk_builder_get_translation_domain (GtkBuilder *builder);
GType gtk_builder_get_type_from_name (GtkBuilder *builder,
- const char *typename);
+ const char *type_name);
gboolean gtk_builder_value_from_string (GParamSpec *pspec,
const gchar *string,
|
