diff options
| author | Kristian Rietveld <kris@imendio.com> | 2006-05-01 21:41:12 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2006-05-01 21:41:12 +0000 |
| commit | 2c97a8f6e8f260695515dabcb5185d0603dcd4f3 (patch) | |
| tree | 68a070f95b168f8415fc6a438aa5436a9096716d /gtk/gtkfilechooserprivate.h | |
| parent | 46789c877d6b4f73ca267bc78f31337be30ad889 (diff) | |
| download | gtk+-2c97a8f6e8f260695515dabcb5185d0603dcd4f3.tar.gz | |
Merge of the GTK+ asynchronous file chooser branch. Please see theAFTER_KRIS_ASYNC_BRANCH_MERGE
2006-05-01 Kristian Rietveld <kris@imendio.com>
Merge of the GTK+ asynchronous file chooser branch. Please see
the kris-asynch-branch for more detailed ChangeLog entries.
* configure.in: increase binary version to 2.9.0.
* gtk.symbols:
* gtkfilechooser.c:
* gtkfilechooserbutton.c:
* gtkfilechooserdefault.c:
* gtkfilechooserdialog.c:
* gtkfilechooserembed.c:
* gtkfilechooserembed.h:
* gtkfilechooserentry.c:
* gtkfilechooserentry.h:
* gtkfilechooserprivate.h:
* gtkfilesystem.c:
* gtkfilesystem.h:
* gtkfilesystemmodel.c:
* gtkfilesystemmodel.h:
* gtkfilesystemunix.c:
* gtkpathbar.c:
* gtkpathbar.h:
Merge from kris-async-branch.
Diffstat (limited to 'gtk/gtkfilechooserprivate.h')
| -rw-r--r-- | gtk/gtkfilechooserprivate.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h index e9d45aae84..34ad17b40b 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -113,6 +113,7 @@ struct _GtkFileChooserDialogPrivate gint default_height; gboolean resize_horizontally; gboolean resize_vertically; + gboolean response_requested; }; @@ -187,6 +188,17 @@ struct _GtkFileChooserDefault GtkTreeModelSort *sort_model; + /* Handles */ + GSList *loading_shortcuts; + GSList *reload_icon_handles; + GtkFileSystemHandle *file_list_drag_data_received_handle; + GtkFileSystemHandle *update_current_folder_handle; + GtkFileSystemHandle *show_and_select_paths_handle; + GtkFileSystemHandle *should_respond_get_info_handle; + GtkFileSystemHandle *update_from_entry_handle; + GtkFileSystemHandle *shortcuts_activate_iter_handle; + GSList *pending_handles; + LoadState load_state; ReloadState reload_state; guint load_timeout_id; @@ -267,9 +279,10 @@ struct _GtkFileSystemModel GSList *idle_clears; GSource *idle_clear_source; - GSource *idle_finished_loading_source; gushort max_depth; + + GSList *pending_handles; guint show_hidden : 1; guint show_folders : 1; @@ -300,6 +313,7 @@ struct _FileModelNode guint is_visible : 1; guint loaded : 1; guint idle_clear : 1; + guint load_pending : 1; }; |