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

[Viko Adi Rahmawan]

rename all shotwell installable files into pantheon-photos

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

[Shawn McTear (syst3mfailur3)]

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]

2777. By Viko Adi Rahmawan on 2015-11-24

replace yorba.pantheon-photos into pantheon.photos

2778. By Viko Adi Rahmawan on 2015-11-24

rename plugins id too

2779. By Viko Adi Rahmawan on 2015-11-26

replace remaining yorba

[Viko Adi Rahmawan (vikoadi)]

replace yorba.pantheon-photos into pantheon.photos

[Danielle Foré (danrabbit)]

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)

=== modified file 'Makefile'
--- Makefile	2015-08-16 08:05:52 +0000
+++ Makefile	2015-11-26 01:54:51 +0000
@@ -1,6 +1,6 @@
-PROGRAM = shotwell
-PROGRAM_THUMBNAILER = shotwell-video-thumbnailer
-PROGRAM_MIGRATOR = shotwell-settings-migrator
+PROGRAM = pantheon-photos
+PROGRAM_THUMBNAILER = pantheon-photos-video-thumbnailer
+PROGRAM_MIGRATOR = pantheon-photos-settings-migrator
 
 VERSION = 0.1.1
 GITVER := $(shell git log -n 1 2>/dev/null | head -n 1 | awk '{print $$2}')
@@ -27,7 +27,7 @@
 
 -include configure.mk
 ifndef LIBEXECDIR
-LIBEXECDIR=$(PREFIX)/libexec/shotwell
+LIBEXECDIR=$(PREFIX)/libexec/pantheon-photos
 endif
 
 CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS)
@@ -146,14 +146,14 @@
 	trash.ui 
 
 SYS_INTEGRATION_FILES = \
-	shotwell.appdata.xml \
-	shotwell.desktop.head \
-	shotwell.desktop.tail \
-	shotwell-viewer.desktop.head \
-	shotwell-viewer.desktop.tail \
-	org.yorba.shotwell.gschema.xml \
-	org.yorba.shotwell-extras.gschema.xml \
-	shotwell.convert
+	pantheon-photos.appdata.xml \
+	pantheon-photos.desktop.head \
+	pantheon-photos.desktop.tail \
+	pantheon-photos-viewer.desktop.head \
+	pantheon-photos-viewer.desktop.tail \
+	org.pantheon.photos.gschema.xml \
+	org.pantheon.photos-extras.gschema.xml \
+	pantheon-photos.convert
 
 SCHEMA_FILES := $(shell ls misc/*.gschema.xml)
 
@@ -305,7 +305,7 @@
 DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Photo Viewer"
 DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Photo Viewer"
 DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer"
-TEMPORARY_DESKTOP_FILES = misc/shotwell.desktop misc/shotwell-viewer.desktop
+TEMPORARY_DESKTOP_FILES = misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
 
 # Process the units
 UNIT_MKS := $(foreach unit,$(UNITS),src/$(unit)/mk/$(notdir $(unit)).mk)
@@ -441,45 +441,45 @@
 	cp $(DIST_TAR_XZ) $(PACKAGE_ORIG_XZ)
 	rm -f $(DIST_TAR_XZ)
 
-misc/shotwell.desktop: misc/shotwell.desktop.head misc/shotwell.desktop.tail $(EXPANDED_CORE_PO_FILES)
-	cp misc/shotwell.desktop.head misc/shotwell.desktop
+misc/pantheon-photos.desktop: misc/pantheon-photos.desktop.head misc/pantheon-photos.desktop.tail $(EXPANDED_CORE_PO_FILES)
+	cp misc/pantheon-photos.desktop.head misc/pantheon-photos.desktop
 	@ $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
 		LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
-		>> misc/shotwell.desktop ; \
+		>> misc/pantheon-photos.desktop ; \
 		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
-		gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \
+		gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos.desktop ; \
 		echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \
+		--domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/pantheon-photos.desktop ; \
 		echo Keywords[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DESKTOP_APP_KEYWORDS)` >> misc/shotwell.desktop ;) 
-	cat misc/shotwell.desktop.tail >> misc/shotwell.desktop
+		--domain=shotwell $(DESKTOP_APP_KEYWORDS)` >> misc/pantheon-photos.desktop ;) 
+	cat misc/pantheon-photos.desktop.tail >> misc/pantheon-photos.desktop
 ifndef DISABLE_DESKTOP_VALIDATE
-	@ desktop-file-validate misc/shotwell.desktop 1>misc/shotwell.desktop.errors 2>&1; \
-	if test -s misc/shotwell.desktop.errors; then \
-		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."; \
+	@ desktop-file-validate misc/pantheon-photos.desktop 1>misc/pantheon-photos.desktop.errors 2>&1; \
+	if test -s misc/pantheon-photos.desktop.errors; then \
+		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."; \
 		exit 1; \
-	else rm -f misc/shotwell.desktop.errors; \
+	else rm -f misc/pantheon-photos.desktop.errors; \
 	fi
 endif
 	
-misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop.tail $(EXPANDED_CORE_PO_FILES)
-	cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
+misc/pantheon-photos-viewer.desktop: misc/pantheon-photos-viewer.desktop.head misc/pantheon-photos-viewer.desktop.tail $(EXPANDED_CORE_PO_FILES)
+	cp misc/pantheon-photos-viewer.desktop.head misc/pantheon-photos-viewer.desktop
 	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \
+		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/pantheon-photos-viewer.desktop ; \
 		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
-	cat misc/shotwell-viewer.desktop.tail >> misc/shotwell-viewer.desktop
+		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos-viewer.desktop ;)
+	cat misc/pantheon-photos-viewer.desktop.tail >> misc/pantheon-photos-viewer.desktop
 ifndef DISABLE_DESKTOP_VALIDATE
-	@ desktop-file-validate misc/shotwell-viewer.desktop 1>misc/shotwell-viewer.desktop.errors 2>&1; \
-	if test -s misc/shotwell-viewer.desktop.errors; then \
-		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."; \
+	@ desktop-file-validate misc/pantheon-photos-viewer.desktop 1>misc/pantheon-photos-viewer.desktop.errors 2>&1; \
+	if test -s misc/pantheon-photos-viewer.desktop.errors; then \
+		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."; \
 		exit 1; \
-	else rm -f misc/shotwell-viewer.desktop.errors; \
+	else rm -f misc/pantheon-photos-viewer.desktop.errors; \
 	fi
 endif
 
 .PHONY: desktop
-desktop: misc/shotwell.desktop misc/shotwell-viewer.desktop
+desktop: misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
 
 .PHONY: dist
 dist:
@@ -501,30 +501,30 @@
 	mkdir -p $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(LIBEXECDIR)
-	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
-	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
+	mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
+	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/actions/
 	$(INSTALL_DATA) icons/pin-toolbar.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/actions/
 	mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-	$(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-	$(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
+	$(INSTALL_DATA) misc/org.pantheon.photos.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
+	$(INSTALL_DATA) misc/org.pantheon.photos-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 ifndef DISABLE_SCHEMAS_COMPILE
 	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 endif
 ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
 	mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
-	$(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings
+	$(INSTALL_DATA) misc/pantheon-photos.convert $(DESTDIR)/usr/share/GConf/gsettings
 endif
 ifndef DISABLE_ICON_UPDATE
 	-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
 endif
-	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/ui
-	$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/shotwell/ui
+	mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
+	$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 	mkdir -p $(DESTDIR)$(PREFIX)/share/appdata
-	$(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL_DATA) misc/shotwell.appdata.xml $(DESTDIR)$(PREFIX)/share/appdata
+	$(INSTALL_DATA) misc/pantheon-photos.desktop $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL_DATA) misc/pantheon-photos-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL_DATA) misc/pantheon-photos.appdata.xml $(DESTDIR)$(PREFIX)/share/appdata
 ifndef DISABLE_DESKTOP_UPDATE
 	-update-desktop-database || :
 endif
@@ -533,28 +533,28 @@
 	$(INSTALL_DATA) apport/shotwell.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks
 endif
 ifndef DISABLE_HELP_INSTALL
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
-	$(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
-	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
+	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
+	$(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
+	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
+	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
 endif
 	-$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
 		$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
-		$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
-	mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
-	$(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+		$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
+	mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
+	$(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 ifdef PLUGINS_RC
-	$(INSTALL_DATA) $(PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(INSTALL_DATA) $(PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 endif
 ifndef DISABLE_EXTRA_PLUGINS_INSTALL
-	$(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 ifdef EXTRA_PLUGINS_RC
-	$(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 endif
 endif
 ifdef INSTALL_HEADERS
-	mkdir -p $(DESTDIR)$(PREFIX)/include/shotwell/plugins
-	$(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/shotwell/plugins
+	mkdir -p $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
+	$(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
 	mkdir -p $(DESTDIR)$(PREFIX)/share/vala/vapi
 	$(INSTALL_DATA) $(PLUGIN_VAPI) $(DESTDIR)$(PREFIX)/share/vala/vapi
 	$(INSTALL_DATA) $(PLUGIN_DEPS) $(DESTDIR)$(PREFIX)/share/vala/vapi
@@ -569,37 +569,37 @@
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_MIGRATOR)
 	rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_THUMBNAILER)
 	rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_MIGRATOR)
-	rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/shotwell.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell.desktop
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell-viewer.desktop
-	rm -f $(DESTDIR)$(PREFIX)/share/appdata/shotwell.appdata.xml
+	rm -fr $(DESTDIR)$(PREFIX)/share/pantheon-photos
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/pantheon-photos.svg
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/pantheon-photos.svg
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/pantheon-photos.svg
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos.desktop
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos-viewer.desktop
+	rm -f $(DESTDIR)$(PREFIX)/share/appdata/pantheon-photos.appdata.xml
 ifndef DISABLE_DESKTOP_UPDATE
 	-update-desktop-database || :
 endif
 ifndef DISABLE_HELP_INSTALL
-	rm -rf $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell
+	rm -rf $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos
 endif
 ifdef ENABLE_APPORT_HOOK_INSTALL
 	rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/shotwell.py
 endif
-	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
-	rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
+	rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 ifdef INSTALL_HEADERS
-	rm -rf $(DESTDIR)$(PREFIX)/include/shotwell
+	rm -rf $(DESTDIR)$(PREFIX)/include/pantheon-photos
 	rm -f $(foreach vapi,$(PLUGIN_VAPI),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(vapi)))
 	rm -f $(foreach dep,$(PLUGIN_DEPS),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(dep)))
 	rm -f $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig/$(PC_FILE)
 endif
-	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
-	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
+	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.pantheon.photos.gschema.xml
+	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.pantheon.photos-extras.gschema.xml
 ifndef DISABLE_SCHEMAS_COMPILE
 	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 endif
 ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
-	rm -f $(DESTDIR)/usr/share/GConf/gsettings/shotwell.convert
+	rm -f $(DESTDIR)/usr/share/GConf/gsettings/pantheon-photos.convert
 endif
 
 $(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
@@ -659,7 +659,7 @@
 docs:
 # valadoc complains if the directory already exists
 	@rm -rf docs
-	valadoc --directory=docs --package-name=shotwell-plugin-dev --package-version=$(VERSION) --verbose \
+	valadoc --directory=docs --package-name=pantheon-photos-plugin-dev --package-version=$(VERSION) --verbose \
 		--no-protected \
 		$(foreach def,$(DEFINES),--define=$(def)) \
 		$(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
 
=== renamed file 'misc/org.yorba.shotwell-extras.gschema.xml' => 'misc/org.pantheon.photos-extras.gschema.xml'
--- misc/org.yorba.shotwell-extras.gschema.xml	2012-09-26 22:57:58 +0000
+++ misc/org.pantheon.photos-extras.gschema.xml	2015-11-26 01:54:51 +0000
@@ -1,6 +1,6 @@
 <schemalist>
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-yandex-fotki/">
+    <schema id="org.pantheon.org-pantheon-photos-publishing-yandex-fotki" path="/org/pantheon/photos/sharing/org-pantheon-photos-publishing-yandex-fotki/">
     <key name="auth-token" type="s">
         <default>""</default>
         <summary>authentication token</summary>
@@ -8,7 +8,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-tumblr" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-tumblr/">
+<schema id="org.pantheon.photos.sharing.org-pantheon-photos-publishing-tumblr" path="/org/pantheon/photos/sharing/org-pantheon-photos-publishing-tumblr/">
     <key name="token" type="s">
         <default>""</default>
         <summary>Token</summary>
 
=== renamed file 'misc/org.yorba.shotwell.gschema.xml' => 'misc/org.pantheon.photos.gschema.xml'
--- misc/org.yorba.shotwell.gschema.xml	2015-09-07 18:27:19 +0000
+++ misc/org.pantheon.photos.gschema.xml	2015-11-26 01:54:51 +0000
@@ -1,22 +1,22 @@
 <schemalist>
 
-<schema id="org.yorba.shotwell" path="/org/yorba/shotwell/">
-    <child name="preferences" schema="org.yorba.shotwell.preferences" />
-    <child name="sharing" schema="org.yorba.shotwell.sharing" />
-    <child name="video" schema="org.yorba.shotwell.video" />
-    <child name="printing" schema="org.yorba.shotwell.printing" />
-    <child name="plugins" schema="org.yorba.shotwell.plugins" />
-</schema>
-
-<schema id="org.yorba.shotwell.preferences" path="/org/yorba/shotwell/preferences/">
-    <child name="ui" schema="org.yorba.shotwell.preferences.ui" />
-    <child name="slideshow" schema="org.yorba.shotwell.preferences.slideshow" />
-    <child name="window" schema="org.yorba.shotwell.preferences.window" />
-    <child name="files" schema="org.yorba.shotwell.preferences.files" />
-    <child name="editing" schema="org.yorba.shotwell.preferences.editing" />
-</schema>
-
-<schema id="org.yorba.shotwell.preferences.ui" path="/org/yorba/shotwell/preferences/ui/">
+<schema id="org.pantheon.photos" path="/org/pantheon/photos/">
+    <child name="preferences" schema="org.pantheon.photos.preferences" />
+    <child name="sharing" schema="org.pantheon.photos.sharing" />
+    <child name="video" schema="org.pantheon.photos.video" />
+    <child name="printing" schema="org.pantheon.photos.printing" />
+    <child name="plugins" schema="org.pantheon.photos.plugins" />
+</schema>
+
+<schema id="org.pantheon.photos.preferences" path="/org/pantheon/photos/preferences/">
+    <child name="ui" schema="org.pantheon.photos.preferences.ui" />
+    <child name="slideshow" schema="org.pantheon.photos.preferences.slideshow" />
+    <child name="window" schema="org.pantheon.photos.preferences.window" />
+    <child name="files" schema="org.pantheon.photos.preferences.files" />
+    <child name="editing" schema="org.pantheon.photos.preferences.editing" />
+</schema>
+
+<schema id="org.pantheon.photos.preferences.ui" path="/org/pantheon/photos/preferences/ui/">
     <key name="display-basic-properties" type="b">
         <default>true</default>
         <summary>display basic properties</summary>
@@ -156,7 +156,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.slideshow" path="/org/yorba/shotwell/preferences/slideshow/">
+<schema id="org.pantheon.photos.preferences.slideshow" path="/org/pantheon/photos/preferences/slideshow/">
     <key name="delay" type="d">
         <default>3.0</default>
         <summary>delay</summary>
@@ -182,7 +182,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.window" path="/org/yorba/shotwell/preferences/window/">
+<schema id="org.pantheon.photos.preferences.window" path="/org/pantheon/photos/preferences/window/">
     <key name="library-maximize" type="b">
         <default>false</default>
         <summary>maximize library window</summary>
@@ -226,7 +226,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.files" path="/org/yorba/shotwell/preferences/files/">
+<schema id="org.pantheon.photos.preferences.files" path="/org/pantheon/photos/preferences/files/">
     <key name="import-dir" type="s">
         <default>""</default>
         <summary>import directory</summary>
@@ -270,7 +270,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.crop-settings" path="/org/yorba/shotwell/crop-settings/">
+<schema id="org.pantheon.photos.crop-settings" path="/org/pantheon/photos/crop-settings/">
     <key name="last-crop-menu-choice" type="i">
         <default>1</default>
         <summary>Most-recently-used crop aspect ratio menu choice.</summary>
@@ -288,7 +288,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.editing" path="/org/yorba/shotwell/preferences/editing/">
+<schema id="org.pantheon.photos.preferences.editing" path="/org/pantheon/photos/preferences/editing/">
     <key name="external-photo-editor" type="s">
         <default>""</default>
         <summary>external photo editor</summary>
@@ -302,7 +302,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing" path="/org/yorba/shotwell/sharing/">
+<schema id="org.pantheon.photos.sharing" path="/org/pantheon/photos/sharing/">
     <key name="last-used-service" type="s">
         <default>""</default>
         <summary>last used publishing service</summary>
@@ -315,13 +315,13 @@
         <description>A numeric code representing the last service to which photos were published</description>
     </key>
     
-    <child name="facebook" schema="org.yorba.shotwell.sharing.facebook" />
-    <child name="flickr" schema="org.yorba.shotwell.sharing.flickr" />
-    <child name="picasa" schema="org.yorba.shotwell.sharing.picasa" />
-    <child name="youtube" schema="org.yorba.shotwell.sharing.youtube" />
+    <child name="facebook" schema="org.pantheon.photos.sharing.facebook" />
+    <child name="flickr" schema="org.pantheon.photos.sharing.flickr" />
+    <child name="picasa" schema="org.pantheon.photos.sharing.picasa" />
+    <child name="youtube" schema="org.pantheon.photos.sharing.youtube" />
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.facebook" path="/org/yorba/shotwell/sharing/facebook/">
+<schema id="org.pantheon.photos.sharing.facebook" path="/org/pantheon/photos/sharing/facebook/">
     <key name="access-token" type="s">
         <default>""</default>
         <summary>access token</summary>
@@ -353,7 +353,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.flickr" path="/org/yorba/shotwell/sharing/flickr/">
+<schema id="org.pantheon.photos.sharing.flickr" path="/org/pantheon/photos/sharing/flickr/">
     <key name="access-phase-token" type="s">
         <default>""</default>
         <summary>OAuth Access Phase Token</summary>
@@ -391,7 +391,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.picasa" path="/org/yorba/shotwell/sharing/picasa/">
+<schema id="org.pantheon.photos.sharing.picasa" path="/org/pantheon/photos/sharing/picasa/">
     <key name="refresh-token" type="s">
         <default>""</default>
         <summary>refresh token</summary>
@@ -417,7 +417,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-piwigo/">
+<schema id="org.pantheon.photos.sharing.org-pantheon-photos-publishing-piwigo" path="/org/pantheon/photos/sharing/org-pantheon-photos-publishing-piwigo/">
     <key name="url" type="s">
         <default>""</default>
         <summary>Piwigio URL</summary>
@@ -479,7 +479,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.youtube" path="/org/yorba/shotwell/sharing/youtube/">
+<schema id="org.pantheon.photos.sharing.youtube" path="/org/pantheon/photos/sharing/youtube/">
     <key name="refresh-token" type="s">
         <default>""</default>
         <summary>refresh token</summary>
@@ -487,7 +487,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.dataimports" path="/org/yorba/shotwell/dataimports/">
+<schema id="org.pantheon.photos.dataimports" path="/org/pantheon/photos/dataimports/">
     <key name="last-used-dataimports-service" type="s">
         <default>""</default>
         <summary>last used import service</summary>
@@ -495,7 +495,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.video" path="/org/yorba/shotwell/video/">
+<schema id="org.pantheon.photos.video" path="/org/pantheon/photos/video/">
     <key name="interpreter-state-cookie" type="i">
         <default>-1</default>
         <summary>interpreter state cookie</summary>
@@ -503,7 +503,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.printing" path="/org/yorba/shotwell/printing/">
+<schema id="org.pantheon.photos.printing" path="/org/pantheon/photos/printing/">
     <key name="content-layout" type="i">
         <default>3</default>
         <summary>content layout mode</summary>
@@ -565,11 +565,11 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.plugins" path="/org/yorba/shotwell/plugins/" >
-    <child name="enable-state" schema="org.yorba.shotwell.plugins.enable-state" />
+<schema id="org.pantheon.photos.plugins" path="/org/pantheon/photos/plugins/" >
+    <child name="enable-state" schema="org.pantheon.photos.plugins.enable-state" />
 </schema>
 
-<schema id="org.yorba.shotwell.plugins.enable-state" path="/org/yorba/shotwell/plugins/enable-state/" >
+<schema id="org.pantheon.photos.plugins.enable-state" path="/org/pantheon/photos/plugins/enable-state/" >
     <key name="publishing-facebook" type="b">
         <default>true</default>
         <summary>enable facebook publishing plugin</summary>
 
=== renamed file 'misc/shotwell-viewer.desktop.head' => 'misc/pantheon-photos-viewer.desktop.head'
--- misc/shotwell-viewer.desktop.head	2014-09-04 12:31:29 +0000
+++ misc/pantheon-photos-viewer.desktop.head	2015-11-26 01:54:51 +0000
@@ -2,7 +2,7 @@
 Version=1.0
 Name=Photo Viewer
 GenericName=Photo Viewer
-Exec=shotwell %f
+Exec=pantheon-photos %f
 Icon=multimedia-photo-viewer
 Terminal=false
 NoDisplay=true
 
=== renamed file 'misc/shotwell-viewer.desktop.tail' => 'misc/pantheon-photos-viewer.desktop.tail'
--- misc/shotwell-viewer.desktop.tail	2014-09-04 12:31:29 +0000
+++ misc/pantheon-photos-viewer.desktop.tail	2015-11-26 01:54:51 +0000
@@ -1,3 +1,3 @@
 [Desktop Action AboutDialog]
 Name=About Photos
-Exec=shotwell --about
 \ No newline at end of file
+Exec=pantheon-photos --about
 
=== renamed file 'misc/shotwell.appdata.xml' => 'misc/pantheon-photos.appdata.xml'
--- misc/shotwell.appdata.xml	2013-10-02 00:04:14 +0000
+++ misc/pantheon-photos.appdata.xml	2015-11-26 01:54:51 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Yorba Foundation ([e-mail]) -->
 <application>
-  <id type="desktop">shotwell.desktop</id>
+  <id type="desktop">pantheon-photos.desktop</id>
   <licence>CC0</licence>
   <summary>Popular photo manager</summary>
   <description>
 
=== renamed file 'misc/shotwell.convert' => 'misc/pantheon-photos.convert'
=== renamed file 'misc/shotwell.desktop.head' => 'misc/pantheon-photos.desktop.head'
--- misc/shotwell.desktop.head	2014-12-11 18:40:52 +0000
+++ misc/pantheon-photos.desktop.head	2015-11-26 01:54:51 +0000
@@ -4,7 +4,7 @@
 GenericName=Photo Manager
 Comment=Organize your photos
 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;
-Exec=shotwell %U
+Exec=pantheon-photos %U
 Icon=multimedia-photo-manager
 Terminal=false
 Type=Application
 
=== renamed file 'misc/shotwell.desktop.tail' => 'misc/pantheon-photos.desktop.tail'
--- misc/shotwell.desktop.tail	2014-09-04 12:20:54 +0000
+++ misc/pantheon-photos.desktop.tail	2015-11-26 01:54:51 +0000
@@ -1,3 +1,3 @@
 [Desktop Action AboutDialog]
 Name=About Photos
-Exec=shotwell --about
 \ No newline at end of file
+Exec=pantheon-photos --about
 
=== modified file 'plugins/shotwell-publishing-extras/TumblrPublishing.vala'
--- plugins/shotwell-publishing-extras/TumblrPublishing.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-publishing-extras/TumblrPublishing.vala	2015-11-26 01:54:51 +0000
@@ -23,7 +23,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.publishing.tumblr";
+        return "org.pantheon.photos.publishing.tumblr";
     }
 
     public unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-publishing-extras/YandexPublishing.vala'
--- plugins/shotwell-publishing-extras/YandexPublishing.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-publishing-extras/YandexPublishing.vala	2015-11-26 01:54:51 +0000
@@ -10,7 +10,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.publishing.yandex-fotki";
+        return "org.pantheon.photos.publishing.yandex-fotki";
     }
 
     public unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala'
--- plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala	2015-11-26 01:54:51 +0000
@@ -23,7 +23,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.publishing.extras";
+        return "org.pantheon.photos.publishing.extras";
     }
 
     public unowned Spit.Pluggable[]? get_pluggables () {
 
=== modified file 'plugins/shotwell-publishing/FacebookPublishing.vala'
--- plugins/shotwell-publishing/FacebookPublishing.vala	2015-06-06 17:11:18 +0000
+++ plugins/shotwell-publishing/FacebookPublishing.vala	2015-11-26 01:54:51 +0000
@@ -20,7 +20,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.publishing.facebook";
+        return "org.pantheon.photos.publishing.facebook";
     }
 
     public unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-publishing/FlickrPublishing.vala'
--- plugins/shotwell-publishing/FlickrPublishing.vala	2015-03-13 11:01:50 +0000
+++ plugins/shotwell-publishing/FlickrPublishing.vala	2015-11-26 01:54:51 +0000
@@ -22,7 +22,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.publishing.flickr";
+        return "org.pantheon.photos.publishing.flickr";
     }
 
     public unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-publishing/PicasaPublishing.vala'
--- plugins/shotwell-publishing/PicasaPublishing.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-publishing/PicasaPublishing.vala	2015-11-26 01:54:51 +0000
@@ -20,7 +20,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.publishing.picasa";
+        return "org.pantheon.photos.publishing.picasa";
     }
 
     public unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-publishing/PiwigoPublishing.vala'
--- plugins/shotwell-publishing/PiwigoPublishing.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-publishing/PiwigoPublishing.vala	2015-11-26 01:54:51 +0000
@@ -20,7 +20,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.publishing.piwigo";
+        return "org.pantheon.photos.publishing.piwigo";
     }
 
     public unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-publishing/YouTubePublishing.vala'
--- plugins/shotwell-publishing/YouTubePublishing.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-publishing/YouTubePublishing.vala	2015-11-26 01:54:51 +0000
@@ -20,7 +20,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.publishing.youtube";
+        return "org.pantheon.photos.publishing.youtube";
     }
 
     public unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-publishing/shotwell-publishing.vala'
--- plugins/shotwell-publishing/shotwell-publishing.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-publishing/shotwell-publishing.vala	2015-11-26 01:54:51 +0000
@@ -31,7 +31,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.publishing.core_services";
+        return "org.pantheon.photos.publishing.core_services";
     }
 
     public unowned Spit.Pluggable[]? get_pluggables () {
 
=== modified file 'plugins/shotwell-transitions/BlindsEffect.vala'
--- plugins/shotwell-transitions/BlindsEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/BlindsEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.blinds";
+        return "org.pantheon.photos.transitions.blinds";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/ChessEffect.vala'
--- plugins/shotwell-transitions/ChessEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/ChessEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.chess";
+        return "org.pantheon.photos.transitions.chess";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/CircleEffect.vala'
--- plugins/shotwell-transitions/CircleEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/CircleEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.circle";
+        return "org.pantheon.photos.transitions.circle";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/CirclesEffect.vala'
--- plugins/shotwell-transitions/CirclesEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/CirclesEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.circles";
+        return "org.pantheon.photos.transitions.circles";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/ClockEffect.vala'
--- plugins/shotwell-transitions/ClockEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/ClockEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.clock";
+        return "org.pantheon.photos.transitions.clock";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/CrumbleEffect.vala'
--- plugins/shotwell-transitions/CrumbleEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/CrumbleEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.crumble";
+        return "org.pantheon.photos.transitions.crumble";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/FadeEffect.vala'
--- plugins/shotwell-transitions/FadeEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/FadeEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.fade";
+        return "org.pantheon.photos.transitions.fade";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/SlideEffect.vala'
--- plugins/shotwell-transitions/SlideEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/SlideEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.slide";
+        return "org.pantheon.photos.transitions.slide";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/SquaresEffect.vala'
--- plugins/shotwell-transitions/SquaresEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/SquaresEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.squares";
+        return "org.pantheon.photos.transitions.squares";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/StripesEffect.vala'
--- plugins/shotwell-transitions/StripesEffect.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/StripesEffect.vala	2015-11-26 01:54:51 +0000
@@ -13,7 +13,7 @@
     }
 
     public override unowned string get_id () {
-        return "org.yorba.shotwell.transitions.stripes";
+        return "org.pantheon.photos.transitions.stripes";
     }
 
     public override unowned string get_pluggable_name () {
 
=== modified file 'plugins/shotwell-transitions/shotwell-transitions.vala'
--- plugins/shotwell-transitions/shotwell-transitions.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-transitions/shotwell-transitions.vala	2015-11-26 01:54:51 +0000
@@ -33,7 +33,7 @@
     }
 
     public unowned string get_id () {
-        return "org.yorba.shotwell.transitions";
+        return "org.pantheon.photos.transitions";
     }
 
     public unowned Spit.Pluggable[]? get_pluggables () {
 
=== modified file 'samples/simple-plugin/simple-plugin.vala'
--- samples/simple-plugin/simple-plugin.vala	2014-08-08 21:13:09 +0000
+++ samples/simple-plugin/simple-plugin.vala	2015-11-26 01:54:51 +0000
@@ -22,7 +22,7 @@
 
     // Every module needs to have a unique ID.
     public unowned string get_id () {
-        return "org.yorba.shotwell.samples.simple-plugin";
+        return "org.pantheon.photos.samples.simple-plugin";
     }
 
     public unowned Spit.Pluggable[]? get_pluggables () {
 
=== renamed file 'settings-migrator/shotwell-settings-migrator' => 'settings-migrator/pantheon-photos-settings-migrator'
=== modified file 'src/AppDirs.vala'
--- src/AppDirs.vala	2014-08-08 21:13:09 +0000
+++ src/AppDirs.vala	2015-11-26 01:54:51 +0000
@@ -5,7 +5,7 @@
  */
 
 class AppDirs {
-    private const string DEFAULT_DATA_DIR = "shotwell";
+    private const string DEFAULT_DATA_DIR = "pantheon-photos";
 
     private static File exec_dir;
     private static File data_dir = null;
@@ -181,7 +181,7 @@
 
     public static File get_temp_dir () {
         if (tmp_dir == null) {
-            tmp_dir = File.new_for_path (DirUtils.mkdtemp (Environment.get_tmp_dir () + "/shotwell-XXXXXX"));
+            tmp_dir = File.new_for_path (DirUtils.mkdtemp (Environment.get_tmp_dir () + "/pantheon-photos-XXXXXX"));
 
             try {
                 if (!tmp_dir.query_exists (null))
@@ -230,14 +230,14 @@
     public static File get_resources_dir () {
         File? install_dir = get_install_dir ();
 
-        return (install_dir != null) ? install_dir.get_child ("share").get_child ("shotwell")
+        return (install_dir != null) ? install_dir.get_child ("share").get_child ("pantheon-photos")
                : get_exec_dir ();
     }
 
     public static File get_lib_dir () {
         File? install_dir = get_install_dir ();
 
-        return (install_dir != null) ? install_dir.get_child (Resources.LIB).get_child ("shotwell")
+        return (install_dir != null) ? install_dir.get_child (Resources.LIB).get_child ("pantheon-photos")
                : get_exec_dir ();
     }
 
@@ -246,24 +246,24 @@
     }
 
     public static File get_user_plugins_dir () {
-        return get_home_dir ().get_child (".gnome2").get_child ("shotwell").get_child ("plugins");
+        return get_home_dir ().get_child (".gnome2").get_child ("pantheon-photos").get_child ("plugins");
     }
 
     public static File? get_log_file () {
-        if (Environment.get_variable ("SHOTWELL_LOG_FILE") != null) {
-            if (Environment.get_variable ("SHOTWELL_LOG_FILE") == ":console:") {
+        if (Environment.get_variable ("PANTHEON_PHOTOS_LOG_FILE") != null) {
+            if (Environment.get_variable ("PANTHEON_PHOTOS_LOG_FILE") == ":console:") {
                 return null;
             } else {
-                return File.new_for_path (Environment.get_variable ("SHOTWELL_LOG_FILE"));
+                return File.new_for_path (Environment.get_variable ("PANTHEON_PHOTOS_LOG_FILE"));
             }
         } else {
             return File.new_for_path (Environment.get_user_cache_dir ()).
-                   get_child ("shotwell").get_child ("shotwell.log");
+                   get_child ("pantheon-photos").get_child ("pantheon-photos.log");
         }
     }
 
     public static File get_thumbnailer_bin () {
-        const string filename = "shotwell-video-thumbnailer";
+        const string filename = "pantheon-photos-video-thumbnailer";
         File f = File.new_for_path (AppDirs.get_libexec_dir ().get_path () + "/thumbnailer/" + filename);
         if (!f.query_exists ()) {
             // If we're running installed.
@@ -273,7 +273,7 @@
     }
 
     public static File get_settings_migrator_bin () {
-        const string filename = "shotwell-settings-migrator";
+        const string filename = "pantheon-photos-settings-migrator";
         File f = File.new_for_path (AppDirs.get_libexec_dir ().get_path () + "/settings-migrator/" + filename);
         if (!f.query_exists ()) {
             // If we're running installed.
 
=== modified file 'src/Application.vala'
--- src/Application.vala	2014-12-17 23:41:07 +0000
+++ src/Application.vala	2015-11-26 01:54:51 +0000
@@ -58,7 +58,7 @@
             exec_name = GETTEXT_PACKAGE;
             application_id = "org.elementaryos.pantheon-photos-direct";
             app_icon = "multimedia-photo-viewer";
-            app_launcher = "shotwell-viewer.desktop";
+            app_launcher = "pantheon-photos-viewer.desktop";
             program_name = _("Photo Viewer");
             Gtk.Settings.get_default().set("gtk-application-prefer-dark-theme", true);
             flags = GLib.ApplicationFlags.HANDLES_OPEN | GLib.ApplicationFlags.NON_UNIQUE;
@@ -70,7 +70,7 @@
             exec_name = GETTEXT_PACKAGE;
             application_id = "org.elementaryos.pantheon-photos";
             app_icon = "multimedia-photo-manager";
-            app_launcher = "shotwell.desktop";
+            app_launcher = "pantheon-photos.desktop";
             program_name = _(build_release_name);
             flags = GLib.ApplicationFlags.HANDLES_OPEN | GLib.ApplicationFlags.HANDLES_COMMAND_LINE;
         }
 
=== modified file 'src/UnityProgressBar.vala'
--- src/UnityProgressBar.vala	2014-08-08 21:13:09 +0000
+++ src/UnityProgressBar.vala	2015-11-26 01:54:51 +0000
@@ -7,7 +7,7 @@
 #if UNITY_SUPPORT
 public class UnityProgressBar : Object {
 
-    private static Unity.LauncherEntry l = Unity.LauncherEntry.get_for_desktop_id ("shotwell.desktop");
+    private static Unity.LauncherEntry l = Unity.LauncherEntry.get_for_desktop_id ("pantheon-photos.desktop");
     private static UnityProgressBar? visible_uniprobar;
 
     private double progress;
 
=== modified file 'src/config/GSettingsEngine.vala'
--- src/config/GSettingsEngine.vala	2015-09-07 18:27:19 +0000
+++ src/config/GSettingsEngine.vala	2015-11-26 01:54:51 +0000
@@ -5,7 +5,7 @@
  */
 
 public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
-    private const string ROOT_SCHEMA_NAME = "org.yorba.shotwell";
+    private const string ROOT_SCHEMA_NAME = "org.pantheon.photos";
     private const string PREFS_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".preferences";
     private const string UI_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".ui";
     private const string SLIDESHOW_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".slideshow";
@@ -263,7 +263,7 @@
         if (cleaned_id == null)
             cleaned_id = "default";
 
-        cleaned_id = cleaned_id.replace ("org.yorba.shotwell.", "");
+        cleaned_id = cleaned_id.replace ("org.pantheon.photos.", "");
         cleaned_id = cleaned_id.replace (".", "-");
 
         return cleaned_id;
@@ -275,7 +275,7 @@
             cleaned_id = "default";
         cleaned_id = cleaned_id.replace (".", "-");
 
-        return "org.yorba.shotwell.%s.%s".printf (domain, cleaned_id);
+        return "org.pantheon.photos.%s.%s".printf (domain, cleaned_id);
     }
 
     private static string make_gsettings_key (string gconf_key) {
@@ -463,7 +463,7 @@
         try {
             Process.spawn_command_line_sync (cmd_line);
         } catch (Error err) {
-            message ("Error running shotwell-settings-migrator: %s", err.message);
+            message ("Error running pantheon-photos-settings-migrator: %s", err.message);
         }
     }
 
 
=== modified file 'src/plugins/StandardHostInterface.vala'
--- src/plugins/StandardHostInterface.vala	2014-08-08 21:13:09 +0000
+++ src/plugins/StandardHostInterface.vala	2015-11-26 01:54:51 +0000
@@ -23,16 +23,16 @@
         // special case: legacy plugins (Web publishers moved into SPIT) have special names
         // new plugins will use their full ID
         switch (id) {
-        case "org.yorba.shotwell.publishing.facebook":
+        case "org.pantheon.photos.publishing.facebook":
             return "facebook";
 
-        case "org.yorba.shotwell.publishing.picasa":
+        case "org.pantheon.photos.publishing.picasa":
             return "picasa";
 
-        case "org.yorba.shotwell.publishing.flickr":
+        case "org.pantheon.photos.publishing.flickr":
             return "flickr";
 
-        case "org.yorba.shotwell.publishing.youtube":
+        case "org.pantheon.photos.publishing.youtube":
             return "youtube";
 
         default:
 
=== modified file 'src/publishing/Publishing.vala'
--- src/publishing/Publishing.vala	2014-08-08 21:13:09 +0000
+++ src/publishing/Publishing.vala	2015-11-26 01:54:51 +0000
@@ -8,10 +8,10 @@
 
 public void init () throws Error {
     string[] core_ids = new string[0];
-    core_ids += "org.yorba.shotwell.publishing.facebook";
-    core_ids += "org.yorba.shotwell.publishing.picasa";
-    core_ids += "org.yorba.shotwell.publishing.flickr";
-    core_ids += "org.yorba.shotwell.publishing.youtube";
+    core_ids += "org.pantheon.photos.publishing.facebook";
+    core_ids += "org.pantheon.photos.publishing.picasa";
+    core_ids += "org.pantheon.photos.publishing.flickr";
+    core_ids += "org.pantheon.photos.publishing.youtube";
 
     Plugins.register_extension_point (typeof (Spit.Publishing.Service), _ ("Publishing"),
     Resources.PUBLISH, core_ids);
 
=== modified file 'src/slideshow/Slideshow.vala'
--- src/slideshow/Slideshow.vala	2014-08-08 21:13:09 +0000
+++ src/slideshow/Slideshow.vala	2015-11-26 01:54:51 +0000
@@ -8,16 +8,16 @@
 
 public void init () throws Error {
     string[] core_ids = new string[0];
-    core_ids += "org.yorba.shotwell.transitions.crumble";
-    core_ids += "org.yorba.shotwell.transitions.fade";
-    core_ids += "org.yorba.shotwell.transitions.slide";
-    core_ids += "org.yorba.shotwell.transitions.blinds";
-    core_ids += "org.yorba.shotwell.transitions.circle";
-    core_ids += "org.yorba.shotwell.transitions.circles";
-    core_ids += "org.yorba.shotwell.transitions.clock";
-    core_ids += "org.yorba.shotwell.transitions.stripes";
-    core_ids += "org.yorba.shotwell.transitions.squares";
-    core_ids += "org.yorba.shotwell.transitions.chess";
+    core_ids += "org.pantheon.photos.transitions.crumble";
+    core_ids += "org.pantheon.photos.transitions.fade";
+    core_ids += "org.pantheon.photos.transitions.slide";
+    core_ids += "org.pantheon.photos.transitions.blinds";
+    core_ids += "org.pantheon.photos.transitions.circle";
+    core_ids += "org.pantheon.photos.transitions.circles";
+    core_ids += "org.pantheon.photos.transitions.clock";
+    core_ids += "org.pantheon.photos.transitions.stripes";
+    core_ids += "org.pantheon.photos.transitions.squares";
+    core_ids += "org.pantheon.photos.transitions.chess";
 
     Plugins.register_extension_point (typeof (Spit.Transitions.Descriptor), _ ("Slideshow Transitions"),
     Resources.ICON_SLIDESHOW_EXTENSION_POINT, core_ids);
 
=== modified file 'src/slideshow/TransitionEffects.vala'
--- src/slideshow/TransitionEffects.vala	2014-08-08 21:13:09 +0000
+++ src/slideshow/TransitionEffects.vala	2015-11-26 01:54:51 +0000
@@ -273,7 +273,7 @@
 }
 
 public class NullTransitionDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
-    public const string EFFECT_ID = "org.yorba.shotwell.transitions.null";
+    public const string EFFECT_ID = "org.pantheon.photos.transitions.null";
 
     public int get_pluggable_interface (int min_host_version, int max_host_version) {
         return Spit.Transitions.CURRENT_INTERFACE;
@@ -325,7 +325,7 @@
     }
 }
 public class RandomEffectDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
-    public const string EFFECT_ID = "org.yorba.shotwell.transitions.random";
+    public const string EFFECT_ID = "org.pantheon.photos.transitions.random";
 
     public int get_pluggable_interface (int min_host_version, int max_host_version) {
         return Spit.Transitions.CURRENT_INTERFACE;