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

Factor out a function

Browse Source 
Factor out the typename-to-get-type mangling as a separate
function, for easier testing.

Also fix some cases where it doesn't, currently, like
GString -> g_string_get_type and
GdkRGB -> gdk_rgb_get_type
This commit is contained in:
Matthias Clasen
2014-09-26 23:28:55 -04:00
parent 0c2f3402c3
commit f35dff334f
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
gtk/gtkbuilder.c
View File

@ -372,36 +372,43 @@ gtk_builder_get_property (GObject *object,
* GtkWindow -> gtk_window_get_type * GtkWindow -> gtk_window_get_type
* GtkHBox -> gtk_hbox_get_type * GtkHBox -> gtk_hbox_get_type
* GtkUIManager -> gtk_ui_manager_get_type * GtkUIManager -> gtk_ui_manager_get_type
* * GdkRGB -> gdk_rgb_get_type
*/ */
static gchar *
type_name_mangle (const gchar *name)
{
GString *symbol_name = g_string_new ("");
int i;
for (i = 0; name[i] != '\0'; i++)
{
/* skip if uppercase, first or previous is uppercase */
if ((i > 0 && name[i] == g_ascii_toupper (name[i]) &&
(name[i-1] != g_ascii_toupper (name[i-1]) || i == 1)) ||
(i > 2 && name[i] == g_ascii_toupper (name[i]) &&
name[i-1] == g_ascii_toupper (name[i-1]) &&
name[i-2] == g_ascii_toupper (name[i-2]) &&
name[i+1] != 0 && name[i+1] != g_ascii_toupper (name[i+1])))
g_string_append_c (symbol_name, '_');
g_string_append_c (symbol_name, g_ascii_tolower (name[i]));
}
g_string_append (symbol_name, "_get_type");
return g_string_free (symbol_name, FALSE);
}
static GType static GType
_gtk_builder_resolve_type_lazily (const gchar *name) _gtk_builder_resolve_type_lazily (const gchar *name)
{ {
static GModule *module = NULL; static GModule *module = NULL;
GTypeGetFunc func; GTypeGetFunc func;
GString *symbol_name = g_string_new (""); gchar *symbol;
char c, *symbol;
int i;
GType gtype = G_TYPE_INVALID; GType gtype = G_TYPE_INVALID;
if (!module) if (!module)
module = g_module_open (NULL, 0); module = g_module_open (NULL, 0);
for (i = 0; name[i] != '\0'; i++) symbol = type_name_mangle (name);
{
c = name[i];
/* skip if uppercase, first or previous is uppercase */
if ((c == g_ascii_toupper (c) &&
i > 0 && name[i-1] != g_ascii_toupper (name[i-1])) ||
(i > 2 && name[i] == g_ascii_toupper (name[i]) &&
name[i-1] == g_ascii_toupper (name[i-1]) &&
name[i-2] == g_ascii_toupper (name[i-2])))
g_string_append_c (symbol_name, '_');
g_string_append_c (symbol_name, g_ascii_tolower (c));
}
g_string_append (symbol_name, "_get_type");
symbol = g_string_free (symbol_name, FALSE);
if (g_module_symbol (module, symbol, (gpointer)&func)) if (g_module_symbol (module, symbol, (gpointer)&func))
gtype = func (); gtype = func ();