diff options
| author | Dave Camp <dave@novell.com> | 2004-11-19 18:37:16 +0000 |
|---|---|---|
| committer | Dave Camp <campd@src.gnome.org> | 2004-11-19 18:37:16 +0000 |
| commit | c476807d42acf3bda613c1e45ed0cbf8fd60aec8 (patch) | |
| tree | f10fba72f7f93177aaeeb809f92d36498c6d5789 | |
| parent | d177b53cf05489dae82c5cb3dd7f375328520b7c (diff) | |
| download | nautilus-c476807d42acf3bda613c1e45ed0cbf8fd60aec8.tar.gz | |
Fix some jumping menus. Don't link to libnautilus
2004-11-19 Dave Camp <dave@novell.com>
* src/file-manager/fm-directory-view.c: (reset_open_with_menu),
(can_show_default_app), (real_update_menus): Fix some jumping
menus.
* test/Makefile.am: Don't link to libnautilus
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 17 | ||||
| -rw-r--r-- | test/Makefile.am | 1 |
3 files changed, 21 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2004-11-19 Dave Camp <dave@novell.com> + + * src/file-manager/fm-directory-view.c: (reset_open_with_menu), + (can_show_default_app), (real_update_menus): Fix some jumping + menus. + * test/Makefile.am: Don't link to libnautilus + 2004-11-19 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-mime-actions.c: diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 0d1f2d9f2..f7e0eba5f 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -324,10 +324,14 @@ static void monitor_file_for_open_with (FMDirectoryView static void create_scripts_directory (void); static void activate_activation_uri_ready_callback (NautilusFile *file, gpointer callback_data); +static gboolean can_show_default_app (FMDirectoryView *view, + NautilusFile *file); + static gboolean activate_check_mime_types (FMDirectoryView *view, NautilusFile *file, gboolean warn_on_mismatch); + static void action_open_scripts_folder_callback (GtkAction *action, gpointer callback_data); static void action_cut_files_callback (GtkAction *action, @@ -3880,12 +3884,12 @@ reset_open_with_menu (FMDirectoryView *view, GList *selection) a mime mismatch, otherwise we can't use it in the open with menu */ if (action == ACTIVATION_ACTION_OPEN_IN_APPLICATION && - activate_check_mime_types (view, file, FALSE)) { + can_show_default_app (view, file)) { default_app = nautilus_mime_get_default_application_for_file (file); } else { default_app = NULL; } - + applications = NULL; if (other_applications_visible) { applications = nautilus_mime_get_open_with_applications_for_file (NAUTILUS_FILE (selection->data)); @@ -4189,6 +4193,13 @@ warn_mismatched_mime_types (FMDirectoryView *view, gtk_widget_show (dialog); } +static gboolean +can_show_default_app (FMDirectoryView *view, NautilusFile *file) +{ + return (!nautilus_file_check_if_ready (file, NAUTILUS_FILE_ATTRIBUTE_SLOW_MIME_TYPE) || activate_check_mime_types (view, file, FALSE)); + +} + static gboolean activate_check_mime_types (FMDirectoryView *view, NautilusFile *file, @@ -6155,7 +6166,7 @@ real_update_menus (FMDirectoryView *view) a mime mismatch, otherwise we can't use it in the open with menu */ if (activation_action == ACTIVATION_ACTION_OPEN_IN_APPLICATION && - activate_check_mime_types (view, file, FALSE)) { + can_show_default_app (view, file)) { GnomeVFSMimeApplication *app; app = nautilus_mime_get_default_application_for_file (file); diff --git a/test/Makefile.am b/test/Makefile.am index 6975b921a..629086a15 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -9,7 +9,6 @@ INCLUDES =\ $(NULL) LDADD =\ - $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-private/libnautilus-private.la \ $(CORE_LIBS) \ $(NULL) |