[glade] GladeEditor: use new api to check if a widget has a name



commit f4454400f4161f98ec7dc3659e88453cc09a1b5b
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Thu Jan 28 10:07:03 2016 -0300

    GladeEditor: use new api to check if a widget has a name

 gladeui/glade-editor.c |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/gladeui/glade-editor.c b/gladeui/glade-editor.c
index 245ca2b..07577af 100644
--- a/gladeui/glade-editor.c
+++ b/gladeui/glade-editor.c
@@ -296,25 +296,14 @@ glade_editor_update_class_field (GladeEditor *editor)
   if (priv->loaded_widget)
     {
       GladeWidget *widget = priv->loaded_widget;
-      gchar *text, *name;
+      gchar *text;
 
       gtk_image_set_from_icon_name (GTK_IMAGE (priv->class_icon),
                                     glade_widget_adaptor_get_icon_name (priv->loaded_adaptor),
                                     GTK_ICON_SIZE_BUTTON);
       gtk_widget_show (priv->class_icon);
 
-      name = glade_widget_get_name (widget);
-
-      if (g_str_has_prefix (name, GLADE_UNNAMED_PREFIX))
-        {
-          /* translators: %s(Class Title) Properties - %s (ClassName)
-           * example: Window Properties - GtkWindow
-           */
-          text = g_strdup_printf (_("%s Properties - %s"),
-                                  glade_widget_adaptor_get_title (priv->loaded_adaptor),
-                                  glade_widget_adaptor_get_name (priv->loaded_adaptor));
-       }
-      else
+      if (glade_widget_has_name (widget))
         {
           /* translators: %s(Class Title) Properties - %s (ClassName) [%s(WidgetName)]
            * example: Window Properties - GtkWindow [window1]
@@ -322,9 +311,17 @@ glade_editor_update_class_field (GladeEditor *editor)
           text = g_strdup_printf (_("%s Properties - %s [%s]"),
                                   glade_widget_adaptor_get_title (priv->loaded_adaptor),
                                   glade_widget_adaptor_get_name (priv->loaded_adaptor), 
-                                 name);
+                                 glade_widget_get_display_name (widget));
         }
-
+      else
+        {
+          /* translators: %s(Class Title) Properties - %s (ClassName)
+           * example: Window Properties - GtkWindow
+           */
+          text = g_strdup_printf (_("%s Properties - %s"),
+                                  glade_widget_adaptor_get_title (priv->loaded_adaptor),
+                                  glade_widget_adaptor_get_name (priv->loaded_adaptor));
+       }
                 
       gtk_label_set_text (GTK_LABEL (priv->class_label), text);
       g_free (text);


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