Merge lp://staging/~julien-spautz/cable/clean-up into lp://staging/cable

Proposed by Julien Spautz
Status: Merged
Merged at revision: 64
Proposed branch: lp://staging/~julien-spautz/cable/clean-up
Merge into: lp://staging/cable
Diff against target: 4226 lines (+2750/-1267) (has conflicts)
25 files modified
CMakeLists.txt (+26/-4)
data/org.pantheon.cable.gschema.xml (+11/-19)
po/cable.pot (+57/-75)
src/Cable.vala (+85/-248)
src/Config.vala.cmake (+7/-7)
src/Dialogs/JoinChannel.vala (+97/-0)
src/Dialogs/ManageIdentity.vala (+117/-0)
src/Dialogs/ManageNetwork.vala (+116/-0)
src/Dialogs/Preferences.vala (+214/-0)
src/Global.vala (+0/-18)
src/Services/Client.vala (+278/-0)
src/Services/Identity.vala (+123/-0)
src/Services/Network.vala (+103/-0)
src/Services/Settings.vala (+146/-0)
src/Settings.vala (+0/-23)
src/Utils.vala (+69/-0)
src/Widgets/Channel.vala (+109/-55)
src/Widgets/Room.vala (+276/-63)
src/Widgets/Server.vala (+380/-229)
src/Widgets/ServerList.vala (+103/-76)
src/Widgets/SettingsDialog.vala (+0/-65)
src/Widgets/StatusBar.vala (+49/-0)
src/Widgets/Welcome.vala (+112/-0)
src/Window.vala (+272/-0)
src/doodleIRC.vala (+0/-385)
Text conflict in src/Widgets/Room.vala
To merge this branch: bzr merge lp://staging/~julien-spautz/cable/clean-up
Reviewer Review Type Date Requested Status
Auroral Xylon (community) Needs Fixing
Julián Unrrein (community) Needs Fixing
Eduard Gotwig (community) Needs Fixing
Review via email: mp+168703@code.staging.launchpad.net

Description of the change

Just testing for conflicts, please don't merge.

To post a comment you must log in.
Revision history for this message
Julien Spautz (julien-spautz) wrote :

This is now almost ready for merging. There are still a few regressiong left because of the switch to maki as backend daemon, which I'll try to fix asap so we can continue enhancing cable and implementing new features.

Revision history for this message
Julián Unrrein (junrrein) wrote :

If you'd like more people to test this when this is ready, I offer my help. Just shoot me an email.

Revision history for this message
Julien Spautz (julien-spautz) wrote :

I'll start implementing this: https://blueprints.launchpad.net/cable/+spec/identities-and-networks

After this is done, we can start reviewing.

Revision history for this message
Julien Spautz (julien-spautz) wrote :

Ok, I guess the branch is now kind of working. I need some feedback in case there are any important bugs, else this branch is ready for merging into trunk.

56. By Julien Spautz

replaced toolber with status bar, entry not yet resizing

57. By Julien Spautz

added new statusbar file

58. By Julien Spautz

small fixes

59. By Julien Spautz

fixed duplicates in user list

Revision history for this message
Auroral Xylon (avlabs314) wrote :

This branch is looking pretty good now...Small bugs can be fixed later on I guess...Merge time?

60. By Julien Spautz

entry now expands and is centered correctly, buttons on the right are misaligned

61. By Julien Spautz

added file

62. By Julien Spautz

make pot

Revision history for this message
Eduard Gotwig (gotwig) wrote :

Nickname entry description should tell the user that hes not able to use spaces or special charachters;

The join channel dialog shouldnt autoselect the # charachter as a selection;

when the user enters an alphabetical charachter as the first charachter for a channel, cable IRC Suite should automaticly prepend a "#" charachter before this.

review: Needs Fixing
Revision history for this message
Julián Unrrein (junrrein) wrote :

I can't compile your branch as of rev62:

/clean-up/src/Widgets/Room.vala:91.27-91.61: error: Assignment: Cannot convert from `Gtk.Widget' to `Gtk.Container?'
            Gtk.Container content = topic.get_content_area ();
                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

PS: Consider adding me to the reviewer list of this merge proposal, so I get automatically notified of new comments.

review: Needs Fixing
Revision history for this message
Julián Unrrein (junrrein) wrote :

Do you enforce a certain version of valac? I am using 0.16.

Revision history for this message
Julián Unrrein (junrrein) wrote :

@gotwig

Shouldn't we just focus on checking that this branch solves all the bugs and implements all the blueprints linked? Because everything you mentioned seems to be nonrelated details.

Revision history for this message
Eduard Gotwig (gotwig) wrote :

@Junrrein

This branch offers a new look, and a new implementation of a design specification. With this, it should not make the UX of Cable IRC Suite worse.

Revision history for this message
Auroral Xylon (avlabs314) wrote :

I have always had @junrreins problem; I fixed this in trunk but I presums that Julien Spautz's branch is based of an older revsion. To fix the compile error, you need to put '(Gtk.Container)' before topic so it looks like this:

Gtk.Container content = (Gtk.Container)topic.get_content_area ();

However, there are also some disagreementtwith the design. Until we can resolve them,' the branch should not be merged.

63. By Julien Spautz

fixed a few things

Revision history for this message
Julián Unrrein (junrrein) wrote :

@gotwig

In trunk the identity dialog doesn't check if the input contains spaces or special characters, so the situation is the same here.

As for the other details, they are very minor nuisances which can be taken care of at another moment.

Revision history for this message
Julián Unrrein (junrrein) wrote :

@xylon

I am aware I can type-cast the compile error away, but that is not the problem.

It is apparent that Julien didn't even try to compile his branch before pushing his latest revisions. I am reluctant to test code that wasn't tested by the developer.

Revision history for this message
Julien Spautz (julien-spautz) wrote :

@junrrein

I did try the code and it compiled fine for me, the compiler error xylon mentionned existed in trunk but it didn't affect me there either. It's now been fixed, so I hope it now works for you too.

This is the merge request that fixed the bug in trunk, and as you can see, the bug never affected me. https://code.launchpad.net/~avlabs314/cable/cable/+merge/168510

Revision history for this message
Julián Unrrein (junrrein) wrote :

@Julien

I talked to xylon about this a minute ago, and we concluded this might be pinned down to different versions of valac being used. I'm sorry for the "accusation". If I standed out as rude, it wasn't my intention.

I can now compile rev63 just fine, thanks. I'll be testing this.

Revision history for this message
Julián Unrrein (junrrein) wrote :

I noticed a couple of issues:

1 - New identities can't join channels in the same session they are created. After closing Cable and restarting it, the new identity works just as expected. I can reproduce this always.

2 - The first time Cable is opened (in a new desktop session) console output reveals it connects every past identity to each correspondent server - even identities that were erased from Cable (and from Dconf). This is related with the previous issue because after connecting sucesfully with an identity, erasing it will not trigger the first bug again.

review: Needs Fixing
Revision history for this message
Julien Spautz (julien-spautz) wrote :

Thanks for testing!

1) I don't (yet) know how to fix this, as there is no documentation for maki, the backend daemon. I'm currently performing some hackish tests which are relatively reliable, but I'm still searching for a way to test if maki is connected to a specific server or not.

2) Shouldn't be too hard to fix, but again, maki really lacks documentation…

( And don't worry, I'm not offended ;) )

Revision history for this message
Julián Unrrein (junrrein) wrote :

About item 2: This makes impossible to change the current nick to one that was used previously, even if you are not using it right now.

Curiously, changing the current nick to another one which was never used doesn't trigger item 1.
The nick is changed correctly when seen from the outside.
From the inside, the nick shown in the window title only changes when changing to another channel and then back.
The nick shown in the operators/users lists isn't changed in any of the current opened channels. It will stay the same until you leave those channels and join again. New channels will join the nick correctly.

Revision history for this message
Julián Unrrein (junrrein) wrote :

The last line should read "New channels will show the nick correctly".

Revision history for this message
Julián Unrrein (junrrein) wrote :

About the linked bugs:

(3) Cable doesn't let me join a channel twice. Console output says "Server.vala:336: Channel '#elementary-apps' already joined. Works as intended. UI feedback would be nice, but it's not necessary right now.

(4) The operators/users lists are expanded by default.

(5) I don't know how to test running with invalid Gschemas. Do I just modify any key with random content?

(6) Toolbar buttons have tooltips now.

(7) I can remove identities that I am currently using from the settings dialog - not good.
Identities created using this dialog exhibit the first bug I outlined earlier (bug (1)).
Maybe identities should be tied to specific networks. See my comment in the blueprint (http://goo.gl/r6nr9).

This is looking pretty well!

Revision history for this message
Auroral Xylon (avlabs314) wrote :

I am having a problem - cable does not connect to a channel, except it randomly does on a few occasions. Basically, the interface loads - the sidebars and the 'loading topic' text appears but it doesn't actually connect.

Unfortunately, junrrein also had this problem.

review: Needs Fixing
64. By Julien Spautz

joining channels should now be more reliable, some internal changes to how settings are handeled

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.

Subscribers

People subscribed via source and target branches

to all changes: