Merge lp://staging/~ebanyash/cable/cable-e into lp://staging/cable

Proposed by Evan Banyash
Status: Merged
Approved by: Akshay Shekher
Approved revision: 17
Merge reported by: Akshay Shekher
Merged at revision: not available
Proposed branch: lp://staging/~ebanyash/cable/cable-e
Merge into: lp://staging/cable
Diff against target: 1271 lines (+483/-335)
10 files modified
.bzrignore (+2/-0)
CMakeLists.txt (+4/-3)
INSTALL (+3/-3)
bin/quickbuild.sh (+11/-0)
src/Backend.vala (+0/-215)
src/Cable.vala (+37/-37)
src/Global.vala (+4/-4)
src/Widgets/Room.vala (+40/-40)
src/Widgets/Server.vala (+37/-33)
src/doodleIRC.vala (+345/-0)
To merge this branch: bzr merge lp://staging/~ebanyash/cable/cable-e
Reviewer Review Type Date Requested Status
Akshay Shekher (community) Approve
Evan Banyash (community) Approve
elementary Apps team Pending
Review via email: mp+163713@code.staging.launchpad.net

Description of the change

I changed the installation instructions to be more correct, brought in voldyman's functional backend and credited him for it.

This is important because as of now, the project's trunk is non-functional. It crashes upon trying to join a channel.

To post a comment you must log in.
Revision history for this message
Akshay Shekher (voldyman) wrote :

nice work.
please change the permissions of the files to -x from +x.

review: Needs Fixing
Revision history for this message
Evan Banyash (ebanyash) wrote :

And... done.

This is how you use the "Resubmit" review type, right?

review: Needs Resubmitting
Revision history for this message
Evan Banyash (ebanyash) wrote :

> And... done.
>
> This is how you use the "Resubmit" review type, right?

...No, apparently it is not.
Sorry, I'm a bit GNU here.

review: Approve
Revision history for this message
Akshay Shekher (voldyman) wrote :

my mistake, i meant remove the executable attribute (make all fines -x)

and your last commit is empty.

review: Needs Fixing
lp://staging/~ebanyash/cable/cable-e updated
11. By Evan Banyash

small update to root cmakelists

12. By Evan Banyash

Okay, -x on everything now

13. By Evan Banyash

merging to avoid conflicting branches, apparently

Revision history for this message
Evan Banyash (ebanyash) wrote :

> my mistake, i meant remove the executable attribute (make all fines -x)
>
> and your last commit is empty.

Yeah, I guess it was empty because everything was already +x. I thought that was normal when just changing permissions. I guess not. Okay, it should all be -x now except the directories because apparently you can't really use them without the execute bit.

Revision history for this message
Akshay Shekher (voldyman) wrote :

for the backend, could you get the latest one from github.com/voldyman/doodleIRC ?

that would be the ultimate merge :)

Revision history for this message
Evan Banyash (ebanyash) wrote :

> for the backend, could you get the latest one from
> github.com/voldyman/doodleIRC ?
>
> that would be the ultimate merge :)

Good idea. I'll see what I can do.

Hopefully nothing will break too bad.

Revision history for this message
Evan Banyash (ebanyash) wrote :

Hmm... do you suggest that I keep doodleIRC.vala intact and change the server widget? Then we'd have two namespaces in the project. Is that okay? Or should I change the namespace of doodleIRC.vala to be in Cable?

Revision history for this message
Akshay Shekher (voldyman) wrote :

You could keep it intact so the frontend and back end will be separate and
easier to update later.
On May 16, 2013 7:20 PM, "Evan Banyash" <email address hidden> wrote:

> Hmm... do you suggest that I keep doodleIRC.vala intact and change the
> server widget? Then we'd have two namespaces in the project. Is that okay?
> Or should I change the namespace of doodleIRC.vala to be in Cable?
> --
> https://code.launchpad.net/~ebanyash/cable/cable-e/+merge/163713
> You are reviewing the proposed merge of lp:~ebanyash/cable/cable-e into
> lp:cable.
>

lp://staging/~ebanyash/cable/cable-e updated
14. By Evan Banyash

Moved to latest DoodleIRC backend

15. By Evan Banyash

Deleted the old Backend.vala

Revision history for this message
Evan Banyash (ebanyash) wrote :

And, done. Everything appears to still work, too!

review: Approve
lp://staging/~ebanyash/cable/cable-e updated
16. By Evan Banyash

okay, I forgot to add this last time. Whew, crisis over

17. By Evan Banyash

added a script to build and test at super fast speeds

Revision history for this message
Akshay Shekher (voldyman) wrote :

very good work.

review: Approve

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: