[libgda] Misc. GdaBrowser corrections



commit a49d7fe897b689af9b9dc302be6cbf027f42f772
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon Aug 2 18:40:36 2010 +0200

    Misc. GdaBrowser corrections

 tools/browser/data-manager/xml-spec-editor.c     |   15 +++++++++++++++
 tools/browser/schema-browser/relations-diagram.c |    4 ++--
 tools/browser/support.c                          |   13 ++++++++-----
 3 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/tools/browser/data-manager/xml-spec-editor.c b/tools/browser/data-manager/xml-spec-editor.c
index c90c0e9..15c5eef 100644
--- a/tools/browser/data-manager/xml-spec-editor.c
+++ b/tools/browser/data-manager/xml-spec-editor.c
@@ -136,7 +136,14 @@ signal_editor_changed (XmlSpecEditor *sped)
 	gtk_text_buffer_get_start_iter (sped->priv->buffer, &start);
 	gtk_text_buffer_get_end_iter (sped->priv->buffer, &end);
 	xml = gtk_text_buffer_get_text (sped->priv->buffer, &start, &end, FALSE);
+
 	if (xml) {
+		g_strstrip (xml);
+		if (! *xml) {
+			g_free (xml);
+			goto out;
+		}
+
 		doc = xmlParseDoc (BAD_CAST xml);
 		g_free (xml);
 	}
@@ -156,6 +163,12 @@ signal_editor_changed (XmlSpecEditor *sped)
 		goto out;
 	}
 
+	if (strcmp ((gchar*) node->name, "data")) {
+		g_set_error (&lerror, 0, 0,
+			     _("Expecting <%s> root node"), "data");
+		goto out;
+	}
+
 	BrowserConnection *bcnc;
 	GdaSet *params;
 	
@@ -194,12 +207,14 @@ signal_editor_changed (XmlSpecEditor *sped)
 			sped->priv->info = gtk_label_new ("");
 			sped->priv->info_label = sped->priv->info;
 #endif
+			gtk_widget_show (sped->priv->info_label);
 		}
 		gchar *str;
 		str = g_strdup_printf (_("Error: %s"), lerror->message);
 		g_clear_error (&lerror);
 		gtk_label_set_text (GTK_LABEL (sped->priv->info_label), str);
 		g_free (str);
+		gtk_widget_show (sped->priv->info);
 	}
 	else if (sped->priv->info) {
 		gtk_widget_hide (sped->priv->info);
diff --git a/tools/browser/schema-browser/relations-diagram.c b/tools/browser/schema-browser/relations-diagram.c
index b12f395..842b0d6 100644
--- a/tools/browser/schema-browser/relations-diagram.c
+++ b/tools/browser/schema-browser/relations-diagram.c
@@ -324,7 +324,7 @@ relations_diagram_new (BrowserConnection *bcnc)
 
         GtkWidget *label;
 	gchar *str;
-	str = g_strdup_printf ("<b>%s</b>\n%s", _("Relations diagram"), _("Unsaved diagram"));
+	str = g_strdup_printf ("<b>%s</b>\n%s", _("Relations diagram"), _("Unsaved"));
 	label = cc_gray_bar_new (str);
 	g_free (str);
         gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
@@ -472,7 +472,7 @@ relations_diagram_set_fav_id (RelationsDiagram *diagram, gint fav_id, GError **e
 	}
 	else {
 		gchar *str;
-		str = g_strdup_printf ("<b>%s</b>\n%s", _("Relations diagram"), _("Unsaved diagram"));
+		str = g_strdup_printf ("<b>%s</b>\n%s", _("Relations diagram"), _("Unsaved"));
 		cc_gray_bar_set_text (diagram->priv->header, str);
 		g_free (str);
 		diagram->priv->fav_id = -1;
diff --git a/tools/browser/support.c b/tools/browser/support.c
index 540f25b..5d8c60e 100644
--- a/tools/browser/support.c
+++ b/tools/browser/support.c
@@ -123,6 +123,7 @@ browser_show_error (GtkWindow *parent, const gchar *format, ...)
         va_list args;
         gchar sz[2048];
         GtkWidget *dialog;
+	gchar *tmp;
 
         /* build the message string */
         va_start (args, format);
@@ -130,11 +131,13 @@ browser_show_error (GtkWindow *parent, const gchar *format, ...)
         va_end (args);
 
         /* create the error message dialog */
-	dialog = gtk_message_dialog_new_with_markup (parent,
-                                                     GTK_DIALOG_DESTROY_WITH_PARENT |
-                                                     GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
-                                                     GTK_BUTTONS_CLOSE,
-						     "<span weight=\"bold\">%s</span>\n%s", _("Error:"), sz);
+	dialog = gtk_message_dialog_new (parent,
+					 GTK_DIALOG_DESTROY_WITH_PARENT |
+					 GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
+					 GTK_BUTTONS_CLOSE, NULL);
+	tmp = g_strdup_printf ("<span weight=\"bold\">%s</span>\n%s", _("Error:"), sz);
+	gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), tmp);
+	g_free (tmp);
 
         gtk_widget_show_all (dialog);
         gtk_dialog_run (GTK_DIALOG (dialog));



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