[glade/wip/support-no-ids: 1/3] glade-name-context.[ch]: Removing glade_name_context_dual_new_name()
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade/wip/support-no-ids: 1/3] glade-name-context.[ch]: Removing glade_name_context_dual_new_name()
- Date: Wed, 27 Jan 2016 14:05:03 +0000 (UTC)
commit f482bec02e66b5d5afd8699194a2be6cdc569ccf
Author: Tristan Van Berkom <tristan upstairslabs com>
Date: Wed Jan 27 12:35:44 2016 +0100
glade-name-context.[ch]: Removing glade_name_context_dual_new_name()
This is an artifact from older glades which supported name collisions
in separate toplevel windows within the same glade file.
gladeui/glade-name-context.c | 61 ------------------------------------------
gladeui/glade-name-context.h | 4 ---
2 files changed, 0 insertions(+), 65 deletions(-)
---
diff --git a/gladeui/glade-name-context.c b/gladeui/glade-name-context.c
index 5617d46..c9361b6 100644
--- a/gladeui/glade-name-context.c
+++ b/gladeui/glade-name-context.c
@@ -108,67 +108,6 @@ glade_name_context_new_name (GladeNameContext *context,
return name;
}
-gchar *
-glade_name_context_dual_new_name (GladeNameContext *context,
- GladeNameContext *another_context,
- const gchar *base_name)
-{
- GladeIDAllocator *id_allocator;
- GList *free_ids = NULL, *l;
- const gchar *number;
- gchar *name = NULL, *freeme = NULL;
- guint i;
- gboolean found = FALSE;
-
- g_return_val_if_fail (context != NULL, NULL);
- g_return_val_if_fail (another_context != NULL, NULL);
- g_return_val_if_fail (base_name && base_name[0], NULL);
-
- number = base_name + strlen (base_name);
- while (number > base_name && g_ascii_isdigit (number[-1]))
- --number;
-
- if (*number)
- {
- freeme = g_strndup (base_name, number - base_name);
- base_name = freeme;
- }
-
- id_allocator = g_hash_table_lookup (context->name_allocators, base_name);
-
- if (id_allocator == NULL)
- {
- id_allocator = glade_id_allocator_new ();
- g_hash_table_insert (context->name_allocators,
- g_strdup (base_name), id_allocator);
- }
-
- while (!found)
- {
- g_free (name);
- i = glade_id_allocator_allocate (id_allocator);
- name = g_strdup_printf ("%s%u", base_name, i);
-
- if (!(glade_name_context_has_name (context, name) ||
- glade_name_context_has_name (another_context, name)))
- found = TRUE;
- else
- free_ids = g_list_prepend (free_ids, GUINT_TO_POINTER (i));
- }
-
- /* Release all the ids that were not hits */
- for (l = free_ids; l; l = l->next)
- {
- i = GPOINTER_TO_UINT (l->data);
-
- glade_id_allocator_release (id_allocator, i);
- }
- g_list_free (free_ids);
-
- g_free (freeme);
- return name;
-}
-
guint
glade_name_context_n_names (GladeNameContext *context)
{
diff --git a/gladeui/glade-name-context.h b/gladeui/glade-name-context.h
index 036bd63..2948045 100644
--- a/gladeui/glade-name-context.h
+++ b/gladeui/glade-name-context.h
@@ -13,10 +13,6 @@ void glade_name_context_destroy (GladeNameContext *con
gchar *glade_name_context_new_name (GladeNameContext *context,
const gchar *base_name);
-gchar *glade_name_context_dual_new_name (GladeNameContext *context,
- GladeNameContext *another_context,
- const gchar *base_name);
-
guint glade_name_context_n_names (GladeNameContext *context);
gboolean glade_name_context_has_name (GladeNameContext *context,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]