GNOME Bugzilla – Bug 620845
[GtkBuilder transition] viewer_preferences
Last modified: 2010-06-22 20:18:34 UTC
The viewer_preferences needs to be migrated to GtkBuilder.
Instructions on how to fix this can be found here: http://f-spot.org/GtkBuilder_Transition Please indicate below if you are working on this (and if you stopped working on it), so we can avoid duplicate work. If you are stuck, just ask for help on IRC or the mailing list.
Created attachment 163581 [details] [review] viewer preferences libglade to GtkBuilder transition patch My first attempt at a patch :)
Great, I will review it very soon (currently preparing the 0.7.0 release), but at first sight it looks good!
Review of attachment 163581 [details] [review]: Good patch, but there's something wrong in your .ui file (see below). Could you change this? In case you don't know the right git steps: 1) git pull --rebase 2) fix any conflicts etc. 3) save the viewer_preferences.ui as a GtkBuilder file 4) git commit --amend src/ui/viewer_preferences.ui 5) re-attach the patch to the bug (format with git format-patch) The --amend trick ensures that your changes to the .ui file are combined with the current latest revision (which should be your patch, as it is rewinded on top of the upstream work by calling git pull --rebase). ::: src/ui/viewer_preferences.ui @@ +1,2 @@ +<?xml version="1.0"?> +<glade-interface> This looks like a Glade file rather than a GtkBuilder file. Please make sure you save as a GtkBuilder file.
Created attachment 164333 [details] [review] viewer preferences libglade to GtkBuilder transition patch I managed to mess up my local copy of the f-spot repository pretty badly. Attempting to fix it confused me quite a bit, git is far more complex than I had thought. I ended up using git clone to create another local repository, applying the patch I had made before, then making the changes to the viewer_preferences.ui file. Rather roundabout, but I think this is essentially what you were asking for.
Yes indeed, great work! Merged into git master! Git can indeed be a bit confusing. This is a good read though: http://ftp.newartisans.com/pub/git.from.bottom.up.pdf Made a lot of things clear for me.