diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-16 05:08:48 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-16 05:08:48 -0800 |
| commit | dc66bc40724191f0068869773576dc4edf042c6f (patch) | |
| tree | 74b9684feea188736b21f2c829f29befaaf2e9da /src/caja-window-slot.h | |
| parent | 935e1fed604f48e68d125d205c890a59f46f8f21 (diff) | |
| parent | 1466df20591105550738a1d0784a623af9909abf (diff) | |
| download | caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2 caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz | |
Merge pull request #42 from jasmineaura/develop
Bring Caja up to speed, stage1
Diffstat (limited to 'src/caja-window-slot.h')
| -rw-r--r-- | src/caja-window-slot.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/caja-window-slot.h b/src/caja-window-slot.h index f25bdf41..ea858166 100644 --- a/src/caja-window-slot.h +++ b/src/caja-window-slot.h @@ -109,6 +109,8 @@ struct CajaWindowSlot GCancellable *mount_cancellable; GError *mount_error; gboolean tried_mount; + CajaWindowGoToCallback open_callback; + gpointer open_callback_user_data; GCancellable *find_mount_cancellable; @@ -139,7 +141,9 @@ void caja_window_slot_open_location_full (CajaWindowSlot *slot, GFile *location, CajaWindowOpenMode mode, CajaWindowOpenFlags flags, - GList *new_selection); + GList *new_selection, + CajaWindowGoToCallback callback, + gpointer user_data); void caja_window_slot_stop_loading (CajaWindowSlot *slot); void caja_window_slot_set_content_view (CajaWindowSlot *slot, @@ -156,7 +160,12 @@ void caja_window_slot_disconnect_content_view (CajaWindowSlo #define caja_window_slot_go_to(slot,location, new_tab) \ caja_window_slot_open_location_full(slot, location, CAJA_WINDOW_OPEN_ACCORDING_TO_MODE, \ (new_tab ? CAJA_WINDOW_OPEN_FLAG_NEW_TAB : 0), \ - NULL) + NULL, NULL, NULL) + +#define caja_window_slot_go_to_full(slot, location, new_tab, callback, user_data) \ + caja_window_slot_open_location_full(slot, location, CAJA_WINDOW_OPEN_ACCORDING_TO_MODE, \ + (new_tab ? CAJA_WINDOW_OPEN_FLAG_NEW_TAB : 0), \ + NULL, callback, user_data) #define caja_window_slot_go_to_with_selection(slot,location,new_selection) \ caja_window_slot_open_location_with_selection(slot, location, new_selection, FALSE) |