anjuta r4323 - in trunk: . plugins/build-basic-autotools

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Mon Oct  6 20:10:19 2008
New Revision: 4323
URL: http://svn.gnome.org/viewvc/anjuta?rev=4323&view=rev

Log:
	* plugins/build-basic-autotools/build-options.c:
	Fix #554337 Set uri instead of current_folder_uri
	Fix a warning when there is no arguments


Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/build-options.c

Modified: trunk/plugins/build-basic-autotools/build-options.c
==============================================================================
--- trunk/plugins/build-basic-autotools/build-options.c	(original)
+++ trunk/plugins/build-basic-autotools/build-options.c	Mon Oct  6 20:10:19 2008
@@ -163,7 +163,7 @@
 /* If the folder is missing created it before setting it */
 
 static gboolean
-build_gtk_file_chooser_create_and_set_current_folder_uri (GtkFileChooser *chooser, const gchar *uri)
+build_gtk_file_chooser_create_and_set_uri (GtkFileChooser *chooser, const gchar *uri)
 {
 	GFile *dir;
 	GError *error = NULL;
@@ -197,8 +197,9 @@
 		g_error_free (error);
 	}
 	g_object_unref (dir);
-	
-	return gtk_file_chooser_set_current_folder_uri (chooser, uri);
+
+	gtk_file_chooser_set_current_folder_uri (chooser, uri);
+	return gtk_file_chooser_set_uri (chooser, uri);
 }
 
 /* Do not delete the automatically created folder */
@@ -265,10 +266,13 @@
 		
 		if (cfg != NULL)
 		{
-			gtk_entry_set_text (GTK_ENTRY (dlg->args), build_configuration_get_args (cfg));
+			const gchar *args;
+
+			args = build_configuration_get_args (cfg); 
+			gtk_entry_set_text (GTK_ENTRY (dlg->args), args == NULL ? "" : args);
 		
 			uri = build_configuration_list_get_build_uri (dlg->config_list, cfg);
-			build_gtk_file_chooser_create_and_set_current_folder_uri (GTK_FILE_CHOOSER (dlg->build_dir_chooser), uri);
+			build_gtk_file_chooser_create_and_set_uri (GTK_FILE_CHOOSER (dlg->build_dir_chooser), uri);
 			g_free (uri);
 		}
 	}