Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged from HEAD:

Browse Source 
2005-11-28  Federico Mena Quintero  <federico@ximian.com>

	Merged from HEAD:

	Fixes the critical warnings from bug #317999, thus fixing the bug
	completely:

	* gtk/gtkfilechooserdefault.c
	(gtk_file_chooser_default_get_paths): In SELECT_FOLDER mode,
	use _gtk_file_chooser_get_current_folder_path() instead of fetching the
	impl->current_folder directly.  The latter may be null if we are
	in RELOAD_NONE state.
This commit is contained in:
Federico Mena Quintero
2005-11-29 01:16:37 +00:00
committed by Federico Mena Quintero
parent 0d4a99ded5
commit 13ed5fef8d
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,3 +1,16 @@
2005-11-28 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:
Fixes the critical warnings from bug #317999, thus fixing the bug
completely:
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_paths): In SELECT_FOLDER mode,
use _gtk_file_chooser_get_current_folder_path() instead of fetching the
impl->current_folder directly. The latter may be null if we are
in RELOAD_NONE state.
2005-11-28 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:

13
ChangeLog.pre-2-10
View File

@@ -1,3 +1,16 @@
2005-11-28 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:
Fixes the critical warnings from bug #317999, thus fixing the bug
completely:
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_paths): In SELECT_FOLDER mode,
use _gtk_file_chooser_get_current_folder_path() instead of fetching the
impl->current_folder directly. The latter may be null if we are
in RELOAD_NONE state.
2005-11-28 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:

2
gtk/gtkfilechooserdefault.c
View File

@@ -5759,7 +5759,7 @@ gtk_file_chooser_default_get_paths (GtkFileChooser *chooser)
if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER &&
info.result == NULL)
{
info.result = g_slist_prepend (info.result, gtk_file_path_copy (impl->current_folder));
info.result = g_slist_prepend (info.result, _gtk_file_chooser_get_current_folder_path (chooser));
}
return g_slist_reverse (info.result);