[nautilus] Avoid refing NULL icons
- From: Alexander Larsson <alexl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [nautilus] Avoid refing NULL icons
- Date: Mon, 14 Sep 2009 11:38:06 +0000 (UTC)
commit d6b8cb28c7208e0776bb483cde464472249c73ba
Author: Alexander Larsson <alexl redhat com>
Date: Mon Sep 14 13:35:57 2009 +0200
Avoid refing NULL icons
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 ed5cc7c..0c72ef2 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]