* gladeui/glade-base-editor.c, gladeui/glade-command.c: Avoid setting a null name on a widget.

Conflicts:

	ChangeLog
	gladeui/glade-base-editor.c
	gladeui/glade-command.c

ChangeLog

@@ -26,6 +26,8 @@
 
 	* plugins/gtk+/gtk+.xml.in: Updated catalog for 2.22 and 2.24 symbols.
 
+	* gladeui/glade-base-editor.c, gladeui/glade-command.c: Avoid setting a null name on a widget.
+
 2010-12-29  Javier Jardón <jjardon@gnome.org>
 
 	* configure.ac: Use upstream gettext

gladeui/glade-base-editor.c

@@ -354,7 +354,7 @@ glade_base_editor_name_activate (GtkEntry * entry, GladeWidget * gchild)
   const gchar *text = gtk_entry_get_text (GTK_ENTRY (entry));
   GladeBaseEditor *editor = g_object_get_data (G_OBJECT (entry), "editor");
 
-  if (strcmp (glade_widget_get_name (gchild), text))
+  if (text && text[0] && strcmp (glade_widget_get_name (gchild), text))
     {
       g_signal_handlers_block_by_func (gchild->project,
                                        glade_base_editor_project_widget_name_changed,

gladeui/glade-command.c

@@ -854,7 +854,7 @@ glade_command_set_name (GladeWidget * widget, const gchar * name)
   GladeCommand *cmd;
 
   g_return_if_fail (GLADE_IS_WIDGET (widget));
-  g_return_if_fail (name != NULL);
+  g_return_if_fail (name && name[0]);
 
   /* Dont spam the queue with false name changes.
    */