Do

Merge lp://staging/~ballogy/do/gio-gnomedesktop-port into lp://staging/do

Proposed by Balló György
Status: Merged
Merged at revision: 1379
Proposed branch: lp://staging/~ballogy/do/gio-gnomedesktop-port
Merge into: lp://staging/do
Diff against target: 245 lines (+123/-14)
8 files modified
Do.Platform.Linux/Do.Platform.Linux.dll.config.in (+1/-0)
Do.Platform.Linux/Makefile.am (+3/-1)
Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs (+2/-1)
Do.Platform.Linux/src/Do.Universe/Desktop.cs (+76/-0)
Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs (+16/-0)
Do.Platform.Linux/src/Do.Universe/FileItem.cs (+7/-5)
Makefile.am (+5/-0)
configure.ac (+13/-7)
To merge this branch: bzr merge lp://staging/~ballogy/do/gio-gnomedesktop-port
Reviewer Review Type Date Requested Status
Do Core Team Pending
Review via email: mp+95842@code.staging.launchpad.net

Commit message

Port from gnome-sharp and gnome-vfs-sharp to gio-sharp and gnome-desktop. Do not check rsvg2-sharp and wnck-sharp

Description of the change

This change removes the old, deprecated gnome-sharp and gnome-vfs-sharp dependencies, and replaces them with gio-sharp and gnome-desktop.

The thumbnail handling code was moved from libgnomeui to libgnome-desktop, but gnome-desktop-sharp is outdated and it doesn't contain the required bindings, so I generated them by the Gtk# code generator and included in the source code.

Also, it removes dependency checks for rsvg2-sharp and wnck-sharp. These libraries are not really used by gnome-do.

To post a comment you must log in.
Revision history for this message
Chris Halse Rogers (raof) wrote :

Thanks for your work! Looks good.

I've got two niggles:
1) I'd copy the gio dlls from the Makefile, rather than configure; otherwise you'll need to re-run configure after “make clean”. I'll fix this up myself before merging.
2) It'd be nice there was some documentation (or even a makefile target) to regenerate the binding glue; that's lower priority, and you can provide it later if you want.

Revision history for this message
Balló György (ballogy) wrote :

1) I didn't know this, I simply copied this part of code from the docky project.
2) I don't know how to make a proper makefile, but I used this process to generate the binding: https://github.com/City-busz/gnomedesktop-sharp

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.