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

Proposed by Mario Guerriero
Status: Merged
Merged at revision: 817
Proposed branch: lp:~mefrio-g/pantheon-files/fix-1003286
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 17 lines (+2/-1)
1 file modified
src/marlin-progress-ui-handler.c (+2/-1)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-files/fix-1003286
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+107057@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/marlin-progress-ui-handler.c'
2--- src/marlin-progress-ui-handler.c 2012-02-05 16:29:37 +0000
3+++ src/marlin-progress-ui-handler.c 2012-05-23 16:06:19 +0000
4@@ -227,11 +227,12 @@
5 }
6 }
7
8-static void
9+static bool
10 progress_ui_handler_disable_unity_urgency (UnityLauncherEntry *entry)
11 {
12 g_return_if_fail (entry);
13 unity_launcher_entry_set_urgent (entry, FALSE);
14+ return FALSE;
15 }
16
17 static void

Subscribers

People subscribed via source and target branches

to all changes: