[gnome-panel/wip/segeiger/panel-add-to-dialog: 11/15] panel-addto-dialog: Don't ref NULL object
- From: Sebastian Geiger <segeiger src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/wip/segeiger/panel-add-to-dialog: 11/15] panel-addto-dialog: Don't ref NULL object
- Date: Fri, 17 Jul 2015 15:40:07 +0000 (UTC)
commit 62478125c293316b178707a53ba1fa5d92d876ed
Author: Sebastian Geiger <sbastig gmx net>
Date: Thu Jul 16 23:29:41 2015 +0200
panel-addto-dialog: Don't ref NULL object
gnome-panel/panel-addto-dialog.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/gnome-panel/panel-addto-dialog.c b/gnome-panel/panel-addto-dialog.c
index 75bd780..2d083f0 100644
--- a/gnome-panel/panel-addto-dialog.c
+++ b/gnome-panel/panel-addto-dialog.c
@@ -499,13 +499,18 @@ panel_addto_prepend_directory (GSList **parent_list,
const char *filename)
{
PanelAddtoAppList *data;
+ GIcon *icon;
data = g_new0 (PanelAddtoAppList, 1);
+ icon = gmenu_tree_directory_get_icon (directory);
+ if (icon)
+ g_object_ref (icon);
+
data->item_info.type = PANEL_ADDTO_MENU;
data->item_info.name = g_strdup (gmenu_tree_directory_get_name (directory));
data->item_info.description = g_strdup (gmenu_tree_directory_get_comment (directory));
- data->item_info.icon = g_object_ref (gmenu_tree_directory_get_icon (directory));
+ data->item_info.icon = icon;
data->item_info.menu_filename = g_strdup (filename);
data->item_info.menu_path = gmenu_tree_directory_make_path (directory, NULL);
data->item_info.static_strings = FALSE;
@@ -532,15 +537,20 @@ panel_addto_prepend_entry (GSList **parent_list,
{
PanelAddtoAppList *data;
GAppInfo *app_info;
+ GIcon *icon;
data = g_new0 (PanelAddtoAppList, 1);
app_info = G_APP_INFO (gmenu_tree_entry_get_app_info (entry));
+ icon = g_app_info_get_icon (app_info);
+ if (icon)
+ g_object_ref (icon);
+
data->item_info.type = PANEL_ADDTO_LAUNCHER;
data->item_info.name = g_strdup (g_app_info_get_display_name (app_info));
data->item_info.description = g_strdup (g_app_info_get_description (app_info));
- data->item_info.icon = g_object_ref (g_app_info_get_icon (app_info));
+ data->item_info.icon = icon;
data->item_info.launcher_path = g_strdup (gmenu_tree_entry_get_desktop_file_path (entry));
data->item_info.static_strings = FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]