4605 2 #87
Closed
4605 2 #87
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Log an error instead. Toolbar class was considering a value of None for the path, but the ViewSource class wasn't.
In case of a GTK activity, it will display the source of sugar-toolkit-gtk3 . We can enhace this later, if we could check if the activity is GTK2 or GTK3. There is a FIXME note in the code for this. In case of a web activity, it will display sugar_web inside the activity bundle. The initial selected file will be env.js, which is analog to the initial file env.py in sugar-toolkit-gtk3 .
A better option would be js/activity.js, but that implies bigger changes in FileViewer class, and we are in freeze.
Replace glib import for GLib. This was breaking the webaccount cpsection when running from latest sugar-build. Signed-off-by: Martin Abente Lahaye <tch@sugarlabs.org>
Closed
|
I think there is a 4th (alien) patch there! I wonder why it says that it can be merged automatically, if shouldn't be able to, since that 4th patch is already in. |
Hey tch. This is what I did to make my repatches:
So I think github / git will figure out the merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.