Merge lp:~junrrein/pantheon-files/fix-1125713 into lp:~elementary-apps/pantheon-files/trunk

Proposed by Julián Unrrein on 2013-02-20
Status: Merged
Approved by: Cody Garver on 2013-06-14
Approved revision: 1103
Merged at revision: 1221
Proposed branch: lp:~junrrein/pantheon-files/fix-1125713
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 17 lines (+0/-7)
1 file modified
src/unity-quicklist-handler.c (+0/-7)
To merge this branch: bzr merge lp:~junrrein/pantheon-files/fix-1125713
Reviewer Review Type Date Requested Status
Cody Garver 2013-02-20 Approve on 2013-06-14
Review via email: mp+149552@code.launchpad.net

Commit message

Don't show a double line in the quicklist to fix bug #1125713.

Description of the change

Don't show a double line in the quicklist to fix bug #1125713.

This need to be tested under Unity. If it shows no line on Unity (after bookmarks), then the bug lies in pantheon-dock's implementation of quicklists.

To post a comment you must log in.
Cody Garver (codygarver) wrote :

Under unity, no bookmarks are visible at all.

review: Needs Fixing
Julián Unrrein (junrrein) wrote :

This comment from you says otherwise: https://bugs.launchpad.net/pantheon-files/+bug/1125713/comments/6
The branch hasn't changed at all since that day.
I'm sorry to ask, but did you test that with Files opened?

Julián Unrrein (junrrein) wrote :

Can you test this again?
If this still makes bookmarks disappear under Unity, could we look for somebody's help? I don't see how the code changes introduced in this branch could have this effect.

Cody Garver (codygarver) wrote :

Hey Julián! I tested again a few days ago, look at the last comment on the bug. I forgot to comment here too.

Julián Unrrein (junrrein) wrote :

Actually Cody, I saw that comment before posting again, but I don't know why I assumed it was old without actually looking at the date. Sorry.
I guess we'll have to ask for someone's help.

Cody Garver (codygarver) wrote :

ricotz in #elementary-dev on freenode is who you should talk to

Julián Unrrein (junrrein) wrote :

Hi Cody,

I could replicate your bug by compiling pantheon-files without libunity-dev installed.

Can you check if that is your situation?

1102. By Julián Unrrein on 2013-06-07

Merge changes from trunk.

1103. By Julián Unrrein on 2013-06-13

Merge changes from trunk.

Cody Garver (codygarver) wrote :

Turns out Files' bookmarks are broken under Ubuntu so it was not this branch's fault.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/unity-quicklist-handler.c'
2--- src/unity-quicklist-handler.c 2012-07-05 14:41:02 +0000
3+++ src/unity-quicklist-handler.c 2013-06-13 15:22:27 +0000
4@@ -171,13 +171,6 @@
5
6 dbusmenu_menuitem_child_add_position (ql, menuitem, index);
7 lentry->bookmark_quicklists = g_list_prepend (lentry->bookmark_quicklists, menuitem);
8-
9- if (index == bookmark_count - 1) {
10- menuitem = dbusmenu_menuitem_new();
11- dbusmenu_menuitem_property_set (menuitem, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
12- dbusmenu_menuitem_child_add_position (ql, menuitem, index+1);
13- lentry->bookmark_quicklists = g_list_prepend (lentry->bookmark_quicklists, menuitem);
14- }
15 }
16 }
17 }

Subscribers

People subscribed via source and target branches

to all changes: