diff options
| author | Alexander Larsson <alexl@redhat.com> | 2009-09-14 13:35:57 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2009-09-14 13:37:31 +0200 |
| commit | d6b8cb28c7208e0776bb483cde464472249c73ba (patch) | |
| tree | 92764e011f64e5bd066656e5917a5663ece7a78f | |
| parent | eb05225a794de9c7b9326d1e1c56f54902bb6bb5 (diff) | |
| download | nautilus-d6b8cb28c7208e0776bb483cde464472249c73ba.tar.gz | |
Avoid refing NULL icons
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index ed5cc7cbb..0c72ef2c2 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -4298,11 +4298,13 @@ add_application_to_open_with_menu (FMDirectoryView *view, label, tip, NULL); - - app_icon = g_object_ref (g_app_info_get_icon (application)); - if (app_icon == NULL) + app_icon = g_app_info_get_icon (application); + if (app_icon != NULL) { + g_object_ref (app_icon); + } else { app_icon = g_themed_icon_new ("application-x-executable"); + } gtk_action_set_gicon (action, app_icon); g_object_unref (app_icon); @@ -8439,7 +8441,10 @@ real_update_menus (FMDirectoryView *view) label_with_underscore = g_strdup_printf (_("_Open with %s"), escaped_app); - app_icon = g_object_ref (g_app_info_get_icon (app)); + app_icon = g_app_info_get_icon (app); + if (app_icon != NULL) { + g_object_ref (app_icon); + } g_free (escaped_app); g_object_unref (app); |