[glade] GladeEditorTable: Use glade_widget_has_name() in some places



commit 5281edc1e49a572ca474bd64e52f1ca430c79800
Author: Tristan Van Berkom <tristan upstairslabs com>
Date:   Thu Jan 28 12:45:02 2016 +0100

    GladeEditorTable: Use glade_widget_has_name() in some places
    
    Instead of strncmp()

 gladeui/glade-editor-table.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/gladeui/glade-editor-table.c b/gladeui/glade-editor-table.c
index ba1e10b..b9f56b0 100644
--- a/gladeui/glade-editor-table.c
+++ b/gladeui/glade-editor-table.c
@@ -280,15 +280,12 @@ widget_name_changed (GladeWidget      *widget,
 
   if (table->priv->name_entry)
     {
-      const gchar *widget_name;
-
       BLOCK_NAME_ENTRY_CB (table);
 
-      widget_name = glade_widget_get_name (table->priv->loaded_widget);
-      if (!widget_name || strncmp (widget_name, GLADE_UNNAMED_PREFIX, strlen (GLADE_UNNAMED_PREFIX)) == 0)
-       gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), "");
+      if (glade_widget_has_name (table->priv->loaded_widget))
+       gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), glade_widget_get_name 
(table->priv->loaded_widget));
       else
-       gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), widget_name);
+       gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), "");
 
       UNBLOCK_NAME_ENTRY_CB (table);
     }
@@ -392,11 +389,10 @@ glade_editor_table_load (GladeEditable *editable, GladeWidget *widget)
 
       if (table->priv->name_entry)
        {
-         const gchar *widget_name = glade_widget_get_name (widget);
-         if (!widget_name || strncmp (widget_name, GLADE_UNNAMED_PREFIX, strlen (GLADE_UNNAMED_PREFIX)) == 0)
-           gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), "");
+         if (glade_widget_has_name (widget))
+           gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), glade_widget_get_name (widget));
          else
-           gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), widget_name);
+           gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), "");
        }
 
       if (table->priv->name_label)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]