Merge lp://qastaging/~vikoadi/pantheon-photos/no-shotwell into lp://qastaging/~pantheon-photos/pantheon-photos/trunk

Proposed by Viko Adi Rahmawan
Status: Merged
Approved by: Danielle Foré
Approved revision: 2779
Merged at revision: 2847
Proposed branch: lp://qastaging/~vikoadi/pantheon-photos/no-shotwell
Merge into: lp://qastaging/~pantheon-photos/pantheon-photos/trunk
Diff against target: 1065 lines (+175/-175)
37 files modified
Makefile (+71/-71)
misc/org.pantheon.photos-extras.gschema.xml (+2/-2)
misc/org.pantheon.photos.gschema.xml (+38/-38)
misc/pantheon-photos-viewer.desktop.head (+1/-1)
misc/pantheon-photos-viewer.desktop.tail (+1/-1)
misc/pantheon-photos.appdata.xml (+1/-1)
misc/pantheon-photos.desktop.head (+1/-1)
misc/pantheon-photos.desktop.tail (+1/-1)
plugins/shotwell-publishing-extras/TumblrPublishing.vala (+1/-1)
plugins/shotwell-publishing-extras/YandexPublishing.vala (+1/-1)
plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala (+1/-1)
plugins/shotwell-publishing/FacebookPublishing.vala (+1/-1)
plugins/shotwell-publishing/FlickrPublishing.vala (+1/-1)
plugins/shotwell-publishing/PicasaPublishing.vala (+1/-1)
plugins/shotwell-publishing/PiwigoPublishing.vala (+1/-1)
plugins/shotwell-publishing/YouTubePublishing.vala (+1/-1)
plugins/shotwell-publishing/shotwell-publishing.vala (+1/-1)
plugins/shotwell-transitions/BlindsEffect.vala (+1/-1)
plugins/shotwell-transitions/ChessEffect.vala (+1/-1)
plugins/shotwell-transitions/CircleEffect.vala (+1/-1)
plugins/shotwell-transitions/CirclesEffect.vala (+1/-1)
plugins/shotwell-transitions/ClockEffect.vala (+1/-1)
plugins/shotwell-transitions/CrumbleEffect.vala (+1/-1)
plugins/shotwell-transitions/FadeEffect.vala (+1/-1)
plugins/shotwell-transitions/SlideEffect.vala (+1/-1)
plugins/shotwell-transitions/SquaresEffect.vala (+1/-1)
plugins/shotwell-transitions/StripesEffect.vala (+1/-1)
plugins/shotwell-transitions/shotwell-transitions.vala (+1/-1)
samples/simple-plugin/simple-plugin.vala (+1/-1)
src/AppDirs.vala (+11/-11)
src/Application.vala (+2/-2)
src/UnityProgressBar.vala (+1/-1)
src/config/GSettingsEngine.vala (+4/-4)
src/plugins/StandardHostInterface.vala (+4/-4)
src/publishing/Publishing.vala (+4/-4)
src/slideshow/Slideshow.vala (+10/-10)
src/slideshow/TransitionEffects.vala (+2/-2)
To merge this branch: bzr merge lp://qastaging/~vikoadi/pantheon-photos/no-shotwell
Reviewer Review Type Date Requested Status
Danielle Foré testing Approve
elementary Apps team Pending
Review via email: mp+278257@code.qastaging.launchpad.net

Commit message

rename all shotwell installable files into pantheon-photos

Description of the change

rename all shotwell installable file into pantheon-photos
the goal is to make pantheon-photos installable side by side with shotwell

To post a comment you must log in.
Revision history for this message
Shawn McTear (syst3mfailur3) wrote :

I'm not a part of the dev team so I could be wrong about this, wouldn't it make more sense to change "org.yorba.pantheon-photos" to "org.pantheon.photos"?

2777. By Viko Adi Rahmawan

replace yorba.pantheon-photos into pantheon.photos

2778. By Viko Adi Rahmawan

rename plugins id too

2779. By Viko Adi Rahmawan

replace remaining yorba

Revision history for this message
Viko Adi Rahmawan (vikoadi) wrote :

replace yorba.pantheon-photos into pantheon.photos

Revision history for this message
Danielle Foré (danrabbit) wrote :

Looks like (excluding po files) there are still quite a few instances of shotwell. Not sure how much you want to fully eradicate or not, but grep -r "shotwell" shows a lot. Just from testing here, it looks like I can install Photos and Shotwell side-by-side without issues :) So if that is the full scope of this branch, I would say it works as expected.

review: Approve (testing)

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