Merge branch 'feature/upstream' into develop

1 files changed, 0 insertions, 105 deletions

diff --git a/misc/shotwell.convert b/misc/shotwell.convert
deleted file mode 100644
index 2f972c1..0000000
--- a/misc/shotwell.convert
+++ /dev/null
@@ -1,105 +0,0 @@
-[org.yorba.shotwell.preferences.ui]
-background-color = /apps/shotwell/preferences/ui/background_color
-display-basic-properties = /apps/shotwell/preferences/ui/display_basic_properties
-display-extended-properties = /apps/shotwell/preferences/ui/display_extended_properties
-display-photo-ratings = /apps/shotwell/preferences/ui/display_photo_ratings
-display-photo-tags = /apps/shotwell/preferences/ui/display_photo_tags
-display-photo-titles = /apps/shotwell/preferences/ui/display_photo_titles
-event-photos-sort-ascending = /apps/shotwell/preferences/ui/event_photos_sort_ascending
-event-photos-sort-by = /apps/shotwell/preferences/ui/event_photos_sort_by
-events-sort-ascending = /apps/shotwell/preferences/ui/events_sort_ascending
-hide-photos-already-imported = /apps/shotwell/preferences/ui/hide_photos_already_imported
-keep-relativity = /apps/shotwell/preferences/ui/keep_relativity
-library-photos-sort-ascending = /apps/shotwell/preferences/ui/library_photos_sort_ascending
-library-photos-sort-by = /apps/shotwell/preferences/ui/library_photos_sort_by
-modify-originals = /apps/shotwell/preferences/ui/modify_originals
-photo-thumbnail-scale = /apps/shotwell/preferences/ui/photo_thumbnail_scale
-show-welcome-dialog = /apps/shotwell/preferences/ui/show_welcome_dialog
-sidebar-position = /apps/shotwell/preferences/ui/pane_position
-use-24-hour-time = /apps/shotwell/preferences/ui/twentyfour_hr_time
-
-[org.yorba.shotwell.preferences.slideshow]
-delay = /apps/shotwell/preferences/slideshow/delay
-transition-delay = /apps/shotwell/preferences/slideshow_transition/delay
-transition-effect-id = /apps/shotwell/preferences/slideshow_transition/name
-show-title = /apps/shotwell/preferences/slideshow/show-title
-
-[org.yorba.shotwell.preferences.window]
-direct-height = /apps/shotwell/preferences/window/direct_height
-direct-maximize = /apps/shotwell/preferences/window/direct_maximize
-direct-width = /apps/shotwell/preferences/window/direct_width
-library-height = /apps/shotwell/preferences/window/library_height
-library-maximize = /apps/shotwell/preferences/window/library_maximize
-library-width = /apps/shotwell/preferences/window/library_width
-
-[org.yorba.shotwell.preferences.files]
-auto-import = /apps/shotwell/preferences/files/auto_import
-commit-metadata = /apps/shotwell/preferences/files/commit_metadata
-directory-pattern = /apps/shotwell/preferences/files/directory_pattern
-directory-pattern-custom = /apps/shotwell/preferences/files/directory_pattern_custom
-import-dir = /apps/shotwell/preferences/files/import_dir
-use-lowercase-filenames = /apps/shotwell/preferences/files/use_lowercase_filenames
-raw-developer-default = /apps/shotwell/preferences/files/raw_developer_default
-
-[org.yorba.shotwell.preferences.editing]
-external-photo-editor = /apps/shotwell/preferences/editing/external_photo_editor
-external-raw-editor = /apps/shotwell/preferences/editing/external_raw_editor
-
-[org.yorba.shotwell.video]
-interpreter-state-cookie = /apps/shotwell/video/interpreter_state_cookie
-
-[org.yorba.shotwell.printing]
-content-height = /apps/shotwell/printing/content_height
-content-layout = /apps/shotwell/printing/content_layout
-content-ppi = /apps/shotwell/printing/content_ppi
-content-units = /apps/shotwell/printing/content_units
-content-width = /apps/shotwell/printing/content_width
-images-per-page = /apps/shotwell/printing/images_per_page_selection
-match-aspect-ratio = /apps/shotwell/printing/match_aspect_ratio
-print-titles = /apps/shotwell/printing/print_titles
-size-selection = /apps/shotwell/printing/size_selection
-titles-font = /apps/shotwell/printing/print_titles_font
-
-[org.yorba.shotwell.sharing]
-default-service = /apps/shotwell/sharing/default_service
-last-used-service = /apps/shotwell/sharing/last_used_service
-
-[org.yorba.shotwell.plugins.enable-state]
-publishing-facebook = /apps/shotwell/plugins/org.yorba.shotwell.publishing.facebook/enabled
-publishing-flickr = /apps/shotwell/plugins/org.yorba.shotwell.publishing.flickr/enabled
-publishing-picasa = /apps/shotwell/plugins/org.yorba.shotwell.publishing.picasa/enabled
-publishing-piwigo = /apps/shotwell/plugins/org.yorba.shotwell.publishing.piwigo/enabled
-publishing-yandex-fotki = /apps/shotwell/plugins/org.yorba.shotwell.publishing.yandex-fotki/enabled
-publishing-youtube = /apps/shotwell/plugins/org.yorba.shotwell.publishing.youtube/enabled
-transitions-crumble = /apps/shotwell/plugins/org.yorba.shotwell.transitions.crumble/enabled
-transitions-fade = /apps/shotwell/plugins/org.yorba.shotwell.transitions.fade/enabled
-transitions-slide = /apps/shotwell/plugins/org.yorba.shotwell.transitions.slide/enabled
-
-[org.yorba.shotwell.sharing.facebook]
-uid = /apps/shotwell/sharing/facebook/uid
-user-name = /apps/shotwell/sharing/facebook/user_name
-default-size = /apps/shotwell/sharing/facebook/default_size
-
-[org.yorba.shotwell.sharing.flickr]
-default-size = /apps/shotwell/sharing/flickr/default_size
-visibility = /apps/shotwell/sharing/flickr/visibility
-
-[org.yorba.shotwell.sharing.picasa]
-default-size = /apps/shotwell/sharing/picasa/default_size
-last-album = /apps/shotwell/sharing/picasa/last_album
-
-[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo]
-url = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/url
-username = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/username
-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/password
-remember-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/remember-password
-last-category = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-category
-last-permission-level = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-permission-level
-
-[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki]
-auth-token = /apps/shotwell/sharing/org.yorba.shotwell.publishing.yandex-fotki/auth_token
-
-[org.yorba.shotwell.sharing.youtube]
-user-name = /apps/shotwell/sharing/youtube/user_name
-auth-token = /apps/shotwell/sharing/youtube/auth_token
-