lp:~elementary-apps/pantheon-files/granite

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~elementary-apps/pantheon-files/trunk at revision 807

Victor Martinez (community): Approve on 2012-05-12

Diff: 2294 lines (+979/-856)

30 files modified

CMakeLists.txt (+1/-1)
data/marlin.desktop.in (+5/-56)
libcore/CMakeLists.txt (+2/-1)
libcore/marlincore.deps (+1/-0)
libwidgets/CMakeLists.txt (+1/-0)
marlin-daemon/CMakeLists.txt (+0/-49)
marlin-daemon/client.vala (+0/-29)
marlin-daemon/marlind-tagging.vala (+0/-380)
marlin-daemon/miner.vala (+0/-124)
pantheon-files-daemon/CMakeLists.txt (+49/-0)
pantheon-files-daemon/client.vala (+29/-0)
pantheon-files-daemon/marlind-tagging.vala (+380/-0)
pantheon-files-daemon/miner.vala (+124/-0)
po/CMakeLists.txt (+2/-2)
src/CMakeLists.txt (+16/-12)
src/View/Chrome/IconFactory.vala (+53/-0)
src/View/Chrome/ImgEventBox.vala (+68/-0)
src/View/Chrome/TopMenu.vala (+4/-4)
src/View/Chrome/ViewSwicher.vala (+4/-2)
src/View/Chrome/XsEntry.vala (+40/-0)
src/View/ContextView.vala (+2/-1)
src/View/LocationBar.vala (+2/-2)
src/View/PropertiesWindow.vala (+8/-8)
src/View/Resources.vala (+5/-5)
src/View/SettingsDialog.vala (+2/-2)
src/View/Window.vala (+10/-10)
src/marlin-application.c (+8/-6)
src/marlin-application.h (+3/-2)
src/marlin-ui.xml (+0/-160)
src/pantheon-files-ui.xml (+160/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #995692: Migrate back to Granite

High

Fix Released

Link a bug report

Related blueprints

807. By Victor Martinez on 2012-05-12

Use Granite.Widgets instead of Varka.Widgets

806. By Victor Martinez on 2012-05-12

Use Granite.Widgets.CollapsiblePaned

805. By Victor Martinez on 2012-05-12

Merge Mario's work, resolve conflict in data/desktop.in, and fix minor cmake issue.

804. By Launchpad Translations on behalf of elementary-apps on 2012-05-08

Launchpad automatic translations update.

803. By Cassidy James Blaede on 2012-05-08

Fixed a couple of trash-related string bugs (bug 977677 and bug 909572) leftover from Marlin.

802. By Cassidy James Blaede on 2012-05-07

Merged Dan's Bitesize branch.

801. By Launchpad Translations on behalf of elementary-apps on 2012-05-07

Launchpad automatic translations update.

800. By Cody Garver on 2012-05-07

Merge branch from victored that removes ability to set file Properties window modal and makes it use a notebook instead of expanders.

799. By Cody Garver on 2012-05-06

Merged with tom95 contractor work.

798. By ammonkey on 2012-01-29

bug #919454 no need to join the thread, it doesn't avoid the crash. Just check on the thread the validity of Directory.ASync object.