anjuta r4434 - in trunk: . libanjuta plugins/project-wizard src

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Tue Dec  9 20:55:39 2008
New Revision: 4434
URL: http://svn.gnome.org/viewvc/anjuta?rev=4434&view=rev

Log:
	* src/anjuta.glade,
	plugins/project-wizard/druid.c,
	plugins/project-wizard/property.c,
	libanjuta/anjuta-preferences.c:
	Fix #563753 default project directory is "/" until I set it explicitly


Modified:
   trunk/ChangeLog
   trunk/libanjuta/anjuta-preferences.c
   trunk/plugins/project-wizard/druid.c
   trunk/plugins/project-wizard/property.c
   trunk/src/anjuta.glade

Modified: trunk/libanjuta/anjuta-preferences.c
==============================================================================
--- trunk/libanjuta/anjuta-preferences.c	(original)
+++ trunk/libanjuta/anjuta-preferences.c	Tue Dec  9 20:55:39 2008
@@ -786,7 +786,9 @@
 			old_folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (prop->object));
 			if ((old_folder == NULL) || strcmp (old_folder, value))
 			{
-				gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (prop->object), value);
+				gchar *expand_value = anjuta_util_shell_expand (value);
+				gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (prop->object), expand_value);
+				g_free (expand_value);
 			}
 			g_free (old_folder);
 		}
@@ -794,8 +796,10 @@
 	case ANJUTA_PROPERTY_OBJECT_TYPE_FILE:
 		if (value)
 		{
+			gchar *expand_value = anjuta_util_shell_expand (value);
 			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (prop->object),
-															 value);
+															 expand_value);
+			g_free (expand_value);
 		}
 		break;
 	}

Modified: trunk/plugins/project-wizard/druid.c
==============================================================================
--- trunk/plugins/project-wizard/druid.c	(original)
+++ trunk/plugins/project-wizard/druid.c	Tue Dec  9 20:55:39 2008
@@ -890,7 +890,7 @@
 	/* Add default base project directory */
 	value = npw_value_heap_find_value (this->values, ANJUTA_PROJECT_DIRECTORY_PROPERTY);
 	s = anjuta_preferences_get (pref, "anjuta.project.directory");
-	npw_value_heap_set_value (this->values, value, s, NPW_VALID_VALUE);
+	npw_value_heap_set_value (this->values, value, s == NULL ? "~" : s, NPW_VALID_VALUE);
 	g_free (s);
 	
 	/* Add user name */

Modified: trunk/plugins/project-wizard/property.c
==============================================================================
--- trunk/plugins/project-wizard/property.c	(original)
+++ trunk/plugins/project-wizard/property.c	Tue Dec  9 20:55:39 2008
@@ -441,8 +441,9 @@
 	/* Check if the default property is valid */
 	if (value && (this->options & NPW_EXIST_SET_OPTION) && !(this->options & NPW_EXIST_OPTION))
 	{
+		gchar *expand_value = anjuta_util_shell_expand (value);
 		/* a file or directory with the same name shouldn't exist */
-		if (g_file_test (value, G_FILE_TEST_EXISTS))
+		if (g_file_test (expand_value, G_FILE_TEST_EXISTS))
 		{
 			char* buffer;
 			guint i;
@@ -457,9 +458,11 @@
 			}
 			this->defvalue = g_string_chunk_insert (this->owner->string_pool, buffer);
 			g_free (buffer);
+			g_free (expand_value);
 
 			return;
 		}
+		g_free (expand_value);
 	}
 	/* This function could be used with value = defvalue to only check
 	 * the default property */

Modified: trunk/src/anjuta.glade
==============================================================================
--- trunk/src/anjuta.glade	(original)
+++ trunk/src/anjuta.glade	Tue Dec  9 20:55:39 2008
@@ -94,7 +94,7 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkFileChooserButton" id="preferences_folder:text::0:anjuta.project.directory">
+                          <widget class="GtkFileChooserButton" id="preferences_folder:text:~:0:anjuta.project.directory">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>