Photos

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

  1. no-shotwell
  2. Merge into trunk
Proposed by Viko Adi Rahmawan
Status: Merged
Approved by: Danielle Foré
Approved revision: 2779
Merged at revision: 2847
Proposed branch: lp:~vikoadi/pantheon-photos/no-shotwell
Merge into: lp:~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:~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.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"?

lp:~vikoadi/pantheon-photos/no-shotwell updated
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
1=== modified file 'Makefile'
2--- Makefile 2015-08-16 08:05:52 +0000
3+++ Makefile 2015-11-26 01:54:51 +0000
4@@ -1,6 +1,6 @@
5-PROGRAM = shotwell
6-PROGRAM_THUMBNAILER = shotwell-video-thumbnailer
7-PROGRAM_MIGRATOR = shotwell-settings-migrator
8+PROGRAM = pantheon-photos
9+PROGRAM_THUMBNAILER = pantheon-photos-video-thumbnailer
10+PROGRAM_MIGRATOR = pantheon-photos-settings-migrator
11
12 VERSION = 0.1.1
13 GITVER := $(shell git log -n 1 2>/dev/null | head -n 1 | awk '{print $$2}')
14@@ -27,7 +27,7 @@
15
16 -include configure.mk
17 ifndef LIBEXECDIR
18-LIBEXECDIR=$(PREFIX)/libexec/shotwell
19+LIBEXECDIR=$(PREFIX)/libexec/pantheon-photos
20 endif
21
22 CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS)
23@@ -146,14 +146,14 @@
24 trash.ui
25
26 SYS_INTEGRATION_FILES = \
27- shotwell.appdata.xml \
28- shotwell.desktop.head \
29- shotwell.desktop.tail \
30- shotwell-viewer.desktop.head \
31- shotwell-viewer.desktop.tail \
32- org.yorba.shotwell.gschema.xml \
33- org.yorba.shotwell-extras.gschema.xml \
34- shotwell.convert
35+ pantheon-photos.appdata.xml \
36+ pantheon-photos.desktop.head \
37+ pantheon-photos.desktop.tail \
38+ pantheon-photos-viewer.desktop.head \
39+ pantheon-photos-viewer.desktop.tail \
40+ org.pantheon.photos.gschema.xml \
41+ org.pantheon.photos-extras.gschema.xml \
42+ pantheon-photos.convert
43
44 SCHEMA_FILES := $(shell ls misc/*.gschema.xml)
45
46@@ -305,7 +305,7 @@
47 DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Photo Viewer"
48 DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Photo Viewer"
49 DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer"
50-TEMPORARY_DESKTOP_FILES = misc/shotwell.desktop misc/shotwell-viewer.desktop
51+TEMPORARY_DESKTOP_FILES = misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
52
53 # Process the units
54 UNIT_MKS := $(foreach unit,$(UNITS),src/$(unit)/mk/$(notdir $(unit)).mk)
55@@ -441,45 +441,45 @@
56 cp $(DIST_TAR_XZ) $(PACKAGE_ORIG_XZ)
57 rm -f $(DIST_TAR_XZ)
58
59-misc/shotwell.desktop: misc/shotwell.desktop.head misc/shotwell.desktop.tail $(EXPANDED_CORE_PO_FILES)
60- cp misc/shotwell.desktop.head misc/shotwell.desktop
61+misc/pantheon-photos.desktop: misc/pantheon-photos.desktop.head misc/pantheon-photos.desktop.tail $(EXPANDED_CORE_PO_FILES)
62+ cp misc/pantheon-photos.desktop.head misc/pantheon-photos.desktop
63 @ $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
64 LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
65- >> misc/shotwell.desktop ; \
66+ >> misc/pantheon-photos.desktop ; \
67 echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
68- gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \
69+ gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos.desktop ; \
70 echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
71- --domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \
72+ --domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/pantheon-photos.desktop ; \
73 echo Keywords[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
74- --domain=shotwell $(DESKTOP_APP_KEYWORDS)` >> misc/shotwell.desktop ;)
75- cat misc/shotwell.desktop.tail >> misc/shotwell.desktop
76+ --domain=shotwell $(DESKTOP_APP_KEYWORDS)` >> misc/pantheon-photos.desktop ;)
77+ cat misc/pantheon-photos.desktop.tail >> misc/pantheon-photos.desktop
78 ifndef DISABLE_DESKTOP_VALIDATE
79- @ desktop-file-validate misc/shotwell.desktop 1>misc/shotwell.desktop.errors 2>&1; \
80- if test -s misc/shotwell.desktop.errors; then \
81- echo -e "\nThe file misc/shotwell.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/shotwell.desktop.errors for details."; \
82+ @ desktop-file-validate misc/pantheon-photos.desktop 1>misc/pantheon-photos.desktop.errors 2>&1; \
83+ if test -s misc/pantheon-photos.desktop.errors; then \
84+ echo -e "\nThe file misc/pantheon-photos.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/pantheon-photos.desktop.errors for details."; \
85 exit 1; \
86- else rm -f misc/shotwell.desktop.errors; \
87+ else rm -f misc/pantheon-photos.desktop.errors; \
88 fi
89 endif
90
91-misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop.tail $(EXPANDED_CORE_PO_FILES)
92- cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
93+misc/pantheon-photos-viewer.desktop: misc/pantheon-photos-viewer.desktop.head misc/pantheon-photos-viewer.desktop.tail $(EXPANDED_CORE_PO_FILES)
94+ cp misc/pantheon-photos-viewer.desktop.head misc/pantheon-photos-viewer.desktop
95 $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
96- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \
97+ --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/pantheon-photos-viewer.desktop ; \
98 echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
99- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
100- cat misc/shotwell-viewer.desktop.tail >> misc/shotwell-viewer.desktop
101+ --domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos-viewer.desktop ;)
102+ cat misc/pantheon-photos-viewer.desktop.tail >> misc/pantheon-photos-viewer.desktop
103 ifndef DISABLE_DESKTOP_VALIDATE
104- @ desktop-file-validate misc/shotwell-viewer.desktop 1>misc/shotwell-viewer.desktop.errors 2>&1; \
105- if test -s misc/shotwell-viewer.desktop.errors; then \
106- echo -e S"\nThe file misc/shotwell-viewer.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/shotwell-viewer.desktop.errors for details."; \
107+ @ desktop-file-validate misc/pantheon-photos-viewer.desktop 1>misc/pantheon-photos-viewer.desktop.errors 2>&1; \
108+ if test -s misc/pantheon-photos-viewer.desktop.errors; then \
109+ echo -e S"\nThe file misc/pantheon-photos-viewer.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/pantheon-photos-viewer.desktop.errors for details."; \
110 exit 1; \
111- else rm -f misc/shotwell-viewer.desktop.errors; \
112+ else rm -f misc/pantheon-photos-viewer.desktop.errors; \
113 fi
114 endif
115
116 .PHONY: desktop
117-desktop: misc/shotwell.desktop misc/shotwell-viewer.desktop
118+desktop: misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
119
120 .PHONY: dist
121 dist:
122@@ -501,30 +501,30 @@
123 mkdir -p $(DESTDIR)$(LIBEXECDIR)
124 $(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(LIBEXECDIR)
125 $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(LIBEXECDIR)
126- mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
127- $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
128+ mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
129+ $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
130 mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/actions/
131 $(INSTALL_DATA) icons/pin-toolbar.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/actions/
132 mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
133- $(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
134- $(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
135+ $(INSTALL_DATA) misc/org.pantheon.photos.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
136+ $(INSTALL_DATA) misc/org.pantheon.photos-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
137 ifndef DISABLE_SCHEMAS_COMPILE
138 glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
139 endif
140 ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
141 mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
142- $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings
143+ $(INSTALL_DATA) misc/pantheon-photos.convert $(DESTDIR)/usr/share/GConf/gsettings
144 endif
145 ifndef DISABLE_ICON_UPDATE
146 -gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
147 endif
148- mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/ui
149- $(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/shotwell/ui
150+ mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
151+ $(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
152 mkdir -p $(DESTDIR)$(PREFIX)/share/applications
153 mkdir -p $(DESTDIR)$(PREFIX)/share/appdata
154- $(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)$(PREFIX)/share/applications
155- $(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
156- $(INSTALL_DATA) misc/shotwell.appdata.xml $(DESTDIR)$(PREFIX)/share/appdata
157+ $(INSTALL_DATA) misc/pantheon-photos.desktop $(DESTDIR)$(PREFIX)/share/applications
158+ $(INSTALL_DATA) misc/pantheon-photos-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
159+ $(INSTALL_DATA) misc/pantheon-photos.appdata.xml $(DESTDIR)$(PREFIX)/share/appdata
160 ifndef DISABLE_DESKTOP_UPDATE
161 -update-desktop-database || :
162 endif
163@@ -533,28 +533,28 @@
164 $(INSTALL_DATA) apport/shotwell.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks
165 endif
166 ifndef DISABLE_HELP_INSTALL
167- mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
168- $(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
169- mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
170- $(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
171+ mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
172+ $(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
173+ mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
174+ $(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
175 endif
176 -$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
177 $(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
178- $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
179- mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
180- $(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
181+ $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
182+ mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
183+ $(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
184 ifdef PLUGINS_RC
185- $(INSTALL_DATA) $(PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
186+ $(INSTALL_DATA) $(PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
187 endif
188 ifndef DISABLE_EXTRA_PLUGINS_INSTALL
189- $(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
190+ $(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
191 ifdef EXTRA_PLUGINS_RC
192- $(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
193+ $(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
194 endif
195 endif
196 ifdef INSTALL_HEADERS
197- mkdir -p $(DESTDIR)$(PREFIX)/include/shotwell/plugins
198- $(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/shotwell/plugins
199+ mkdir -p $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
200+ $(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
201 mkdir -p $(DESTDIR)$(PREFIX)/share/vala/vapi
202 $(INSTALL_DATA) $(PLUGIN_VAPI) $(DESTDIR)$(PREFIX)/share/vala/vapi
203 $(INSTALL_DATA) $(PLUGIN_DEPS) $(DESTDIR)$(PREFIX)/share/vala/vapi
204@@ -569,37 +569,37 @@
205 rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_MIGRATOR)
206 rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_THUMBNAILER)
207 rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_MIGRATOR)
208- rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
209- rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/shotwell.svg
210- rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
211- rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
212- rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell.desktop
213- rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell-viewer.desktop
214- rm -f $(DESTDIR)$(PREFIX)/share/appdata/shotwell.appdata.xml
215+ rm -fr $(DESTDIR)$(PREFIX)/share/pantheon-photos
216+ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/pantheon-photos.svg
217+ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/pantheon-photos.svg
218+ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/pantheon-photos.svg
219+ rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos.desktop
220+ rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos-viewer.desktop
221+ rm -f $(DESTDIR)$(PREFIX)/share/appdata/pantheon-photos.appdata.xml
222 ifndef DISABLE_DESKTOP_UPDATE
223 -update-desktop-database || :
224 endif
225 ifndef DISABLE_HELP_INSTALL
226- rm -rf $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell
227+ rm -rf $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos
228 endif
229 ifdef ENABLE_APPORT_HOOK_INSTALL
230 rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/shotwell.py
231 endif
232- $(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
233- rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
234+ $(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
235+ rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
236 ifdef INSTALL_HEADERS
237- rm -rf $(DESTDIR)$(PREFIX)/include/shotwell
238+ rm -rf $(DESTDIR)$(PREFIX)/include/pantheon-photos
239 rm -f $(foreach vapi,$(PLUGIN_VAPI),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(vapi)))
240 rm -f $(foreach dep,$(PLUGIN_DEPS),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(dep)))
241 rm -f $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig/$(PC_FILE)
242 endif
243- rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
244- rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
245+ rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.pantheon.photos.gschema.xml
246+ rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.pantheon.photos-extras.gschema.xml
247 ifndef DISABLE_SCHEMAS_COMPILE
248 glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
249 endif
250 ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
251- rm -f $(DESTDIR)/usr/share/GConf/gsettings/shotwell.convert
252+ rm -f $(DESTDIR)/usr/share/GConf/gsettings/pantheon-photos.convert
253 endif
254
255 $(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
256@@ -659,7 +659,7 @@
257 docs:
258 # valadoc complains if the directory already exists
259 @rm -rf docs
260- valadoc --directory=docs --package-name=shotwell-plugin-dev --package-version=$(VERSION) --verbose \
261+ valadoc --directory=docs --package-name=pantheon-photos-plugin-dev --package-version=$(VERSION) --verbose \
262 --no-protected \
263 $(foreach def,$(DEFINES),--define=$(def)) \
264 $(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
265
266=== renamed file 'misc/org.yorba.shotwell-extras.gschema.xml' => 'misc/org.pantheon.photos-extras.gschema.xml'
267--- misc/org.yorba.shotwell-extras.gschema.xml 2012-09-26 22:57:58 +0000
268+++ misc/org.pantheon.photos-extras.gschema.xml 2015-11-26 01:54:51 +0000
269@@ -1,6 +1,6 @@
270 <schemalist>
271
272-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-yandex-fotki/">
273+ <schema id="org.pantheon.org-pantheon-photos-publishing-yandex-fotki" path="/org/pantheon/photos/sharing/org-pantheon-photos-publishing-yandex-fotki/">
274 <key name="auth-token" type="s">
275 <default>""</default>
276 <summary>authentication token</summary>
277@@ -8,7 +8,7 @@
278 </key>
279 </schema>
280
281-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-tumblr" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-tumblr/">
282+<schema id="org.pantheon.photos.sharing.org-pantheon-photos-publishing-tumblr" path="/org/pantheon/photos/sharing/org-pantheon-photos-publishing-tumblr/">
283 <key name="token" type="s">
284 <default>""</default>
285 <summary>Token</summary>
286
287=== renamed file 'misc/org.yorba.shotwell.gschema.xml' => 'misc/org.pantheon.photos.gschema.xml'
288--- misc/org.yorba.shotwell.gschema.xml 2015-09-07 18:27:19 +0000
289+++ misc/org.pantheon.photos.gschema.xml 2015-11-26 01:54:51 +0000
290@@ -1,22 +1,22 @@
291 <schemalist>
292
293-<schema id="org.yorba.shotwell" path="/org/yorba/shotwell/">
294- <child name="preferences" schema="org.yorba.shotwell.preferences" />
295- <child name="sharing" schema="org.yorba.shotwell.sharing" />
296- <child name="video" schema="org.yorba.shotwell.video" />
297- <child name="printing" schema="org.yorba.shotwell.printing" />
298- <child name="plugins" schema="org.yorba.shotwell.plugins" />
299-</schema>
300-
301-<schema id="org.yorba.shotwell.preferences" path="/org/yorba/shotwell/preferences/">
302- <child name="ui" schema="org.yorba.shotwell.preferences.ui" />
303- <child name="slideshow" schema="org.yorba.shotwell.preferences.slideshow" />
304- <child name="window" schema="org.yorba.shotwell.preferences.window" />
305- <child name="files" schema="org.yorba.shotwell.preferences.files" />
306- <child name="editing" schema="org.yorba.shotwell.preferences.editing" />
307-</schema>
308-
309-<schema id="org.yorba.shotwell.preferences.ui" path="/org/yorba/shotwell/preferences/ui/">
310+<schema id="org.pantheon.photos" path="/org/pantheon/photos/">
311+ <child name="preferences" schema="org.pantheon.photos.preferences" />
312+ <child name="sharing" schema="org.pantheon.photos.sharing" />
313+ <child name="video" schema="org.pantheon.photos.video" />
314+ <child name="printing" schema="org.pantheon.photos.printing" />
315+ <child name="plugins" schema="org.pantheon.photos.plugins" />
316+</schema>
317+
318+<schema id="org.pantheon.photos.preferences" path="/org/pantheon/photos/preferences/">
319+ <child name="ui" schema="org.pantheon.photos.preferences.ui" />
320+ <child name="slideshow" schema="org.pantheon.photos.preferences.slideshow" />
321+ <child name="window" schema="org.pantheon.photos.preferences.window" />
322+ <child name="files" schema="org.pantheon.photos.preferences.files" />
323+ <child name="editing" schema="org.pantheon.photos.preferences.editing" />
324+</schema>
325+
326+<schema id="org.pantheon.photos.preferences.ui" path="/org/pantheon/photos/preferences/ui/">
327 <key name="display-basic-properties" type="b">
328 <default>true</default>
329 <summary>display basic properties</summary>
330@@ -156,7 +156,7 @@
331 </key>
332 </schema>
333
334-<schema id="org.yorba.shotwell.preferences.slideshow" path="/org/yorba/shotwell/preferences/slideshow/">
335+<schema id="org.pantheon.photos.preferences.slideshow" path="/org/pantheon/photos/preferences/slideshow/">
336 <key name="delay" type="d">
337 <default>3.0</default>
338 <summary>delay</summary>
339@@ -182,7 +182,7 @@
340 </key>
341 </schema>
342
343-<schema id="org.yorba.shotwell.preferences.window" path="/org/yorba/shotwell/preferences/window/">
344+<schema id="org.pantheon.photos.preferences.window" path="/org/pantheon/photos/preferences/window/">
345 <key name="library-maximize" type="b">
346 <default>false</default>
347 <summary>maximize library window</summary>
348@@ -226,7 +226,7 @@
349 </key>
350 </schema>
351
352-<schema id="org.yorba.shotwell.preferences.files" path="/org/yorba/shotwell/preferences/files/">
353+<schema id="org.pantheon.photos.preferences.files" path="/org/pantheon/photos/preferences/files/">
354 <key name="import-dir" type="s">
355 <default>""</default>
356 <summary>import directory</summary>
357@@ -270,7 +270,7 @@
358 </key>
359 </schema>
360
361-<schema id="org.yorba.shotwell.crop-settings" path="/org/yorba/shotwell/crop-settings/">
362+<schema id="org.pantheon.photos.crop-settings" path="/org/pantheon/photos/crop-settings/">
363 <key name="last-crop-menu-choice" type="i">
364 <default>1</default>
365 <summary>Most-recently-used crop aspect ratio menu choice.</summary>
366@@ -288,7 +288,7 @@
367 </key>
368 </schema>
369
370-<schema id="org.yorba.shotwell.preferences.editing" path="/org/yorba/shotwell/preferences/editing/">
371+<schema id="org.pantheon.photos.preferences.editing" path="/org/pantheon/photos/preferences/editing/">
372 <key name="external-photo-editor" type="s">
373 <default>""</default>
374 <summary>external photo editor</summary>
375@@ -302,7 +302,7 @@
376 </key>
377 </schema>
378
379-<schema id="org.yorba.shotwell.sharing" path="/org/yorba/shotwell/sharing/">
380+<schema id="org.pantheon.photos.sharing" path="/org/pantheon/photos/sharing/">
381 <key name="last-used-service" type="s">
382 <default>""</default>
383 <summary>last used publishing service</summary>
384@@ -315,13 +315,13 @@
385 <description>A numeric code representing the last service to which photos were published</description>
386 </key>
387
388- <child name="facebook" schema="org.yorba.shotwell.sharing.facebook" />
389- <child name="flickr" schema="org.yorba.shotwell.sharing.flickr" />
390- <child name="picasa" schema="org.yorba.shotwell.sharing.picasa" />
391- <child name="youtube" schema="org.yorba.shotwell.sharing.youtube" />
392+ <child name="facebook" schema="org.pantheon.photos.sharing.facebook" />
393+ <child name="flickr" schema="org.pantheon.photos.sharing.flickr" />
394+ <child name="picasa" schema="org.pantheon.photos.sharing.picasa" />
395+ <child name="youtube" schema="org.pantheon.photos.sharing.youtube" />
396 </schema>
397
398-<schema id="org.yorba.shotwell.sharing.facebook" path="/org/yorba/shotwell/sharing/facebook/">
399+<schema id="org.pantheon.photos.sharing.facebook" path="/org/pantheon/photos/sharing/facebook/">
400 <key name="access-token" type="s">
401 <default>""</default>
402 <summary>access token</summary>
403@@ -353,7 +353,7 @@
404 </key>
405 </schema>
406
407-<schema id="org.yorba.shotwell.sharing.flickr" path="/org/yorba/shotwell/sharing/flickr/">
408+<schema id="org.pantheon.photos.sharing.flickr" path="/org/pantheon/photos/sharing/flickr/">
409 <key name="access-phase-token" type="s">
410 <default>""</default>
411 <summary>OAuth Access Phase Token</summary>
412@@ -391,7 +391,7 @@
413 </key>
414 </schema>
415
416-<schema id="org.yorba.shotwell.sharing.picasa" path="/org/yorba/shotwell/sharing/picasa/">
417+<schema id="org.pantheon.photos.sharing.picasa" path="/org/pantheon/photos/sharing/picasa/">
418 <key name="refresh-token" type="s">
419 <default>""</default>
420 <summary>refresh token</summary>
421@@ -417,7 +417,7 @@
422 </key>
423 </schema>
424
425-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-piwigo/">
426+<schema id="org.pantheon.photos.sharing.org-pantheon-photos-publishing-piwigo" path="/org/pantheon/photos/sharing/org-pantheon-photos-publishing-piwigo/">
427 <key name="url" type="s">
428 <default>""</default>
429 <summary>Piwigio URL</summary>
430@@ -479,7 +479,7 @@
431 </key>
432 </schema>
433
434-<schema id="org.yorba.shotwell.sharing.youtube" path="/org/yorba/shotwell/sharing/youtube/">
435+<schema id="org.pantheon.photos.sharing.youtube" path="/org/pantheon/photos/sharing/youtube/">
436 <key name="refresh-token" type="s">
437 <default>""</default>
438 <summary>refresh token</summary>
439@@ -487,7 +487,7 @@
440 </key>
441 </schema>
442
443-<schema id="org.yorba.shotwell.dataimports" path="/org/yorba/shotwell/dataimports/">
444+<schema id="org.pantheon.photos.dataimports" path="/org/pantheon/photos/dataimports/">
445 <key name="last-used-dataimports-service" type="s">
446 <default>""</default>
447 <summary>last used import service</summary>
448@@ -495,7 +495,7 @@
449 </key>
450 </schema>
451
452-<schema id="org.yorba.shotwell.video" path="/org/yorba/shotwell/video/">
453+<schema id="org.pantheon.photos.video" path="/org/pantheon/photos/video/">
454 <key name="interpreter-state-cookie" type="i">
455 <default>-1</default>
456 <summary>interpreter state cookie</summary>
457@@ -503,7 +503,7 @@
458 </key>
459 </schema>
460
461-<schema id="org.yorba.shotwell.printing" path="/org/yorba/shotwell/printing/">
462+<schema id="org.pantheon.photos.printing" path="/org/pantheon/photos/printing/">
463 <key name="content-layout" type="i">
464 <default>3</default>
465 <summary>content layout mode</summary>
466@@ -565,11 +565,11 @@
467 </key>
468 </schema>
469
470-<schema id="org.yorba.shotwell.plugins" path="/org/yorba/shotwell/plugins/" >
471- <child name="enable-state" schema="org.yorba.shotwell.plugins.enable-state" />
472+<schema id="org.pantheon.photos.plugins" path="/org/pantheon/photos/plugins/" >
473+ <child name="enable-state" schema="org.pantheon.photos.plugins.enable-state" />
474 </schema>
475
476-<schema id="org.yorba.shotwell.plugins.enable-state" path="/org/yorba/shotwell/plugins/enable-state/" >
477+<schema id="org.pantheon.photos.plugins.enable-state" path="/org/pantheon/photos/plugins/enable-state/" >
478 <key name="publishing-facebook" type="b">
479 <default>true</default>
480 <summary>enable facebook publishing plugin</summary>
481
482=== renamed file 'misc/shotwell-viewer.desktop.head' => 'misc/pantheon-photos-viewer.desktop.head'
483--- misc/shotwell-viewer.desktop.head 2014-09-04 12:31:29 +0000
484+++ misc/pantheon-photos-viewer.desktop.head 2015-11-26 01:54:51 +0000
485@@ -2,7 +2,7 @@
486 Version=1.0
487 Name=Photo Viewer
488 GenericName=Photo Viewer
489-Exec=shotwell %f
490+Exec=pantheon-photos %f
491 Icon=multimedia-photo-viewer
492 Terminal=false
493 NoDisplay=true
494
495=== renamed file 'misc/shotwell-viewer.desktop.tail' => 'misc/pantheon-photos-viewer.desktop.tail'
496--- misc/shotwell-viewer.desktop.tail 2014-09-04 12:31:29 +0000
497+++ misc/pantheon-photos-viewer.desktop.tail 2015-11-26 01:54:51 +0000
498@@ -1,3 +1,3 @@
499 [Desktop Action AboutDialog]
500 Name=About Photos
501-Exec=shotwell --about
502\ No newline at end of file
503+Exec=pantheon-photos --about
504
505=== renamed file 'misc/shotwell.appdata.xml' => 'misc/pantheon-photos.appdata.xml'
506--- misc/shotwell.appdata.xml 2013-10-02 00:04:14 +0000
507+++ misc/pantheon-photos.appdata.xml 2015-11-26 01:54:51 +0000
508@@ -1,7 +1,7 @@
509 <?xml version="1.0" encoding="UTF-8"?>
510 <!-- Copyright 2013 Yorba Foundation (shotwell@yorba.org) -->
511 <application>
512- <id type="desktop">shotwell.desktop</id>
513+ <id type="desktop">pantheon-photos.desktop</id>
514 <licence>CC0</licence>
515 <summary>Popular photo manager</summary>
516 <description>
517
518=== renamed file 'misc/shotwell.convert' => 'misc/pantheon-photos.convert'
519=== renamed file 'misc/shotwell.desktop.head' => 'misc/pantheon-photos.desktop.head'
520--- misc/shotwell.desktop.head 2014-12-11 18:40:52 +0000
521+++ misc/pantheon-photos.desktop.head 2015-11-26 01:54:51 +0000
522@@ -4,7 +4,7 @@
523 GenericName=Photo Manager
524 Comment=Organize your photos
525 Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;
526-Exec=shotwell %U
527+Exec=pantheon-photos %U
528 Icon=multimedia-photo-manager
529 Terminal=false
530 Type=Application
531
532=== renamed file 'misc/shotwell.desktop.tail' => 'misc/pantheon-photos.desktop.tail'
533--- misc/shotwell.desktop.tail 2014-09-04 12:20:54 +0000
534+++ misc/pantheon-photos.desktop.tail 2015-11-26 01:54:51 +0000
535@@ -1,3 +1,3 @@
536 [Desktop Action AboutDialog]
537 Name=About Photos
538-Exec=shotwell --about
539\ No newline at end of file
540+Exec=pantheon-photos --about
541
542=== modified file 'plugins/shotwell-publishing-extras/TumblrPublishing.vala'
543--- plugins/shotwell-publishing-extras/TumblrPublishing.vala 2014-08-08 21:13:09 +0000
544+++ plugins/shotwell-publishing-extras/TumblrPublishing.vala 2015-11-26 01:54:51 +0000
545@@ -23,7 +23,7 @@
546 }
547
548 public unowned string get_id () {
549- return "org.yorba.shotwell.publishing.tumblr";
550+ return "org.pantheon.photos.publishing.tumblr";
551 }
552
553 public unowned string get_pluggable_name () {
554
555=== modified file 'plugins/shotwell-publishing-extras/YandexPublishing.vala'
556--- plugins/shotwell-publishing-extras/YandexPublishing.vala 2014-08-08 21:13:09 +0000
557+++ plugins/shotwell-publishing-extras/YandexPublishing.vala 2015-11-26 01:54:51 +0000
558@@ -10,7 +10,7 @@
559 }
560
561 public unowned string get_id () {
562- return "org.yorba.shotwell.publishing.yandex-fotki";
563+ return "org.pantheon.photos.publishing.yandex-fotki";
564 }
565
566 public unowned string get_pluggable_name () {
567
568=== modified file 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala'
569--- plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala 2014-08-08 21:13:09 +0000
570+++ plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala 2015-11-26 01:54:51 +0000
571@@ -23,7 +23,7 @@
572 }
573
574 public unowned string get_id () {
575- return "org.yorba.shotwell.publishing.extras";
576+ return "org.pantheon.photos.publishing.extras";
577 }
578
579 public unowned Spit.Pluggable[]? get_pluggables () {
580
581=== modified file 'plugins/shotwell-publishing/FacebookPublishing.vala'
582--- plugins/shotwell-publishing/FacebookPublishing.vala 2015-06-06 17:11:18 +0000
583+++ plugins/shotwell-publishing/FacebookPublishing.vala 2015-11-26 01:54:51 +0000
584@@ -20,7 +20,7 @@
585 }
586
587 public unowned string get_id () {
588- return "org.yorba.shotwell.publishing.facebook";
589+ return "org.pantheon.photos.publishing.facebook";
590 }
591
592 public unowned string get_pluggable_name () {
593
594=== modified file 'plugins/shotwell-publishing/FlickrPublishing.vala'
595--- plugins/shotwell-publishing/FlickrPublishing.vala 2015-03-13 11:01:50 +0000
596+++ plugins/shotwell-publishing/FlickrPublishing.vala 2015-11-26 01:54:51 +0000
597@@ -22,7 +22,7 @@
598 }
599
600 public unowned string get_id () {
601- return "org.yorba.shotwell.publishing.flickr";
602+ return "org.pantheon.photos.publishing.flickr";
603 }
604
605 public unowned string get_pluggable_name () {
606
607=== modified file 'plugins/shotwell-publishing/PicasaPublishing.vala'
608--- plugins/shotwell-publishing/PicasaPublishing.vala 2014-08-08 21:13:09 +0000
609+++ plugins/shotwell-publishing/PicasaPublishing.vala 2015-11-26 01:54:51 +0000
610@@ -20,7 +20,7 @@
611 }
612
613 public unowned string get_id () {
614- return "org.yorba.shotwell.publishing.picasa";
615+ return "org.pantheon.photos.publishing.picasa";
616 }
617
618 public unowned string get_pluggable_name () {
619
620=== modified file 'plugins/shotwell-publishing/PiwigoPublishing.vala'
621--- plugins/shotwell-publishing/PiwigoPublishing.vala 2014-08-08 21:13:09 +0000
622+++ plugins/shotwell-publishing/PiwigoPublishing.vala 2015-11-26 01:54:51 +0000
623@@ -20,7 +20,7 @@
624 }
625
626 public unowned string get_id () {
627- return "org.yorba.shotwell.publishing.piwigo";
628+ return "org.pantheon.photos.publishing.piwigo";
629 }
630
631 public unowned string get_pluggable_name () {
632
633=== modified file 'plugins/shotwell-publishing/YouTubePublishing.vala'
634--- plugins/shotwell-publishing/YouTubePublishing.vala 2014-08-08 21:13:09 +0000
635+++ plugins/shotwell-publishing/YouTubePublishing.vala 2015-11-26 01:54:51 +0000
636@@ -20,7 +20,7 @@
637 }
638
639 public unowned string get_id () {
640- return "org.yorba.shotwell.publishing.youtube";
641+ return "org.pantheon.photos.publishing.youtube";
642 }
643
644 public unowned string get_pluggable_name () {
645
646=== modified file 'plugins/shotwell-publishing/shotwell-publishing.vala'
647--- plugins/shotwell-publishing/shotwell-publishing.vala 2014-08-08 21:13:09 +0000
648+++ plugins/shotwell-publishing/shotwell-publishing.vala 2015-11-26 01:54:51 +0000
649@@ -31,7 +31,7 @@
650 }
651
652 public unowned string get_id () {
653- return "org.yorba.shotwell.publishing.core_services";
654+ return "org.pantheon.photos.publishing.core_services";
655 }
656
657 public unowned Spit.Pluggable[]? get_pluggables () {
658
659=== modified file 'plugins/shotwell-transitions/BlindsEffect.vala'
660--- plugins/shotwell-transitions/BlindsEffect.vala 2014-08-08 21:13:09 +0000
661+++ plugins/shotwell-transitions/BlindsEffect.vala 2015-11-26 01:54:51 +0000
662@@ -13,7 +13,7 @@
663 }
664
665 public override unowned string get_id () {
666- return "org.yorba.shotwell.transitions.blinds";
667+ return "org.pantheon.photos.transitions.blinds";
668 }
669
670 public override unowned string get_pluggable_name () {
671
672=== modified file 'plugins/shotwell-transitions/ChessEffect.vala'
673--- plugins/shotwell-transitions/ChessEffect.vala 2014-08-08 21:13:09 +0000
674+++ plugins/shotwell-transitions/ChessEffect.vala 2015-11-26 01:54:51 +0000
675@@ -13,7 +13,7 @@
676 }
677
678 public override unowned string get_id () {
679- return "org.yorba.shotwell.transitions.chess";
680+ return "org.pantheon.photos.transitions.chess";
681 }
682
683 public override unowned string get_pluggable_name () {
684
685=== modified file 'plugins/shotwell-transitions/CircleEffect.vala'
686--- plugins/shotwell-transitions/CircleEffect.vala 2014-08-08 21:13:09 +0000
687+++ plugins/shotwell-transitions/CircleEffect.vala 2015-11-26 01:54:51 +0000
688@@ -13,7 +13,7 @@
689 }
690
691 public override unowned string get_id () {
692- return "org.yorba.shotwell.transitions.circle";
693+ return "org.pantheon.photos.transitions.circle";
694 }
695
696 public override unowned string get_pluggable_name () {
697
698=== modified file 'plugins/shotwell-transitions/CirclesEffect.vala'
699--- plugins/shotwell-transitions/CirclesEffect.vala 2014-08-08 21:13:09 +0000
700+++ plugins/shotwell-transitions/CirclesEffect.vala 2015-11-26 01:54:51 +0000
701@@ -13,7 +13,7 @@
702 }
703
704 public override unowned string get_id () {
705- return "org.yorba.shotwell.transitions.circles";
706+ return "org.pantheon.photos.transitions.circles";
707 }
708
709 public override unowned string get_pluggable_name () {
710
711=== modified file 'plugins/shotwell-transitions/ClockEffect.vala'
712--- plugins/shotwell-transitions/ClockEffect.vala 2014-08-08 21:13:09 +0000
713+++ plugins/shotwell-transitions/ClockEffect.vala 2015-11-26 01:54:51 +0000
714@@ -13,7 +13,7 @@
715 }
716
717 public override unowned string get_id () {
718- return "org.yorba.shotwell.transitions.clock";
719+ return "org.pantheon.photos.transitions.clock";
720 }
721
722 public override unowned string get_pluggable_name () {
723
724=== modified file 'plugins/shotwell-transitions/CrumbleEffect.vala'
725--- plugins/shotwell-transitions/CrumbleEffect.vala 2014-08-08 21:13:09 +0000
726+++ plugins/shotwell-transitions/CrumbleEffect.vala 2015-11-26 01:54:51 +0000
727@@ -13,7 +13,7 @@
728 }
729
730 public override unowned string get_id () {
731- return "org.yorba.shotwell.transitions.crumble";
732+ return "org.pantheon.photos.transitions.crumble";
733 }
734
735 public override unowned string get_pluggable_name () {
736
737=== modified file 'plugins/shotwell-transitions/FadeEffect.vala'
738--- plugins/shotwell-transitions/FadeEffect.vala 2014-08-08 21:13:09 +0000
739+++ plugins/shotwell-transitions/FadeEffect.vala 2015-11-26 01:54:51 +0000
740@@ -13,7 +13,7 @@
741 }
742
743 public override unowned string get_id () {
744- return "org.yorba.shotwell.transitions.fade";
745+ return "org.pantheon.photos.transitions.fade";
746 }
747
748 public override unowned string get_pluggable_name () {
749
750=== modified file 'plugins/shotwell-transitions/SlideEffect.vala'
751--- plugins/shotwell-transitions/SlideEffect.vala 2014-08-08 21:13:09 +0000
752+++ plugins/shotwell-transitions/SlideEffect.vala 2015-11-26 01:54:51 +0000
753@@ -13,7 +13,7 @@
754 }
755
756 public override unowned string get_id () {
757- return "org.yorba.shotwell.transitions.slide";
758+ return "org.pantheon.photos.transitions.slide";
759 }
760
761 public override unowned string get_pluggable_name () {
762
763=== modified file 'plugins/shotwell-transitions/SquaresEffect.vala'
764--- plugins/shotwell-transitions/SquaresEffect.vala 2014-08-08 21:13:09 +0000
765+++ plugins/shotwell-transitions/SquaresEffect.vala 2015-11-26 01:54:51 +0000
766@@ -13,7 +13,7 @@
767 }
768
769 public override unowned string get_id () {
770- return "org.yorba.shotwell.transitions.squares";
771+ return "org.pantheon.photos.transitions.squares";
772 }
773
774 public override unowned string get_pluggable_name () {
775
776=== modified file 'plugins/shotwell-transitions/StripesEffect.vala'
777--- plugins/shotwell-transitions/StripesEffect.vala 2014-08-08 21:13:09 +0000
778+++ plugins/shotwell-transitions/StripesEffect.vala 2015-11-26 01:54:51 +0000
779@@ -13,7 +13,7 @@
780 }
781
782 public override unowned string get_id () {
783- return "org.yorba.shotwell.transitions.stripes";
784+ return "org.pantheon.photos.transitions.stripes";
785 }
786
787 public override unowned string get_pluggable_name () {
788
789=== modified file 'plugins/shotwell-transitions/shotwell-transitions.vala'
790--- plugins/shotwell-transitions/shotwell-transitions.vala 2014-08-08 21:13:09 +0000
791+++ plugins/shotwell-transitions/shotwell-transitions.vala 2015-11-26 01:54:51 +0000
792@@ -33,7 +33,7 @@
793 }
794
795 public unowned string get_id () {
796- return "org.yorba.shotwell.transitions";
797+ return "org.pantheon.photos.transitions";
798 }
799
800 public unowned Spit.Pluggable[]? get_pluggables () {
801
802=== modified file 'samples/simple-plugin/simple-plugin.vala'
803--- samples/simple-plugin/simple-plugin.vala 2014-08-08 21:13:09 +0000
804+++ samples/simple-plugin/simple-plugin.vala 2015-11-26 01:54:51 +0000
805@@ -22,7 +22,7 @@
806
807 // Every module needs to have a unique ID.
808 public unowned string get_id () {
809- return "org.yorba.shotwell.samples.simple-plugin";
810+ return "org.pantheon.photos.samples.simple-plugin";
811 }
812
813 public unowned Spit.Pluggable[]? get_pluggables () {
814
815=== renamed file 'settings-migrator/shotwell-settings-migrator' => 'settings-migrator/pantheon-photos-settings-migrator'
816=== modified file 'src/AppDirs.vala'
817--- src/AppDirs.vala 2014-08-08 21:13:09 +0000
818+++ src/AppDirs.vala 2015-11-26 01:54:51 +0000
819@@ -5,7 +5,7 @@
820 */
821
822 class AppDirs {
823- private const string DEFAULT_DATA_DIR = "shotwell";
824+ private const string DEFAULT_DATA_DIR = "pantheon-photos";
825
826 private static File exec_dir;
827 private static File data_dir = null;
828@@ -181,7 +181,7 @@
829
830 public static File get_temp_dir () {
831 if (tmp_dir == null) {
832- tmp_dir = File.new_for_path (DirUtils.mkdtemp (Environment.get_tmp_dir () + "/shotwell-XXXXXX"));
833+ tmp_dir = File.new_for_path (DirUtils.mkdtemp (Environment.get_tmp_dir () + "/pantheon-photos-XXXXXX"));
834
835 try {
836 if (!tmp_dir.query_exists (null))
837@@ -230,14 +230,14 @@
838 public static File get_resources_dir () {
839 File? install_dir = get_install_dir ();
840
841- return (install_dir != null) ? install_dir.get_child ("share").get_child ("shotwell")
842+ return (install_dir != null) ? install_dir.get_child ("share").get_child ("pantheon-photos")
843 : get_exec_dir ();
844 }
845
846 public static File get_lib_dir () {
847 File? install_dir = get_install_dir ();
848
849- return (install_dir != null) ? install_dir.get_child (Resources.LIB).get_child ("shotwell")
850+ return (install_dir != null) ? install_dir.get_child (Resources.LIB).get_child ("pantheon-photos")
851 : get_exec_dir ();
852 }
853
854@@ -246,24 +246,24 @@
855 }
856
857 public static File get_user_plugins_dir () {
858- return get_home_dir ().get_child (".gnome2").get_child ("shotwell").get_child ("plugins");
859+ return get_home_dir ().get_child (".gnome2").get_child ("pantheon-photos").get_child ("plugins");
860 }
861
862 public static File? get_log_file () {
863- if (Environment.get_variable ("SHOTWELL_LOG_FILE") != null) {
864- if (Environment.get_variable ("SHOTWELL_LOG_FILE") == ":console:") {
865+ if (Environment.get_variable ("PANTHEON_PHOTOS_LOG_FILE") != null) {
866+ if (Environment.get_variable ("PANTHEON_PHOTOS_LOG_FILE") == ":console:") {
867 return null;
868 } else {
869- return File.new_for_path (Environment.get_variable ("SHOTWELL_LOG_FILE"));
870+ return File.new_for_path (Environment.get_variable ("PANTHEON_PHOTOS_LOG_FILE"));
871 }
872 } else {
873 return File.new_for_path (Environment.get_user_cache_dir ()).
874- get_child ("shotwell").get_child ("shotwell.log");
875+ get_child ("pantheon-photos").get_child ("pantheon-photos.log");
876 }
877 }
878
879 public static File get_thumbnailer_bin () {
880- const string filename = "shotwell-video-thumbnailer";
881+ const string filename = "pantheon-photos-video-thumbnailer";
882 File f = File.new_for_path (AppDirs.get_libexec_dir ().get_path () + "/thumbnailer/" + filename);
883 if (!f.query_exists ()) {
884 // If we're running installed.
885@@ -273,7 +273,7 @@
886 }
887
888 public static File get_settings_migrator_bin () {
889- const string filename = "shotwell-settings-migrator";
890+ const string filename = "pantheon-photos-settings-migrator";
891 File f = File.new_for_path (AppDirs.get_libexec_dir ().get_path () + "/settings-migrator/" + filename);
892 if (!f.query_exists ()) {
893 // If we're running installed.
894
895=== modified file 'src/Application.vala'
896--- src/Application.vala 2014-12-17 23:41:07 +0000
897+++ src/Application.vala 2015-11-26 01:54:51 +0000
898@@ -58,7 +58,7 @@
899 exec_name = GETTEXT_PACKAGE;
900 application_id = "org.elementaryos.pantheon-photos-direct";
901 app_icon = "multimedia-photo-viewer";
902- app_launcher = "shotwell-viewer.desktop";
903+ app_launcher = "pantheon-photos-viewer.desktop";
904 program_name = _("Photo Viewer");
905 Gtk.Settings.get_default().set("gtk-application-prefer-dark-theme", true);
906 flags = GLib.ApplicationFlags.HANDLES_OPEN | GLib.ApplicationFlags.NON_UNIQUE;
907@@ -70,7 +70,7 @@
908 exec_name = GETTEXT_PACKAGE;
909 application_id = "org.elementaryos.pantheon-photos";
910 app_icon = "multimedia-photo-manager";
911- app_launcher = "shotwell.desktop";
912+ app_launcher = "pantheon-photos.desktop";
913 program_name = _(build_release_name);
914 flags = GLib.ApplicationFlags.HANDLES_OPEN | GLib.ApplicationFlags.HANDLES_COMMAND_LINE;
915 }
916
917=== modified file 'src/UnityProgressBar.vala'
918--- src/UnityProgressBar.vala 2014-08-08 21:13:09 +0000
919+++ src/UnityProgressBar.vala 2015-11-26 01:54:51 +0000
920@@ -7,7 +7,7 @@
921 #if UNITY_SUPPORT
922 public class UnityProgressBar : Object {
923
924- private static Unity.LauncherEntry l = Unity.LauncherEntry.get_for_desktop_id ("shotwell.desktop");
925+ private static Unity.LauncherEntry l = Unity.LauncherEntry.get_for_desktop_id ("pantheon-photos.desktop");
926 private static UnityProgressBar? visible_uniprobar;
927
928 private double progress;
929
930=== modified file 'src/config/GSettingsEngine.vala'
931--- src/config/GSettingsEngine.vala 2015-09-07 18:27:19 +0000
932+++ src/config/GSettingsEngine.vala 2015-11-26 01:54:51 +0000
933@@ -5,7 +5,7 @@
934 */
935
936 public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
937- private const string ROOT_SCHEMA_NAME = "org.yorba.shotwell";
938+ private const string ROOT_SCHEMA_NAME = "org.pantheon.photos";
939 private const string PREFS_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".preferences";
940 private const string UI_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".ui";
941 private const string SLIDESHOW_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".slideshow";
942@@ -263,7 +263,7 @@
943 if (cleaned_id == null)
944 cleaned_id = "default";
945
946- cleaned_id = cleaned_id.replace ("org.yorba.shotwell.", "");
947+ cleaned_id = cleaned_id.replace ("org.pantheon.photos.", "");
948 cleaned_id = cleaned_id.replace (".", "-");
949
950 return cleaned_id;
951@@ -275,7 +275,7 @@
952 cleaned_id = "default";
953 cleaned_id = cleaned_id.replace (".", "-");
954
955- return "org.yorba.shotwell.%s.%s".printf (domain, cleaned_id);
956+ return "org.pantheon.photos.%s.%s".printf (domain, cleaned_id);
957 }
958
959 private static string make_gsettings_key (string gconf_key) {
960@@ -463,7 +463,7 @@
961 try {
962 Process.spawn_command_line_sync (cmd_line);
963 } catch (Error err) {
964- message ("Error running shotwell-settings-migrator: %s", err.message);
965+ message ("Error running pantheon-photos-settings-migrator: %s", err.message);
966 }
967 }
968
969
970=== modified file 'src/plugins/StandardHostInterface.vala'
971--- src/plugins/StandardHostInterface.vala 2014-08-08 21:13:09 +0000
972+++ src/plugins/StandardHostInterface.vala 2015-11-26 01:54:51 +0000
973@@ -23,16 +23,16 @@
974 // special case: legacy plugins (Web publishers moved into SPIT) have special names
975 // new plugins will use their full ID
976 switch (id) {
977- case "org.yorba.shotwell.publishing.facebook":
978+ case "org.pantheon.photos.publishing.facebook":
979 return "facebook";
980
981- case "org.yorba.shotwell.publishing.picasa":
982+ case "org.pantheon.photos.publishing.picasa":
983 return "picasa";
984
985- case "org.yorba.shotwell.publishing.flickr":
986+ case "org.pantheon.photos.publishing.flickr":
987 return "flickr";
988
989- case "org.yorba.shotwell.publishing.youtube":
990+ case "org.pantheon.photos.publishing.youtube":
991 return "youtube";
992
993 default:
994
995=== modified file 'src/publishing/Publishing.vala'
996--- src/publishing/Publishing.vala 2014-08-08 21:13:09 +0000
997+++ src/publishing/Publishing.vala 2015-11-26 01:54:51 +0000
998@@ -8,10 +8,10 @@
999
1000 public void init () throws Error {
1001 string[] core_ids = new string[0];
1002- core_ids += "org.yorba.shotwell.publishing.facebook";
1003- core_ids += "org.yorba.shotwell.publishing.picasa";
1004- core_ids += "org.yorba.shotwell.publishing.flickr";
1005- core_ids += "org.yorba.shotwell.publishing.youtube";
1006+ core_ids += "org.pantheon.photos.publishing.facebook";
1007+ core_ids += "org.pantheon.photos.publishing.picasa";
1008+ core_ids += "org.pantheon.photos.publishing.flickr";
1009+ core_ids += "org.pantheon.photos.publishing.youtube";
1010
1011 Plugins.register_extension_point (typeof (Spit.Publishing.Service), _ ("Publishing"),
1012 Resources.PUBLISH, core_ids);
1013
1014=== modified file 'src/slideshow/Slideshow.vala'
1015--- src/slideshow/Slideshow.vala 2014-08-08 21:13:09 +0000
1016+++ src/slideshow/Slideshow.vala 2015-11-26 01:54:51 +0000
1017@@ -8,16 +8,16 @@
1018
1019 public void init () throws Error {
1020 string[] core_ids = new string[0];
1021- core_ids += "org.yorba.shotwell.transitions.crumble";
1022- core_ids += "org.yorba.shotwell.transitions.fade";
1023- core_ids += "org.yorba.shotwell.transitions.slide";
1024- core_ids += "org.yorba.shotwell.transitions.blinds";
1025- core_ids += "org.yorba.shotwell.transitions.circle";
1026- core_ids += "org.yorba.shotwell.transitions.circles";
1027- core_ids += "org.yorba.shotwell.transitions.clock";
1028- core_ids += "org.yorba.shotwell.transitions.stripes";
1029- core_ids += "org.yorba.shotwell.transitions.squares";
1030- core_ids += "org.yorba.shotwell.transitions.chess";
1031+ core_ids += "org.pantheon.photos.transitions.crumble";
1032+ core_ids += "org.pantheon.photos.transitions.fade";
1033+ core_ids += "org.pantheon.photos.transitions.slide";
1034+ core_ids += "org.pantheon.photos.transitions.blinds";
1035+ core_ids += "org.pantheon.photos.transitions.circle";
1036+ core_ids += "org.pantheon.photos.transitions.circles";
1037+ core_ids += "org.pantheon.photos.transitions.clock";
1038+ core_ids += "org.pantheon.photos.transitions.stripes";
1039+ core_ids += "org.pantheon.photos.transitions.squares";
1040+ core_ids += "org.pantheon.photos.transitions.chess";
1041
1042 Plugins.register_extension_point (typeof (Spit.Transitions.Descriptor), _ ("Slideshow Transitions"),
1043 Resources.ICON_SLIDESHOW_EXTENSION_POINT, core_ids);
1044
1045=== modified file 'src/slideshow/TransitionEffects.vala'
1046--- src/slideshow/TransitionEffects.vala 2014-08-08 21:13:09 +0000
1047+++ src/slideshow/TransitionEffects.vala 2015-11-26 01:54:51 +0000
1048@@ -273,7 +273,7 @@
1049 }
1050
1051 public class NullTransitionDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
1052- public const string EFFECT_ID = "org.yorba.shotwell.transitions.null";
1053+ public const string EFFECT_ID = "org.pantheon.photos.transitions.null";
1054
1055 public int get_pluggable_interface (int min_host_version, int max_host_version) {
1056 return Spit.Transitions.CURRENT_INTERFACE;
1057@@ -325,7 +325,7 @@
1058 }
1059 }
1060 public class RandomEffectDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
1061- public const string EFFECT_ID = "org.yorba.shotwell.transitions.random";
1062+ public const string EFFECT_ID = "org.pantheon.photos.transitions.random";
1063
1064 public int get_pluggable_interface (int min_host_version, int max_host_version) {
1065 return Spit.Transitions.CURRENT_INTERFACE;

Subscribers

People subscribed via source and target branches