After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 620838 - [GtkBuilder transition] tag_selection_dialog
[GtkBuilder transition] tag_selection_dialog
Status: RESOLVED FIXED
Product: f-spot
Classification: Other
Component: General
GIT
Other Linux
: Normal enhancement
: 0.7.2
Assigned To: Eric Faehnrich
F-spot maintainers
Depends on:
Blocks: f-spot-glade
 
 
Reported: 2010-06-07 14:06 UTC by Ruben Vermeersch
Modified: 2010-08-02 13:12 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Patch for tag_selection_dialog migrated to GtkBuilder (13.78 KB, patch)
2010-06-10 11:08 UTC, Eric Faehnrich
needs-work Details | Review
Patch for tag_selection_dialog migrated to GtkBuilder (13.78 KB, patch)
2010-06-12 03:29 UTC, Eric Faehnrich
needs-work Details | Review
Patch for tag_selection_dialog GtkBuilder Transition (1.08 KB, patch)
2010-06-22 19:16 UTC, Eric Faehnrich
needs-work Details | Review
GtkBuilder transition of tag_selection_dialog (8.80 KB, patch)
2010-07-31 01:05 UTC, Eric Faehnrich
committed Details | Review

Description Ruben Vermeersch 2010-06-07 14:06:19 UTC
The tag_selection_dialog needs to be migrated to GtkBuilder.
Comment 1 Ruben Vermeersch 2010-06-07 15:21:43 UTC
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.
Comment 2 Eric Faehnrich 2010-06-08 12:28:29 UTC
I would like to work on this.  I will strive to complete it by end of today or tomorrow.

Thank you for making these tasks simple for new contributors such as myself.
Comment 3 Ruben Vermeersch 2010-06-08 12:31:55 UTC
Allright, go for it! Feel free to ask for help if you're stuck!
Comment 4 Eric Faehnrich 2010-06-09 11:07:33 UTC
I've been stuck on the build step in your instructions.  It can't find the package gtk-sharp-2.0.
Comment 5 Eric Faehnrich 2010-06-09 11:20:17 UTC
I had to install gkt-sharp2, but now it can't find the package gnome-keyring-sharp-1.0.
Comment 6 Paul Lange 2010-06-09 12:02:50 UTC
Which distro do you use? Most likely you need to install development packages, in Fedora they're called packagename-devel.
Comment 7 Eric Faehnrich 2010-06-09 12:06:12 UTC
I'm using Ubuntu Lucid.
Comment 8 Paul Lange 2010-06-09 12:23:05 UTC
Then "sudo apt-get build-dep f-spot" should help.
Comment 9 Eric Faehnrich 2010-06-09 12:54:38 UTC
Thanks.
I thought I did that since it's right there in the instructions, but guess I didn't since that helped.  But know it needs the package unique-1.0.
Comment 10 Paul Lange 2010-06-09 17:06:38 UTC
If the script says you need unique-1.0 you have to install it in order to build f-spot!
Also remeber, if you want to build software you'll also need the development files. To find them simply append an "-dev" to the package name.
Comment 11 Eric Faehnrich 2010-06-09 17:30:07 UTC
Thanks again.  I know that I would need the packages.  My problem is that which package to install is not obvious to me.  When it said I need the package unique-1.0, I tried "sudo apt-get install unique-1.0" to no avail.  Doing a search on unique-1.0 came up with libunique.  Using your suggestion of appending -dev, I found that to work.
Comment 12 Eric Faehnrich 2010-06-10 02:58:21 UTC
In line 25 of src/UI.Dialog/TagSelectionDialog.cs, what was 

int response = this.Dialog.Run ();

would have been changed to

int response = this.Run ();

if I blindly followed the instructions.  That would have called the TagSelectionDialog Run function inside of that function, instead of the base class's Run function.  Luckily, they have different return types and throw an error, otherwise it would have gone unnoticed by me, and infinite recursion!  Yay!

It's now 

int response = base.Run ();

The instructions now say to attach the .patch file to the bug.  Even though it says it's that simple, I'm not even sure what attaching a file to a bug means.
Comment 13 Paul Lange 2010-06-10 06:48:52 UTC
Eric, great to hear that you finished the conversion!

A patch is a file which includes all changes you made and makes it easy for others to apply them too. If you created it like described on the webpage, simply click "Add an attachment" at the bottom of this page and select yout patch-file. A formular will open, please select the checkbox for patch there.

After that someone will will review your patch. Thanks for your work.
Comment 14 Eric Faehnrich 2010-06-10 11:08:05 UTC
Created attachment 163273 [details] [review]
Patch for tag_selection_dialog migrated to GtkBuilder
Comment 15 Eric Faehnrich 2010-06-10 11:11:32 UTC
Thanks.  That was fun.  I'd like to do more.  Any suggestions of where I could look to find things to help with?
Comment 16 Maxxer 2010-06-10 11:22:16 UTC
(In reply to comment #14)
> Created an attachment (id=163273) [details] [review]
> Patch for tag_selection_dialog migrated to GtkBuilder

From 17a3239c5b0023ff1df9446d2ad901ae25f082dc Mon Sep 17 00:00:00 2001
From: faehnrich <faehnrich@TURING.(none)>
Date: Wed, 9 Jun 2010 22:43:54 -0400

Eric, you haven't set up Git correctly! It misses your username and email. Please follow this guide
http://live.gnome.org/Git/Developers#Setting_up_Git

thanks
Comment 17 Paul Lange 2010-06-10 11:57:34 UTC
Review of attachment 163273 [details] [review]:

Heva you tested this? I didn't try but it shouldn't work because you mixed up Glade and GtkBuilder stuff.

::: src/UI.Dialog/TagSelectionDialog.cs
@@ +4,1 @@
 using Glade;

After the transition you can remove this.

@@ +8,3 @@
 	{
 		[Widget] Gtk.ScrolledWindow tag_selection_scrolled;
 		[Widget] Gtk.VBox selection_vbox;

Seems like you forgot to change the attributes from (Glade.)Widget to GtkBeans.Builder.Object
Comment 18 Eric Faehnrich 2010-06-12 03:29:04 UTC
Created attachment 163447 [details] [review]
 Patch for tag_selection_dialog migrated to GtkBuilder
Comment 19 Eric Faehnrich 2010-06-12 03:29:39 UTC
I thought I did that, and it seemed to work.  I went through the instructions again.
Comment 20 Ruben Vermeersch 2010-06-18 18:09:38 UTC
I think you resubmitted the same patch (which does not apply).

Could you commit all your changes and attach those. Also, please run

  git pull --rebase

before submitting your patch. This will make sure no conflicts exist.
Comment 21 Ruben Vermeersch 2010-06-18 18:10:14 UTC
Comment on attachment 163273 [details] [review]
Patch for tag_selection_dialog migrated to GtkBuilder

Oh and mark old patches obsolete once you submit a new version.
Comment 22 Eric Faehnrich 2010-06-22 19:16:40 UTC
Created attachment 164338 [details] [review]
Patch for tag_selection_dialog GtkBuilder Transition
Comment 23 Ruben Vermeersch 2010-06-22 20:08:24 UTC
Okay, we're getting there, but this patch only seems to contain the changes to convert the attributes.

Could you try the following steps:

* delete any 000....patch files
* git pull --rebase
* git format-patch origin/master..master
* attach all the generated .patch files.
Comment 24 Eric Faehnrich 2010-06-22 20:16:48 UTC
There doesn't seem to be any generated .patch files.
Comment 25 Ruben Vermeersch 2010-06-22 20:25:47 UTC
What output do you get when you run "git format-patch origin/master..". Are you working in a branch?

Try this:

* git pull
* git rebase origin/master
* git format-patch origin/master..
Comment 26 Eric Faehnrich 2010-06-22 20:53:45 UTC
for the pull it have:

U	src/Makefile.am
M	src/UI.Dialog/TagSelectionDialog.cs
U	src/f-spot.glade
A	src/ui/tag_selection_dialog.ui
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.

for the rebase:


It seems that I cannot create a rebase-apply directory, and
I wonder if you are in the middle of patch application or another
rebase.  If that is not the case, please
	rm -fr /home/faehnrich/development/f-spot/.git/rebase-apply
and run me again.  I am stopping in case you still have something
valuable there.

no output for the format-patch
Comment 27 Ruben Vermeersch 2010-06-22 21:40:35 UTC
Looks like you're in the middle of a failed rebase.

You'll need to do a "git rebase --abort".

Then do "git pull --rebase"

It will report a number of conflicts (changes that happened which git cannot merge automatically with your work). You'll have to fix those conflicts, "git add" the conflicted files (once they are fixed) and "git rebase --continue".

Only then can you use format-patch.
Comment 28 Eric Faehnrich 2010-07-31 01:05:35 UTC
Created attachment 166866 [details] [review]
GtkBuilder transition of tag_selection_dialog
Comment 29 Ruben Vermeersch 2010-08-02 13:10:58 UTC
Comment on attachment 166866 [details] [review]
GtkBuilder transition of tag_selection_dialog

The .ui file you added was saved as a glade file instead of a GtkBuilder file. I've corrected this and will merge it, thanks!