Docky

Merge lp://qastaging/~cszikszoy/docky/rm-vfs into lp://qastaging/docky

rm-vfs
Merge into trunk

Proposed by Chris S. on 2010-07-28

Status:	Merged
Merged at revision:	1594
Proposed branch:	lp://qastaging/~cszikszoy/docky/rm-vfs
Merge into:	lp://qastaging/docky
Diff against target:	195 lines (+10/-39) 8 files modified Docky.Items/Docky.Items.csproj (+0/-3) Docky.Items/Docky.Items/ApplicationDockItem.cs (+5/-8) Docky.Items/Docky.Items/FileDockItem.cs (+3/-5) Docky.Items/Makefile.am (+1/-3) Docky/Docky.csproj (+0/-4) Docky/Docky/Docky.cs (+1/-11) Docky/Makefile.am (+0/-1) configure.ac (+0/-4)
To merge this branch:	bzr merge lp://qastaging/~cszikszoy/docky/rm-vfs
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Robert Dyer (community)	2010-07-28	Approve on 2010-07-28
Rico Tzschichholz		Needs Fixing on 2010-07-28
Review via email: mp+31119@code.qastaging.launchpad.net

Revision history for this message

Robert Dyer (psybers) wrote on 2010-07-28:

FileDockItem.cs - needs to check if the file exists, you removed that check and did not add a GLib.File equiv of it

review: Needs Fixing

lp://qastaging/~cszikszoy/docky/rm-vfs updated on 2010-07-28

1594. By Chris S. on 2010-07-28: necessary evil, still need to think about a better way to do this. Maybe there isn't one?

Revision history for this message

Rico Tzschichholz (ricotz) wrote on 2010-07-28:

Do not delete docky.pot! ;-)

review: Needs Fixing

Revision history for this message

Chris S. (cszikszoy) wrote on 2010-07-28:

wtf, that's strange. I did a make clean before i committed to see that all the GNOME_SHARP and GNOME_VFS_SHARP references were removed from the makefiles, and that must have deleted the .pot file.

lp://qastaging/~cszikszoy/docky/rm-vfs updated on 2010-07-28