Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Claim file transfer channels, so empathy does not revieve them #611

Merged
merged 1 commit into from Nov 23, 2015

Conversation

samdroid-apps
Copy link
Contributor

If empathy is installed and the user is sent a file transfer (via
the journal), an empathy dialog will pop up asking the user where
to save the file (in the filesystem, not journal). This conflicts
with the Sugar ui.

Fixes #4907 https://bugs.sugarlabs.org/ticket/4907

@samdroid-apps samdroid-apps added this to the 0.108 Features milestone Nov 6, 2015
@samdroid-apps samdroid-apps mentioned this pull request Nov 6, 2015
@samdroid-apps
Copy link
Contributor Author

If anybody has time, can they please merge/review this? I need to base some patches on top of this for the collaberation wrapper to allow activities to send file transfers without the shell getting involved.

@quozl
Copy link
Contributor

quozl commented Nov 23, 2015

Comments added to ticket; tested fine.

One code comment has missing word "empathy doesn't it".

Commit log message first line has a typo.

Commit log message last line should use "UI" not "ui", or even "HIG".

Commit log message explains very well what the problem is, and the impact, but does not describe how it is fixed. I had to try to work that out for myself, but failed. If I had to do it, others might have to do it too in future when doing bisection. Please show how it is fixed.

I'm fine with you doing a force push with your fixes.

Meanwhile, if you need to base some patches on top of this, then include this patch in those new pull requests.

If empathy is installed and the user is sent a file transfer (via
the journal), an empathy dialog will pop up asking the user where
to save the file (in the filesystem, not journal).  This conflicts
with the Sugar UI.

This is fixed using the channel approver.  In telepathyclient,
this commit adds file transfers to the list of channels that
the approver will inspect.  In filetransfer, this commit listens
for channels to approve and claims the file transfers for the
Sugar telepathy client.

Fixes #4907  <https://bugs.sugarlabs.org/ticket/4907>
@samdroid-apps
Copy link
Contributor Author

Forced pushed updates @quozl

commit 4ad807fe3d16073be4a0c56026f2b3ff59b3c1f5
Author: Sam Parkinson <sam@sam.today>
Date:   Fri Nov 6 20:54:11 2015 +1100

    Claim file transfer channels, so empathy does not recieve them

    If empathy is installed and the user is sent a file transfer (via
    the journal), an empathy dialog will pop up asking the user where
    to save the file (in the filesystem, not journal).  This conflicts
    with the Sugar UI.

    This is fixed using the channel approver.  In telepathyclient,
    this commit adds file transfers to the list of channels that
    the approver will inspect.  In filetransfer, this commit listens
    for channels to approve and claims the file transfers for the
    Sugar telepathy client.

    Fixes #4907  <https://bugs.sugarlabs.org/ticket/4907>

@quozl
Copy link
Contributor

quozl commented Nov 23, 2015

Reviewed, thanks. No write access, cannot merge. "Only those with write access to this repository can merge pull requests."

@samdroid-apps
Copy link
Contributor Author

You don't seem to have been added to the frequent contributors team which provides write access. @godiard or @tchx84 probably fix this because I'm pretty sure we all agreed to add you as a maintainer.

@samdroid-apps samdroid-apps merged commit 4ad807f into sugarlabs:master Nov 23, 2015
@godiard
Copy link
Contributor

godiard commented Nov 23, 2015

@samdroid-apps , @quozl: added James to frequent contributors. Roles and teams changed in gitthub.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants