diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2011-12-14 12:30:52 -0600 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2011-12-14 12:31:16 -0600 |
| commit | 6ed0cae9df696b816309b6c6d8fdb2660c66b922 (patch) | |
| tree | 165e639fb80bde8026607433e9cedbf7192c460d /src/nautilus-view.c | |
| parent | 11fa1848dca3af78cd0f984f7c84f2214140f023 (diff) | |
| parent | f01e2e9b5fa6dcd0514bdf5efe5f76b4312f1fd3 (diff) | |
| download | nautilus-6ed0cae9df696b816309b6c6d8fdb2660c66b922.tar.gz | |
Merge branch 'freedesktop-dbus' - bgo#636269
This adds an implementation for the DBus interface org.freedesktop.FileManager1.
This lets applications call the file manager to show a file within a folder,
to show a folder's contents, or to show a file's properties.
The main work behind this is by Akshay Gupta <kitallis@gmail.com>,
done during the Google Summer of Code 2011.
Diffstat (limited to 'src/nautilus-view.c')
| -rw-r--r-- | src/nautilus-view.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nautilus-view.c b/src/nautilus-view.c index 83171c09f..1f75ce694 100644 --- a/src/nautilus-view.c +++ b/src/nautilus-view.c @@ -2056,12 +2056,12 @@ action_properties_callback (GtkAction *action, if (view->details->directory_as_file != NULL) { files = g_list_append (NULL, nautilus_file_ref (view->details->directory_as_file)); - nautilus_properties_window_present (files, GTK_WIDGET (view)); + nautilus_properties_window_present (files, GTK_WIDGET (view), NULL); nautilus_file_list_free (files); } } else { - nautilus_properties_window_present (selection, GTK_WIDGET (view)); + nautilus_properties_window_present (selection, GTK_WIDGET (view), NULL); } nautilus_file_list_free (selection); } @@ -2080,7 +2080,7 @@ action_location_properties_callback (GtkAction *action, files = g_list_append (NULL, nautilus_file_ref (view->details->location_popup_directory_as_file)); - nautilus_properties_window_present (files, GTK_WIDGET (view)); + nautilus_properties_window_present (files, GTK_WIDGET (view), NULL); nautilus_file_list_free (files); } |