|
 |
100cd3b |
--- gedit-2.15.1/gedit/gedit-commands-file.c.bgo-341055-workaround 2006-05-13 13:46:43.000000000 -0400
|
|
|
100cd3b |
+++ gedit-2.15.1/gedit/gedit-commands-file.c 2006-05-13 13:48:12.000000000 -0400
|
|
|
100cd3b |
@@ -336,12 +336,6 @@
|
|
|
100cd3b |
if (default_path == NULL)
|
|
|
100cd3b |
default_path = g_strdup (_gedit_window_get_default_path (window));
|
|
|
100cd3b |
|
|
|
100cd3b |
- if (default_path != NULL)
|
|
|
100cd3b |
- gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (open_dialog),
|
|
|
100cd3b |
- default_path);
|
|
|
100cd3b |
-
|
|
|
100cd3b |
- g_free (default_path);
|
|
|
100cd3b |
-
|
|
|
100cd3b |
selector_width = gedit_prefs_manager_get_opensave_dialog_width ();
|
|
|
100cd3b |
selector_height = gedit_prefs_manager_get_opensave_dialog_height ();
|
|
|
100cd3b |
gtk_window_resize (GTK_WINDOW (open_dialog), selector_width, selector_height);
|
|
|
100cd3b |
@@ -351,6 +345,11 @@
|
|
|
100cd3b |
window);
|
|
|
100cd3b |
|
|
|
100cd3b |
gtk_widget_show (open_dialog);
|
|
|
100cd3b |
+
|
|
|
100cd3b |
+ if (default_path != NULL)
|
|
|
100cd3b |
+ gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (open_dialog),
|
|
|
100cd3b |
+ default_path);
|
|
|
100cd3b |
+ g_free (default_path);
|
|
|
100cd3b |
}
|
|
|
100cd3b |
|
|
|
100cd3b |
static void
|
|
|
100cd3b |
@@ -767,24 +766,6 @@
|
|
|
100cd3b |
|
|
|
100cd3b |
g_free (uri);
|
|
|
100cd3b |
|
|
|
100cd3b |
- if (!uri_set)
|
|
|
100cd3b |
- {
|
|
|
100cd3b |
- const gchar *default_path;
|
|
|
100cd3b |
- gchar *docname;
|
|
|
100cd3b |
-
|
|
|
100cd3b |
- default_path = _gedit_window_get_default_path (window);
|
|
|
100cd3b |
- docname = gedit_document_get_short_name_for_display (doc);
|
|
|
100cd3b |
-
|
|
|
100cd3b |
- if (default_path != NULL)
|
|
|
100cd3b |
- gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (save_dialog),
|
|
|
100cd3b |
- default_path);
|
|
|
100cd3b |
-
|
|
|
100cd3b |
- gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (save_dialog),
|
|
|
100cd3b |
- docname);
|
|
|
100cd3b |
-
|
|
|
100cd3b |
- g_free (docname);
|
|
|
100cd3b |
- }
|
|
|
100cd3b |
-
|
|
|
100cd3b |
/* Set suggested encoding */
|
|
|
100cd3b |
encoding = gedit_document_get_encoding (doc);
|
|
|
100cd3b |
g_return_if_fail (encoding != NULL);
|
|
|
100cd3b |
@@ -807,6 +788,24 @@
|
|
|
100cd3b |
gtk_window_resize (GTK_WINDOW (save_dialog), selector_width, selector_height);
|
|
|
100cd3b |
|
|
|
100cd3b |
gtk_widget_show (save_dialog);
|
|
|
100cd3b |
+
|
|
|
100cd3b |
+ if (!uri_set)
|
|
|
100cd3b |
+ {
|
|
|
100cd3b |
+ const gchar *default_path;
|
|
|
100cd3b |
+ gchar *docname;
|
|
|
100cd3b |
+
|
|
|
100cd3b |
+ default_path = _gedit_window_get_default_path (window);
|
|
|
100cd3b |
+ docname = gedit_document_get_short_name_for_display (doc);
|
|
|
100cd3b |
+
|
|
|
100cd3b |
+ if (default_path != NULL)
|
|
|
100cd3b |
+ gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (save_dialog),
|
|
|
100cd3b |
+ default_path);
|
|
|
100cd3b |
+
|
|
|
100cd3b |
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (save_dialog),
|
|
|
100cd3b |
+ docname);
|
|
|
100cd3b |
+
|
|
|
100cd3b |
+ g_free (docname);
|
|
|
100cd3b |
+ }
|
|
|
100cd3b |
}
|
|
|
100cd3b |
|
|
|
100cd3b |
static void
|