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

Fix for Login Items #1055

Merged
merged 2 commits into from Aug 23, 2012
Merged

Fix for Login Items #1055

merged 2 commits into from Aug 23, 2012

Conversation

skurfer
Copy link
Member

@skurfer skurfer commented Aug 20, 2012

This should fix

I’ve added LaunchAtLoginController as a submodule, but we may need to reconsider that. See Mozketo/LaunchAtLoginController#6. So as it stands now, if this were to be merged, every Quicksilver developer will have to make the change locally (until we go to ARC and 64-bit only).

I’m considering a pull request, but the only other pull request has been open for a year, so there’s no telling if the fix would ever get merged. So if we don’t like the way it is now, we could fork the project and use our fork as the submodule, or since it’s just two files, we could copy the files into the repo and be done with it. Thoughts?

UPDATE

After discussing with @pjrobertson, I've just added the files to the repo (with the fix included). This should be ready.

skurfer added 2 commits Aug 20, 2012
* adding LaunchAtLoginController files to the repo

We did this to incorporate a one-line fix for Mozketo/LaunchAtLoginController#6
@skurfer
Copy link
Member Author

skurfer commented Aug 23, 2012

Note: This will cause a merge conflict with #1056 as they both add new files to the Xcode project, but it's easy to resolve. There are two conflicts in Quicksilver.xcodeproj/project.pbxproj. For both of them, just accept the changes on both sides.

@HenningJ
Copy link
Contributor

HenningJ commented Aug 23, 2012

Tested this on 10.6. and it works great :-)

@pjrobertson
Copy link
Member

pjrobertson commented Aug 23, 2012

Great. Merging... let's get ß70 out!

pjrobertson added a commit that referenced this pull request Aug 23, 2012
@pjrobertson pjrobertson merged commit 19beed0 into quicksilver:master Aug 23, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants