Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libcaja-private/caja-icon-info.c
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ caja_icon_info_lookup (GIcon *icon,

lookup_key.icon = icon;
lookup_key.scale = scale;
lookup_key.size = size * scale;
lookup_key.size = size;
Comment thread
gaobo-kylinsec marked this conversation as resolved.

icon_info = g_hash_table_lookup (loadable_icon_cache, &lookup_key);
if (icon_info)
Expand Down
4 changes: 4 additions & 0 deletions src/caja-emblem-sidebar.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@ create_popup_menu (CajaEmblemSidebar *emblem_sidebar)

popup = gtk_menu_new ();

gtk_menu_attach_to_widget (GTK_MENU (popup),
GTK_WIDGET (emblem_sidebar),
NULL);

gtk_menu_set_reserve_toggle_size (GTK_MENU (popup), FALSE);

/* add the "rename" menu item */
Expand Down
2 changes: 2 additions & 0 deletions src/caja-notes-viewer.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ caja_notes_viewer_init (CajaNotesViewer *sidebar)
/* create the text container */
details->text_buffer = gtk_text_buffer_new (NULL);
details->note_text_field = gtk_text_view_new_with_buffer (details->text_buffer);
// gtk_text_view_new_with_buffer will add reference to text buffer
g_object_unref (details->text_buffer);

gtk_text_view_set_editable (GTK_TEXT_VIEW (details->note_text_field), TRUE);
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (details->note_text_field),
Expand Down
4 changes: 4 additions & 0 deletions src/caja-window-menus.c
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,11 @@ add_extension_menu_items (CajaWindow *window,

caja_menu_item_list_free (children);
g_free (subdir);

g_object_unref (menu);
}

g_object_unref (action);
}
}

Expand Down
Loading