diff options
| author | Kristian Rietveld <kris@imendio.com> | 2006-09-04 20:49:21 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2006-09-04 20:49:21 +0000 |
| commit | 90fae608af46332f2c3caa032522e85a713aeb68 (patch) | |
| tree | 3c189ed8974d7d8552bca2d5dc9434e287fa4865 /gtk/gtkfilechooserbutton.c | |
| parent | 84a0d8c8559f186850ee892b2ae6738911256cbe (diff) | |
| download | gdk-pixbuf-90fae608af46332f2c3caa032522e85a713aeb68.tar.gz | |
Merged from HEAD:
2006-09-04 Kristian Rietveld <kris@imendio.com>
Merged from HEAD:
First part of file chooser fixes.
* gtk/gtkfilechooserbutton.c (model_add_special): also set the
handle in the model for the desktopdir case.
* gtk/gtkfilechooserdefault.c (shortcuts_add_current_folder): free
volume in case we retrieved it but don't pass it on to insert_path,
(shortcuts_model_create): change the column type for the handles
to pointer instead of GObject so our handle ref counting is not
disturbed,
(show_and_select_paths_finished_loading): don't forget to unref
the dialog.
* gtk/gtkfilesystemunix.c (gtk_file_system_unix_class_init),
(gtk_file_system_unix_init), (gtk_file_system_unix_dispose):
remove pending execute_callbacks_idle during dispose, also
execute all callbacks waiting to be run in the next idle,
(queue_*callback), (execute_callbacks_idle): refactor to maintain
a list of callbacks to call per file system instead of globally,
guard the file system during callback invocation,
(gtk_file_system_unix_get_folder): only add load folder idle if
none has been added yet.
Diffstat (limited to 'gtk/gtkfilechooserbutton.c')
| -rw-r--r-- | gtk/gtkfilechooserbutton.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 0aaea8ebc..c9d8809e1 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -1701,6 +1701,7 @@ model_add_special (GtkFileChooserButton *button) DISPLAY_NAME_COLUMN, _(DESKTOP_DISPLAY_NAME), DATA_COLUMN, path, IS_FOLDER_COLUMN, TRUE, + HANDLE_COLUMN, handle, -1); button->priv->n_special++; |