[anjuta] file-wizard, project-wizard, run-program: bgo #646192 - Display only a warning when a .ui file is mi

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 70c7bf767ee84e75be93a62923e9a587b6c06f93
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Sat Jul 2 21:37:37 2011 +0200

    file-wizard, project-wizard, run-program: bgo #646192 - Display only a warning when a .ui file is missing

 plugins/file-wizard/file.c       |    9 ++++++---
 plugins/project-wizard/druid.c   |   11 ++++++-----
 plugins/run-program/parameters.c |    5 ++---
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/plugins/file-wizard/file.c b/plugins/file-wizard/file.c
index 8d0d8ef..f184a2f 100644
--- a/plugins/file-wizard/file.c
+++ b/plugins/file-wizard/file.c
@@ -43,7 +43,7 @@
 #include "plugin.h"
 #include "file.h"
 
-#define BUILDER_FILE_FILE PACKAGE_DATA_DIR"/glade/anjuta-file-wizard.ui"
+#define BUILDER_FILE_FILE PACKAGE_DATA_DIR "/glade/anjuta-file-wizard.ui"
 #define NEW_FILE_DIALOG "dialog.new.file"
 #define NEW_FILE_ENTRY "new.file.entry"
 #define NEW_FILE_TYPE "new.file.type"
@@ -174,13 +174,16 @@ create_new_file_dialog(IAnjutaDocumentManager *docman)
 {
 	GtkComboBox *optionmenu;
 	GtkListStore *store;
+	GError* error = NULL;
 	gint i;
 
+
 	nfg = g_new0(NewFileGUI, 1);
 	nfg->bxml =  gtk_builder_new ();
-	if (!gtk_builder_add_from_file (nfg->bxml, BUILDER_FILE_FILE, NULL))
+	if (!gtk_builder_add_from_file (nfg->bxml, BUILDER_FILE_FILE, &error))
 	{
-		anjuta_util_dialog_error(NULL, _("Unable to build user interface for New File"));
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
 		g_free(nfg);
 		nfg = NULL;
 		return FALSE;
diff --git a/plugins/project-wizard/druid.c b/plugins/project-wizard/druid.c
index 93a6c2e..cca2d34 100644
--- a/plugins/project-wizard/druid.c
+++ b/plugins/project-wizard/druid.c
@@ -48,7 +48,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-#define PROJECT_WIZARD_DIRECTORY PACKAGE_DATA_DIR"/project"
+#define PROJECT_WIZARD_DIRECTORY PACKAGE_DATA_DIR "/project"
 
 /* Default property name useable in wizard file
  *---------------------------------------------------------------------------*/
@@ -60,7 +60,7 @@
 /* Widget and signal name found in glade file
  *---------------------------------------------------------------------------*/
 
-#define GTK_BUILDER_UI_FILE PACKAGE_DATA_DIR"/glade/anjuta-project-wizard.ui"
+#define GTK_BUILDER_UI_FILE PACKAGE_DATA_DIR "/glade/anjuta-project-wizard.ui"
 
 #define NEW_PROJECT_DIALOG "druid_window"
 #define PROJECT_LIST "project_list"
@@ -1053,6 +1053,7 @@ npw_druid_create_assistant (NPWDruid* druid, const gchar *directory)
 {
 	AnjutaShell *shell;
 	GtkBuilder *builder;
+	GError* error = NULL;		
 	GtkAssistant *assistant;
 	GtkWidget *page;
 	
@@ -1062,10 +1063,10 @@ npw_druid_create_assistant (NPWDruid* druid, const gchar *directory)
 
 	/* Create GtkAssistant using GtkBuilder, glade doesn't seem to work*/
 	builder = gtk_builder_new ();
-	if (!gtk_builder_add_from_file (builder, GTK_BUILDER_UI_FILE, NULL))
+	if (!gtk_builder_add_from_file (builder, GTK_BUILDER_UI_FILE, &error))
 	{
-		anjuta_util_dialog_error (GTK_WINDOW (shell),
-								  _("Unable to build project assistant user interface reading %s."), GTK_BUILDER_UI_FILE);
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
 		return NULL;
 	}
 	assistant = GTK_ASSISTANT (gtk_builder_get_object (builder, NEW_PROJECT_DIALOG));
diff --git a/plugins/run-program/parameters.c b/plugins/run-program/parameters.c
index 39648df..f396955 100644
--- a/plugins/run-program/parameters.c
+++ b/plugins/run-program/parameters.c
@@ -33,8 +33,8 @@
 
 /*---------------------------------------------------------------------------*/
 
-#define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-run-program.xml"
-#define BUILDER_FILE PACKAGE_DATA_DIR"/glade/anjuta-run-program.ui"
+#define UI_FILE PACKAGE_DATA_DIR "/ui/anjuta-run-program.xml"
+#define BUILDER_FILE PACKAGE_DATA_DIR "/glade/anjuta-run-program.ui"
 
 #define PARAMETERS_DIALOG "parameters_dialog"
 #define TERMINAL_CHECK_BUTTON "parameter_run_in_term_check"
@@ -618,7 +618,6 @@ run_dialog_init (RunDialog *dlg, RunProgramPlugin *plugin)
 	if (!gtk_builder_add_from_file (bxml, BUILDER_FILE, &error))
 	{
 		g_warning ("Couldn't load builder file: %s", error->message);
-		anjuta_util_dialog_error(parent, _("Missing file %s"), BUILDER_FILE);
 		g_error_free (error);
 		return NULL;
 	}