Merge lp:~mefrio-g/pantheon-files/fix-877060 into lp:~elementary-apps/pantheon-files/trunk

Proposed by Mario Guerriero
Status: Merged
Merged at revision: 818
Proposed branch: lp:~mefrio-g/pantheon-files/fix-877060
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 28 lines (+7/-3)
1 file modified
src/fm-directory-view.c (+7/-3)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-files/fix-877060
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+107049@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/fm-directory-view.c'
2--- src/fm-directory-view.c 2012-02-18 14:47:32 +0000
3+++ src/fm-directory-view.c 2012-05-23 15:41:17 +0000
4@@ -293,9 +293,13 @@
5 g_signal_handlers_disconnect_by_func (directory, file_loaded_callback, view);
6
7 /* Apparently we need a queue_draw sometimes, the view is not refreshed until an event */
8- if (gof_directory_async_is_empty (directory))
9+ if (gof_directory_async_is_empty (directory)) {
10 gtk_widget_queue_draw (GTK_WIDGET (view));
11-
12+ dir_action_set_sensitive (view, "Select All", FALSE);
13+ }
14+ else
15+ dir_action_set_sensitive (view, "Select All", TRUE);
16+
17 MarlinZoomLevel zoom;
18 g_object_get (view, "zoom-level", &zoom, NULL);
19 int size = marlin_zoom_level_to_icon_size (zoom);
20@@ -1620,7 +1624,7 @@
21 }
22 }
23
24-static void
25+void
26 dir_action_set_sensitive (FMDirectoryView *view, const gchar *action_name, gboolean sensitive)
27 {
28 GtkAction *action;

Subscribers

People subscribed via source and target branches

to all changes: