Hello community, here is the log from the commit of package gnome-photos for openSUSE:Factory checked in at 2017-12-19 10:46:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-photos (Old) and /work/SRC/openSUSE:Factory/.gnome-photos.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-photos" Tue Dec 19 10:46:38 2017 rev:38 rq:557168 version:3.26.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-photos/gnome-photos.changes 2017-12-06 08:50:50.777991702 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-photos.new/gnome-photos.changes 2017-12-19 10:46:41.615510821 +0100 @@ -1,0 +2,11 @@ +Thu Dec 14 19:59:35 UTC 2017 - [email protected] + +- Update to version 3.26.3: + + Bugs fixed: bgo#785376. + + Updated translations. +- Drop upstream fixed patches: + + gnome-photos-main-toolbar-dont-leak.patch. + + gnome-photos-nb-translations.patch. + + gnome-photos-properties-dialog-dont-leak.patch. + +------------------------------------------------------------------- Old: ---- gnome-photos-3.26.2.tar.xz gnome-photos-main-toolbar-dont-leak.patch gnome-photos-nb-translations.patch gnome-photos-properties-dialog-dont-leak.patch New: ---- gnome-photos-3.26.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-photos.spec ++++++ --- /var/tmp/diff_new_pack.gQRmoB/_old 2017-12-19 10:46:42.231481085 +0100 +++ /var/tmp/diff_new_pack.gQRmoB/_new 2017-12-19 10:46:42.231481085 +0100 @@ -17,21 +17,13 @@ Name: gnome-photos -Version: 3.26.2 +Version: 3.26.3 Release: 0 Summary: Photo viewer for GNOME License: GPL-3.0+ Group: Productivity/Graphics/Viewers Url: https://wiki.gnome.org/Design/Apps/Photos - Source0: https://download.gnome.org/sources/gnome-photos/3.26/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gnome-photos-properties-dialog-dont-leak.patch [email protected] -- properties-dialog: Don't leak the error -Patch0: gnome-photos-properties-dialog-dont-leak.patch -# PATCH-FIX-UPSTREAM gnome-photos-main-toolbar-dont-leak.patch [email protected] -- main-toolbar: Don't leak the preview's GMenu -Patch1: gnome-photos-main-toolbar-dont-leak.patch -# PATCH-FIX-UPSTREAM gnome-photos-nb-translations.patch [email protected] -- Add updated Norwegian bokmål translation -Patch2: gnome-photos-nb-translations.patch - BuildRequires: desktop-file-utils BuildRequires: fdupes # Technically seen, glib2-tools would require this, but it introduces a loop there. So explictly require here ++++++ gnome-photos-3.26.2.tar.xz -> gnome-photos-3.26.3.tar.xz ++++++ ++++ 1724 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/NEWS new/gnome-photos-3.26.3/NEWS --- old/gnome-photos-3.26.2/NEWS 2017-11-03 11:22:17.000000000 +0100 +++ new/gnome-photos-3.26.3/NEWS 2017-12-14 13:53:55.000000000 +0100 @@ -1,3 +1,13 @@ +Overview of changes in 3.26.3 +============================= + +* Bugs fixed: + 785376 The link "Settings" in the "No Photos Found" screen does not work + +* Updated translations: + Norwegian bokmål + + Overview of changes in 3.26.2 ============================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/configure.ac new/gnome-photos-3.26.3/configure.ac --- old/gnome-photos-3.26.2/configure.ac 2017-11-03 11:19:05.000000000 +0100 +++ new/gnome-photos-3.26.3/configure.ac 2017-12-14 13:52:02.000000000 +0100 @@ -1,5 +1,5 @@ AC_INIT([Photos], - [3.26.2], + [3.26.3], [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-photos], [gnome-photos], [https://wiki.gnome.org/Apps/Photos]) Binary files old/gnome-photos-3.26.2/po/nb.gmo and new/gnome-photos-3.26.3/po/nb.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/po/nb.po new/gnome-photos-3.26.3/po/nb.po --- old/gnome-photos-3.26.2/po/nb.po 2017-09-22 18:55:06.000000000 +0200 +++ new/gnome-photos-3.26.3/po/nb.po 2017-12-08 20:09:18.000000000 +0100 @@ -5,11 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnome-photos 3.23.x\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; -"photos&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-02-16 16:30+0000\n" -"PO-Revision-Date: 2017-02-18 11:10+0100\n" +"Project-Id-Version: gnome-photos 3.26.x\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-photos&keywords=I18N+L10N&component=general\n"; +"POT-Creation-Date: 2017-09-11 15:48+0000\n" +"PO-Revision-Date: 2017-11-08 20:02+0100\n" "Last-Translator: Kjartan Maraas <[email protected]>\n" "Language-Team: Norwegian bokmål <[email protected]>\n" "Language: nb\n" @@ -18,17 +17,16 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/org.gnome.Photos.appdata.xml.in.h:1 -#: ../data/org.gnome.Photos.desktop.in.in.h:1 ../src/photos-embed.c:688 -#: ../src/photos-search-type-manager.c:135 +#: data/org.gnome.Photos.appdata.xml.in:7 data/org.gnome.Photos.desktop.in.in:3 +#: src/photos-embed.c:682 src/photos-search-type-manager.c:135 msgid "Photos" msgstr "Bilder" -#: ../data/org.gnome.Photos.appdata.xml.in.h:2 ../src/photos-main-window.c:496 +#: data/org.gnome.Photos.appdata.xml.in:8 src/photos-main-window.c:477 msgid "Access, organize and share your photos on GNOME" msgstr "Se på, organiser og del bilder i GNOME" -#: ../data/org.gnome.Photos.appdata.xml.in.h:3 +#: data/org.gnome.Photos.appdata.xml.in:10 msgid "" "A simple application to access, organize and share your photos on GNOME. It " "is meant to be a simple and elegant replacement for using a file manager to " @@ -40,129 +38,137 @@ "bildebehandling. Sømløs integrasjon med skytjenester tilbys gjennom GNOME-" "kontoer på nettet." -#: ../data/org.gnome.Photos.appdata.xml.in.h:4 +#: data/org.gnome.Photos.appdata.xml.in:16 msgid "It lets you:" msgstr "Det lar deg:" -#: ../data/org.gnome.Photos.appdata.xml.in.h:5 +#: data/org.gnome.Photos.appdata.xml.in:18 msgid "View recent local and online photos" msgstr "Vis nylige bilder lokalt og på nett" -#: ../data/org.gnome.Photos.appdata.xml.in.h:6 +#: data/org.gnome.Photos.appdata.xml.in:19 msgid "Access your Facebook or Flickr content" msgstr "Få tilgang til Facebook- eller Flickr-innhold" -#: ../data/org.gnome.Photos.appdata.xml.in.h:7 +#: data/org.gnome.Photos.appdata.xml.in:20 msgid "Send photos to remote DLNA renderers" msgstr "Send bilder til eksterne DLNA-rendrere" -#: ../data/org.gnome.Photos.appdata.xml.in.h:8 +#: data/org.gnome.Photos.appdata.xml.in:21 msgid "Set as background" msgstr "Bruk som bakgrunn" -#: ../data/org.gnome.Photos.appdata.xml.in.h:9 +#: data/org.gnome.Photos.appdata.xml.in:22 msgid "Print photos" msgstr "Skriv ut bilder" -#: ../data/org.gnome.Photos.appdata.xml.in.h:10 +#: data/org.gnome.Photos.appdata.xml.in:23 msgid "Select favorites" msgstr "Velg favoritter" -#: ../data/org.gnome.Photos.appdata.xml.in.h:11 +#: data/org.gnome.Photos.appdata.xml.in:24 msgid "Allow opening full featured editor for more advanced changes" msgstr "Tillat åpning av redigeringsprogram for mer avanserte endringer" -#: ../data/org.gnome.Photos.desktop.in.in.h:2 +#: data/org.gnome.Photos.appdata.xml.in:49 +msgid "The GNOME Project" +msgstr "GNOME prosjektet" + +#: data/org.gnome.Photos.desktop.in.in:4 msgid "Access, organize and share photos" msgstr "Se på, organiser og del bilder" -#: ../data/org.gnome.Photos.desktop.in.in.h:3 +#. Translators: Do NOT translate or transliterate this text (this is an icon file name)! +#: data/org.gnome.Photos.desktop.in.in:7 +msgid "org.gnome.Photos" +msgstr "org.gnome.Photos" + +#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: data/org.gnome.Photos.desktop.in.in:15 msgid "Photos;Pictures;" msgstr "Foto;Bilder;" -#: ../data/org.gnome.photos.gschema.xml.h:1 +#: data/org.gnome.photos.gschema.xml:5 msgid "Window size" msgstr "Vindustørrelse" -#: ../data/org.gnome.photos.gschema.xml.h:2 +#: data/org.gnome.photos.gschema.xml:6 msgid "Window size (width and height)." msgstr "Vindustørrelse (bredde og høyde)." -#: ../data/org.gnome.photos.gschema.xml.h:3 +#: data/org.gnome.photos.gschema.xml:10 msgid "Window position" msgstr "Vinduposisjon" -#: ../data/org.gnome.photos.gschema.xml.h:4 +#: data/org.gnome.photos.gschema.xml:11 msgid "Window position (x and y)." msgstr "Vinduposisjon (x og y)." -#: ../data/org.gnome.photos.gschema.xml.h:5 +#: data/org.gnome.photos.gschema.xml:15 msgid "Window maximized" msgstr "Vindu maksimert" -#: ../data/org.gnome.photos.gschema.xml.h:6 +#: data/org.gnome.photos.gschema.xml:16 msgid "Window maximized state" msgstr "Maksimert tilstand for vindu" -#: ../src/photos-application.c:149 +#: src/photos-application.c:157 msgid "Show the application's version" msgstr "Vis programmets versjon" -#: ../src/photos-base-item.c:589 +#: src/photos-base-item.c:615 msgid "Album" msgstr "Album" -#: ../src/photos-base-item.c:2302 +#: src/photos-base-item.c:2546 msgid "Screenshots" msgstr "Skjermbilder" -#: ../src/photos-delete-notification.c:139 +#: src/photos-delete-notification.c:139 #, c-format msgid "“%s” deleted" msgstr "«%s» slettet" -#: ../src/photos-delete-notification.c:142 +#: src/photos-delete-notification.c:142 #, c-format msgid "%d item deleted" msgid_plural "%d items deleted" msgstr[0] "%d oppføring ble slettet" msgstr[1] "%d oppføringer ble slettet" -#: ../src/photos-delete-notification.c:150 -#: ../src/photos-done-notification.c:125 +#: src/photos-delete-notification.c:150 src/photos-done-notification.c:125 msgid "Undo" msgstr "Angre" -#: ../src/photos-dlna-renderers-dialog.ui.h:1 +#: src/photos-dlna-renderers-dialog.ui:7 msgid "DLNA Renderer Devices" msgstr "DLNA-enheter for gjengivelse" -#: ../src/photos-done-notification.c:117 +#: src/photos-done-notification.c:117 #, c-format msgid "“%s” edited" msgstr "«%s» redigert" -#: ../src/photos-embed.c:692 ../src/photos-search-type-manager.c:120 +#: src/photos-embed.c:686 src/photos-search-type-manager.c:120 msgid "Albums" msgstr "Album" -#: ../src/photos-embed.c:696 ../src/photos-search-type-manager.c:128 +#: src/photos-embed.c:690 src/photos-search-type-manager.c:128 msgid "Favorites" msgstr "Favoritter" -#: ../src/photos-embed.c:700 ../src/photos-main-toolbar.c:334 +#: src/photos-embed.c:694 src/photos-main-toolbar.c:305 msgid "Search" msgstr "Søk" -#: ../src/photos-empty-results-box.c:114 +#: src/photos-empty-results-box.c:114 msgid "Name your first album" msgstr "Gi navn til ditt første album" #. Translators: this should be translated in the context of the "You #. * can add your online accounts in Settings" sentence below #. -#: ../src/photos-empty-results-box.c:134 -#: ../src/photos-source-notification.c:143 +#: src/photos-empty-results-box.c:134 src/photos-source-notification.c:146 msgid "Settings" msgstr "Innstillinger" @@ -170,297 +176,312 @@ #. * due to markup, and should be translated only in the context of #. * this sentence. #. -#: ../src/photos-empty-results-box.c:140 +#: src/photos-empty-results-box.c:140 #, c-format msgid "You can add your online accounts in %s" msgstr "Du kan legge til nettkontoer i %s" -#: ../src/photos-empty-results-box.c:181 +#: src/photos-empty-results-box.c:181 msgid "No Albums Found" msgstr "Ingen album funnet" -#: ../src/photos-empty-results-box.c:186 +#: src/photos-empty-results-box.c:186 msgid "Starred photos will appear here" msgstr "Stjernemerkede bilder vises her" -#: ../src/photos-empty-results-box.c:192 +#: src/photos-empty-results-box.c:192 msgid "No Photos Found" msgstr "Ingen bilder funnet" -#: ../src/photos-export-dialog.ui.h:1 +#: src/photos-export-dialog.ui:24 msgctxt "dialog title" msgid "Export" msgstr "Eksporter" -#: ../src/photos-export-dialog.ui.h:2 +#: src/photos-export-dialog.ui:40 msgid "_Folder Name" msgstr "_Mappenavn" -#: ../src/photos-export-dialog.ui.h:3 ../src/photos-print-setup.c:942 +#: src/photos-export-dialog.ui:66 src/photos-print-setup.c:942 msgid "Size" msgstr "Størrelse" -#: ../src/photos-export-dialog.ui.h:4 +#: src/photos-export-dialog.ui:83 msgid "F_ull" msgstr "F_ull" -#: ../src/photos-export-dialog.ui.h:5 +#: src/photos-export-dialog.ui:113 msgid "_Reduced" msgstr "_Redusert" -#: ../src/photos-export-dialog.ui.h:6 +#: src/photos-export-dialog.ui:160 msgid "_Cancel" msgstr "A_vbryt" -#: ../src/photos-export-dialog.ui.h:7 +#: src/photos-export-dialog.ui:167 msgid "_Export" msgstr "_Eksporter" #. Translators: this is the estimated size of the exported image in #. * the form "1600×1067 (0.6 GB)". #. -#: ../src/photos-export-dialog.c:67 +#: src/photos-export-dialog.c:67 #, c-format msgid "%d×%d (%s)" msgstr "%d×%d (%s)" #. Translators: this is the default sub-directory where photos -#. * will be exported. +#. * will be exported. #. -#: ../src/photos-export-dialog.c:201 +#: src/photos-export-dialog.c:201 msgid "%e %B %Y" msgstr "%B %e %Y" -#: ../src/photos-export-dialog.c:259 +#: src/photos-export-dialog.c:259 msgid "Calculating export size…" msgstr "Beregner størrelse for eksport …" -#: ../src/photos-export-notification.c:236 +#: src/photos-export-notification.c:250 msgid "Failed to export: not enough space" msgstr "Klarte ikke å eksportere: ikke nok plass" -#: ../src/photos-export-notification.c:238 +#: src/photos-export-notification.c:252 msgid "Failed to export" msgstr "Klarte ikke å eksportere" -#: ../src/photos-export-notification.c:245 +#: src/photos-export-notification.c:259 #, c-format msgid "“%s” exported" msgstr "«%s» eksportert" -#: ../src/photos-export-notification.c:249 +#: src/photos-export-notification.c:263 #, c-format msgid "%d item exported" msgid_plural "%d items exported" msgstr[0] "%d oppføring ble eksportert" msgstr[1] "%d oppføringer ble eksportert" -#: ../src/photos-export-notification.c:267 +#: src/photos-export-notification.c:281 msgid "Analyze" msgstr "Analyser" -#: ../src/photos-export-notification.c:272 +#: src/photos-export-notification.c:286 msgid "Empty Trash" msgstr "Tøm papirkurv" #. Translators: this is the Open action in a context menu -#: ../src/photos-export-notification.c:289 ../src/photos-preview-menu.ui.h:1 -#: ../src/photos-selection-toolbar.c:237 ../src/photos-selection-toolbar.ui.h:2 +#: src/photos-export-notification.c:303 src/photos-preview-menu.ui:6 +#: src/photos-selection-toolbar.c:247 src/photos-selection-toolbar.ui:29 msgid "Open" msgstr "Åpne" #. Translators: this is the label of the button to open the #. * folder where the item was exported. #. -#: ../src/photos-export-notification.c:299 +#: src/photos-export-notification.c:313 msgid "Export Folder" msgstr "Eksporter mappe" #. Translators: this is the fallback title in the form -#. * "Facebook — 2nd January 2013". +#. * "Facebook — 2nd January 2013". #. -#: ../src/photos-facebook-item.c:100 ../src/photos-flickr-item.c:105 -#: ../src/photos-google-item.c:102 +#: src/photos-facebook-item.c:100 src/photos-flickr-item.c:105 +#: src/photos-google-item.c:102 #, c-format msgid "%s — %s" msgstr "%s — %s" -#: ../src/photos-fetch-metas-job.c:177 +#: src/photos-fetch-metas-job.c:177 msgid "Untitled Photo" msgstr "Bilde uten tittel" -#: ../src/photos-help-overlay.ui.h:1 +#: src/photos-help-overlay.ui:34 msgctxt "shortcut window" msgid "General" msgstr "Generelt" -#: ../src/photos-help-overlay.ui.h:2 +#: src/photos-help-overlay.ui:38 msgctxt "shortcut window" msgid "Show help" msgstr "Vis hjelp" -#: ../src/photos-help-overlay.ui.h:3 +#: src/photos-help-overlay.ui:45 msgctxt "shortcut window" msgid "Quit" msgstr "Avslutt" -#: ../src/photos-help-overlay.ui.h:4 +#: src/photos-help-overlay.ui:54 msgctxt "shortcut window" msgid "Navigation" msgstr "Navigasjon" -#: ../src/photos-help-overlay.ui.h:5 +#: src/photos-help-overlay.ui:58 msgctxt "shortcut window" msgid "Next photo" msgstr "Neste bilde" -#: ../src/photos-help-overlay.ui.h:6 +#: src/photos-help-overlay.ui:65 msgctxt "shortcut window" msgid "Previous photo" msgstr "Forrige bilde" -#: ../src/photos-help-overlay.ui.h:7 +#: src/photos-help-overlay.ui:72 src/photos-help-overlay.ui:80 msgctxt "shortcut window" msgid "Go back" msgstr "Gå tilbake" -#: ../src/photos-help-overlay.ui.h:8 +#: src/photos-help-overlay.ui:90 msgctxt "shortcut window" msgid "Overview" msgstr "Oversikt" -#: ../src/photos-help-overlay.ui.h:9 +#: src/photos-help-overlay.ui:94 msgctxt "shortcut window" msgid "Search" msgstr "Søk" -#: ../src/photos-help-overlay.ui.h:10 +#: src/photos-help-overlay.ui:101 msgctxt "shortcut window" msgid "Select all" msgstr "Velg alle" -#: ../src/photos-help-overlay.ui.h:11 +#: src/photos-help-overlay.ui:108 msgctxt "shortcut window" msgid "Print selected photos" msgstr "Skriv ut valgte bilder" -#: ../src/photos-help-overlay.ui.h:12 +#: src/photos-help-overlay.ui:115 msgctxt "shortcut window" msgid "Delete selected photos" msgstr "Slett valgte bilder" -#: ../src/photos-help-overlay.ui.h:13 +#: src/photos-help-overlay.ui:124 msgctxt "shortcut window" msgid "Photo view" msgstr "Bildevisning" -#: ../src/photos-help-overlay.ui.h:14 +#: src/photos-help-overlay.ui:128 msgctxt "shortcut window" msgid "Edit" msgstr "Rediger" -#: ../src/photos-help-overlay.ui.h:15 +#: src/photos-help-overlay.ui:135 msgctxt "shortcut window" msgid "Export" msgstr "Eksporter" -#: ../src/photos-help-overlay.ui.h:16 +#: src/photos-help-overlay.ui:142 msgctxt "shortcut window" msgid "Print" msgstr "Skriv ut" -#: ../src/photos-help-overlay.ui.h:17 +#: src/photos-help-overlay.ui:149 +msgctxt "shortcut window" +msgid "Zoom in" +msgstr "Zoom inn" + +#: src/photos-help-overlay.ui:156 +msgctxt "shortcut window" +msgid "Zoom out" +msgstr "Zoom ut" + +#: src/photos-help-overlay.ui:163 +msgctxt "shortcut window" +msgid "Best fit" +msgstr "Beste tilpasning" + +#: src/photos-help-overlay.ui:170 msgctxt "shortcut window" msgid "Delete" msgstr "Slett" -#: ../src/photos-help-overlay.ui.h:18 +#: src/photos-help-overlay.ui:177 msgctxt "shortcut window" msgid "Action menu" msgstr "Handlingsmeny" -#: ../src/photos-help-overlay.ui.h:19 +#: src/photos-help-overlay.ui:184 msgctxt "shortcut window" msgid "Fullscreen" msgstr "Fullskjerm" -#: ../src/photos-help-overlay.ui.h:20 +#: src/photos-help-overlay.ui:193 msgctxt "shortcut window" msgid "Edit view" msgstr "Redigeringsvisning" -#: ../src/photos-help-overlay.ui.h:21 +#: src/photos-help-overlay.ui:197 msgctxt "shortcut window" msgid "Cancel" msgstr "Avbryt" #. Translators: %s refers to an online account provider, e.g., -#. * "Facebook" or "Flickr. +#. * "Facebook" or "Flickr". #. -#: ../src/photos-indexing-notification.c:167 +#: src/photos-indexing-notification.c:167 #, c-format msgid "Fetching photos from %s" msgstr "Henter fra bilder fra %s" -#: ../src/photos-indexing-notification.c:170 +#: src/photos-indexing-notification.c:170 msgid "Fetching photos from online accounts" msgstr "Henter bilder fra kontoer på nettet" -#: ../src/photos-indexing-notification.c:206 +#: src/photos-indexing-notification.c:206 msgid "Your photos are being indexed" msgstr "Bildene blir indeksert" -#: ../src/photos-indexing-notification.c:207 +#: src/photos-indexing-notification.c:207 msgid "Some photos might not be available during this process" msgstr "Noen bilder vil kanskje ikke være tilgjengelige under denne prosessen" -#: ../src/photos-local-item.c:176 ../src/photos-source-manager.c:256 +#: src/photos-local-item.c:176 src/photos-source-manager.c:256 msgid "Local" msgstr "Lokalt" -#: ../src/photos-main-toolbar.c:113 +#: src/photos-main-toolbar.c:88 msgid "Click on items to select them" msgstr "Klikk på oppføringer for å velge dem" -#: ../src/photos-main-toolbar.c:115 +#: src/photos-main-toolbar.c:90 #, c-format msgid "%d selected" msgid_plural "%d selected" msgstr[0] "%d valgt" msgstr[1] "%d valgt" -#: ../src/photos-main-toolbar.c:165 +#: src/photos-main-toolbar.c:178 msgid "Back" msgstr "Tilbake" -#: ../src/photos-main-toolbar.c:349 +#: src/photos-main-toolbar.c:320 msgid "Select Items" msgstr "Velg oppføringer" #. length == 1 #. Translators: this is the Open action in a context menu -#: ../src/photos-main-toolbar.c:443 ../src/photos-selection-toolbar.c:234 +#: src/photos-main-toolbar.c:392 src/photos-selection-toolbar.c:244 #, c-format msgid "Open with %s" msgstr "Åpne med %s" -#: ../src/photos-main-toolbar.c:483 ../src/photos-selection-toolbar.c:245 +#: src/photos-main-toolbar.c:425 src/photos-selection-toolbar.c:255 msgid "Remove from favorites" msgstr "Fjern fra favoritter" -#: ../src/photos-main-toolbar.c:488 ../src/photos-selection-toolbar.c:250 +#: src/photos-main-toolbar.c:430 src/photos-selection-toolbar.c:260 msgid "Add to favorites" msgstr "Legg til i favoritter" -#: ../src/photos-main-toolbar.c:525 ../src/photos-main-toolbar.c:663 +#: src/photos-main-toolbar.c:464 src/photos-main-toolbar.c:593 msgid "Cancel" msgstr "Avbryt" -#: ../src/photos-main-toolbar.c:529 +#: src/photos-main-toolbar.c:468 msgid "Done" msgstr "Ferdig" -#: ../src/photos-main-window.c:497 +#: src/photos-main-window.c:478 msgid "" "Copyright © 2013 Intel Corporation. All rights reserved.\n" "Copyright © 2014 – 2015 Pranav Kant\n" @@ -471,162 +492,162 @@ "Opphavsrett © 2012 – 2017 Red Hat, Inc." #. Translators: Put your names here -#: ../src/photos-main-window.c:507 +#: src/photos-main-window.c:488 msgid "translator-credits" msgstr "Kjartan Maraas <[email protected]>" -#: ../src/photos-menus.ui.h:1 +#: src/photos-menus.ui:6 msgid "Fullscreen" msgstr "Fullskjerm" -#: ../src/photos-menus.ui.h:2 +#: src/photos-menus.ui:12 msgid "Keyboard Shortcuts" msgstr "Tastatursnarveier" -#: ../src/photos-menus.ui.h:3 +#: src/photos-menus.ui:16 msgid "_Help" msgstr "_Hjelp" -#: ../src/photos-menus.ui.h:4 +#: src/photos-menus.ui:20 msgid "About" msgstr "Om" -#: ../src/photos-menus.ui.h:5 +#: src/photos-menus.ui:24 msgid "Quit" msgstr "Avslutt" -#: ../src/photos-organize-collection-dialog.c:71 +#: src/photos-organize-collection-dialog.c:71 msgid "_Add" msgstr "_Legg til" -#: ../src/photos-organize-collection-dialog.c:72 +#: src/photos-organize-collection-dialog.c:72 msgid "_OK" msgstr "_OK" #. Translators: "Organize" refers to photos in this context -#: ../src/photos-organize-collection-dialog.c:123 +#: src/photos-organize-collection-dialog.c:123 msgctxt "Dialog title" msgid "Organize" msgstr "Organiser" -#: ../src/photos-preview-menu.ui.h:2 +#: src/photos-preview-menu.ui:10 msgid "Export…" msgstr "Eksporter …" -#: ../src/photos-preview-menu.ui.h:3 +#: src/photos-preview-menu.ui:14 msgid "Print…" msgstr "Skriv ut …" -#: ../src/photos-preview-menu.ui.h:4 +#: src/photos-preview-menu.ui:19 msgid "Delete" msgstr "Slett" -#: ../src/photos-preview-menu.ui.h:5 +#: src/photos-preview-menu.ui:23 msgid "Display on…" msgstr "Vis på …" -#: ../src/photos-preview-menu.ui.h:6 +#: src/photos-preview-menu.ui:27 msgid "Set as Background" msgstr "Bruk som bakgrunn" -#: ../src/photos-preview-menu.ui.h:7 +#: src/photos-preview-menu.ui:31 msgid "Set as Lock Screen" msgstr "Bruk som låseskjerm" -#: ../src/photos-preview-menu.ui.h:8 ../src/photos-properties-dialog.c:903 -#: ../src/photos-selection-toolbar.ui.h:3 +#: src/photos-preview-menu.ui:37 src/photos-properties-dialog.c:903 +#: src/photos-selection-toolbar.ui:102 msgid "Properties" msgstr "Egenskaper" -#: ../src/photos-print-notification.c:79 +#: src/photos-print-notification.c:74 #, c-format msgid "Printing “%s”: %s" msgstr "Skriver ut «%s»: %s" -#: ../src/photos-print-operation.c:271 +#: src/photos-print-operation.c:271 msgid "Image Settings" msgstr "Innstillinger for bilde" -#: ../src/photos-print-setup.c:914 +#: src/photos-print-setup.c:914 msgid "Position" msgstr "Posisjon" -#: ../src/photos-print-setup.c:917 +#: src/photos-print-setup.c:917 msgid "_Left:" msgstr "_Venstre:" -#: ../src/photos-print-setup.c:918 +#: src/photos-print-setup.c:918 msgid "_Right:" msgstr "Høy_re:" -#: ../src/photos-print-setup.c:919 +#: src/photos-print-setup.c:919 msgid "_Top:" msgstr "_Topp:" -#: ../src/photos-print-setup.c:920 +#: src/photos-print-setup.c:920 msgid "_Bottom:" msgstr "_Bunn:" -#: ../src/photos-print-setup.c:922 +#: src/photos-print-setup.c:922 msgid "C_enter:" msgstr "S_enter:" -#: ../src/photos-print-setup.c:926 +#: src/photos-print-setup.c:926 msgid "None" msgstr "Ingen" -#: ../src/photos-print-setup.c:927 +#: src/photos-print-setup.c:927 msgid "Horizontal" msgstr "Horisontal" -#: ../src/photos-print-setup.c:928 +#: src/photos-print-setup.c:928 msgid "Vertical" msgstr "Vertikal" -#: ../src/photos-print-setup.c:929 +#: src/photos-print-setup.c:929 msgid "Both" msgstr "Begge" -#: ../src/photos-print-setup.c:945 +#: src/photos-print-setup.c:945 msgid "_Width:" msgstr "_Bredde:" -#: ../src/photos-print-setup.c:946 +#: src/photos-print-setup.c:946 msgid "_Height:" msgstr "_Høyde:" -#: ../src/photos-print-setup.c:948 +#: src/photos-print-setup.c:948 msgid "_Scaling:" msgstr "_Skalering:" -#: ../src/photos-print-setup.c:957 +#: src/photos-print-setup.c:957 msgid "_Unit:" msgstr "_Enhet:" -#: ../src/photos-print-setup.c:961 +#: src/photos-print-setup.c:961 msgid "Millimeters" msgstr "Millimeter" -#: ../src/photos-print-setup.c:962 +#: src/photos-print-setup.c:962 msgid "Inches" msgstr "Tommer" -#: ../src/photos-print-setup.c:990 +#: src/photos-print-setup.c:990 msgid "Preview" msgstr "Forhåndsvisning" -#: ../src/photos-properties-dialog.c:255 +#: src/photos-properties-dialog.c:255 msgid "Edited in Photos" msgstr "Redigert i Bilder" -#: ../src/photos-properties-dialog.c:268 +#: src/photos-properties-dialog.c:268 msgid "Untouched" msgstr "Urørt" #. Translators: this is the label next to the photo title in the #. * properties dialog #. -#: ../src/photos-properties-dialog.c:453 +#: src/photos-properties-dialog.c:453 msgctxt "Document Title" msgid "Title" msgstr "Tittel" @@ -634,92 +655,92 @@ #. Translators: this is the label next to the photo author in #. * the properties dialog #. -#: ../src/photos-properties-dialog.c:465 +#: src/photos-properties-dialog.c:465 msgctxt "Document Author" msgid "Author" msgstr "Forfatter" -#: ../src/photos-properties-dialog.c:472 +#: src/photos-properties-dialog.c:472 msgid "Source" msgstr "Kilde" -#: ../src/photos-properties-dialog.c:478 +#: src/photos-properties-dialog.c:478 msgid "Date Modified" msgstr "Dato endret" -#: ../src/photos-properties-dialog.c:486 +#: src/photos-properties-dialog.c:486 msgid "Date Created" msgstr "Dato opprettet" #. Translators: this is the label next to the photo type in the #. * properties dialog #. -#: ../src/photos-properties-dialog.c:496 +#: src/photos-properties-dialog.c:496 msgctxt "Document Type" msgid "Type" msgstr "Type" -#: ../src/photos-properties-dialog.c:506 +#: src/photos-properties-dialog.c:506 msgid "Dimensions" msgstr "Dimensjoner" -#: ../src/photos-properties-dialog.c:518 +#: src/photos-properties-dialog.c:518 msgid "Location" msgstr "Lokasjon" -#: ../src/photos-properties-dialog.c:538 +#: src/photos-properties-dialog.c:538 msgid "Camera" msgstr "Kamera" -#: ../src/photos-properties-dialog.c:548 ../src/photos-tool-colors.c:336 +#: src/photos-properties-dialog.c:548 src/photos-tool-colors.c:335 msgid "Exposure" msgstr "Eksponering" -#: ../src/photos-properties-dialog.c:558 +#: src/photos-properties-dialog.c:558 msgid "Aperture" msgstr "Blenderåpning" -#: ../src/photos-properties-dialog.c:568 +#: src/photos-properties-dialog.c:568 msgid "Focal Length" msgstr "Brennvidde" -#: ../src/photos-properties-dialog.c:578 +#: src/photos-properties-dialog.c:578 msgid "ISO Speed" msgstr "ISO-hastighet" -#: ../src/photos-properties-dialog.c:588 +#: src/photos-properties-dialog.c:588 msgid "Flash" msgstr "Blitz" -#: ../src/photos-properties-dialog.c:597 +#: src/photos-properties-dialog.c:597 msgid "Modifications" msgstr "Endringer" -#: ../src/photos-properties-dialog.c:738 +#: src/photos-properties-dialog.c:738 msgid "Off, did not fire" msgstr "Av, fyrte ikke" -#: ../src/photos-properties-dialog.c:740 +#: src/photos-properties-dialog.c:740 msgid "On, fired" msgstr "På, fyrte" -#: ../src/photos-properties-dialog.c:778 +#: src/photos-properties-dialog.c:778 msgid "Discard all Edits" msgstr "Forkast alle redigeringer" -#: ../src/photos-search-match-manager.c:162 -#: ../src/photos-search-type-manager.c:112 ../src/photos-source-manager.c:252 +#: src/photos-search-match-manager.c:162 src/photos-search-type-manager.c:112 +#: src/photos-source-manager.c:252 msgid "All" msgstr "Alle" #. Translators: "Title" refers to "Match Title" when searching. -#: ../src/photos-search-match-manager.c:169 +#: src/photos-search-match-manager.c:169 msgctxt "Search Filter" msgid "Title" msgstr "Tittel" #. Translators: "Author" refers to "Match Author" when searching. -#: ../src/photos-search-match-manager.c:176 +#: src/photos-search-match-manager.c:176 msgctxt "Search Filter" msgid "Author" msgstr "Forfatter" @@ -727,174 +748,185 @@ #. Translators: this is a verb that refers to "All", "Title" and #. * "Author", as in "Match All", "Match Title" and "Match Author". #. -#: ../src/photos-search-match-manager.c:214 +#: src/photos-search-match-manager.c:214 msgid "Match" msgstr "Søk på" #. Translators: "Type" refers to a search filter. eg., All, Albums, #. * Favorites and Photos. #. -#: ../src/photos-search-type-manager.c:168 +#: src/photos-search-type-manager.c:168 msgctxt "Search Filter" msgid "Type" msgstr "Type" -#: ../src/photos-selection-menu.ui.h:1 +#: src/photos-selection-menu.ui:6 msgid "Select All" msgstr "Velg alle" -#: ../src/photos-selection-menu.ui.h:2 +#: src/photos-selection-menu.ui:11 msgid "Select None" msgstr "Velg ingen" -#: ../src/photos-selection-toolbar.ui.h:1 +#: src/photos-selection-toolbar.ui:20 msgid "Export" msgstr "Eksporter" -#: ../src/photos-selection-toolbar.ui.h:4 +#: src/photos-selection-toolbar.ui:112 msgid "Add to Album" msgstr "Legg til i album" -#: ../src/photos-share-dialog.ui.h:1 +#: src/photos-share-dialog.ui:27 msgctxt "dialog title" msgid "Share" msgstr "Del" -#: ../src/photos-share-point-email.c:80 +#: src/photos-share-point-email.c:80 msgid "E-Mail" msgstr "E-post" -#: ../src/photos-share-point-google.c:98 +#: src/photos-share-point-google.c:98 msgid "Failed to upload photo: Service not authorized" msgstr "Klarte ikke å laste opp bilde: Tjeneste ikke autorisert" -#: ../src/photos-share-point-google.c:100 +#: src/photos-share-point-google.c:100 msgid "Failed to upload photo" msgstr "Klarte ikke å laste opp bilde" -#: ../src/photos-source-manager.c:305 +#: src/photos-source-manager.c:305 msgid "Sources" msgstr "Kilder" -#: ../src/photos-source-notification.c:135 +#. Translators: %s refers to an online account provider, e.g., +#. * "Facebook" or "Flickr". +#. +#: src/photos-source-notification.c:138 #, c-format msgid "Your %s credentials have expired" msgstr "Påloggingsinformasjonen din for %s har utløpt" -#: ../src/photos-thumbnailer.c:73 +#: src/photos-thumbnailer.c:77 msgid "D-Bus address to use" msgstr "D-Bus-adresse som skal brukes" -#: ../src/photos-tool-colors.c:315 +#: src/photos-tool-colors.c:313 msgid "Brightness" msgstr "Lysstyrke" -#: ../src/photos-tool-colors.c:356 +#: src/photos-tool-colors.c:356 msgid "Contrast" msgstr "Kontrast" -#: ../src/photos-tool-colors.c:376 +#: src/photos-tool-colors.c:377 msgid "Blacks" msgstr "Sortfarger" -#: ../src/photos-tool-colors.c:396 +#: src/photos-tool-colors.c:398 msgid "Saturation" msgstr "Metning" -#: ../src/photos-tool-colors.c:423 +#: src/photos-tool-colors.c:426 msgid "Colors" msgstr "Farger" -#: ../src/photos-tool-crop.c:119 +#: src/photos-tool-crop.c:123 msgid "Free" msgstr "Ledig" -#: ../src/photos-tool-crop.c:120 +#: src/photos-tool-crop.c:124 msgid "Original" msgstr "Original" -#: ../src/photos-tool-crop.c:121 +#: src/photos-tool-crop.c:125 msgid "1×1 (Square)" msgstr "1x1 (Firkant)" -#: ../src/photos-tool-crop.c:122 +#: src/photos-tool-crop.c:126 msgid "10×8 / 5×4" msgstr "10×8 / 5×4" -#: ../src/photos-tool-crop.c:123 +#: src/photos-tool-crop.c:127 msgid "4×3 / 8×6 (1024×768)" msgstr "4×3 / 8×6 (1024×768)" -#: ../src/photos-tool-crop.c:124 +#: src/photos-tool-crop.c:128 msgid "7×5" msgstr "7×5" -#: ../src/photos-tool-crop.c:125 +#: src/photos-tool-crop.c:129 msgid "3×2 / 6×4" msgstr "3×2 / 6×4" -#: ../src/photos-tool-crop.c:126 +#: src/photos-tool-crop.c:130 msgid "16×10 (1280×800)" msgstr "16×10 (1280×800)" -#: ../src/photos-tool-crop.c:127 +#: src/photos-tool-crop.c:131 msgid "16×9 (1920×1080)" msgstr "16×9 (1920×1080)" -#: ../src/photos-tool-crop.c:1171 +#: src/photos-tool-crop.c:1255 msgid "Lock aspect ratio" msgstr "Lås høyde-/breddeforhold" -#: ../src/photos-tool-crop.c:1219 +#: src/photos-tool-crop.c:1323 +msgid "Landscape" +msgstr "Landskap" + +#: src/photos-tool-crop.c:1334 +msgid "Portrait" +msgstr "Portrett" + +#: src/photos-tool-crop.c:1345 msgid "Reset" msgstr "Nullstill" -#: ../src/photos-tool-crop.c:1236 +#: src/photos-tool-crop.c:1365 msgid "Crop" msgstr "Beskjær" -#: ../src/photos-tool-enhance.c:202 +#: src/photos-tool-enhance.c:200 msgid "Sharpen" msgstr "Skarpere" -#: ../src/photos-tool-enhance.c:222 +#: src/photos-tool-enhance.c:221 msgid "Denoise" msgstr "Mindre støy" -#: ../src/photos-tool-enhance.c:248 +#: src/photos-tool-enhance.c:248 msgid "Enhance" msgstr "Forbedre" #. Translators: "None" refers to the nop magic filter when editing. -#: ../src/photos-tool-filters.c:185 +#: src/photos-tool-filters.c:185 msgctxt "Edit Filter" msgid "None" msgstr "Ingen" -#: ../src/photos-tool-filters.c:192 +#: src/photos-tool-filters.c:192 msgid "1947" msgstr "1947" -#: ../src/photos-tool-filters.c:199 +#: src/photos-tool-filters.c:199 msgid "Calistoga" msgstr "Calistoga" -#: ../src/photos-tool-filters.c:205 +#: src/photos-tool-filters.c:205 msgid "Mogadishu" msgstr "Mogadishu" -#: ../src/photos-tool-filters.c:212 +#: src/photos-tool-filters.c:212 msgid "Caap" msgstr "Caap" -#: ../src/photos-tool-filters.c:218 +#: src/photos-tool-filters.c:218 msgid "Hometown" msgstr "Hjemby" -#: ../src/photos-tool-filters.c:236 +#: src/photos-tool-filters.c:236 msgid "Filters" msgstr "Filtre" -#: ../src/photos-tracker-controller.c:168 +#: src/photos-tracker-controller.c:168 msgid "Unable to fetch the list of photos" msgstr "Klarte ikke å hente liste med bilder" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/src/photos-local-item.c new/gnome-photos-3.26.3/src/photos-local-item.c --- old/gnome-photos-3.26.2/src/photos-local-item.c 2017-11-03 11:18:35.000000000 +0100 +++ new/gnome-photos-3.26.3/src/photos-local-item.c 2017-12-14 13:18:44.000000000 +0100 @@ -273,7 +273,10 @@ old_shared_variant = g_variant_parse (array_type, shared_string, NULL, NULL, error); if (old_shared_variant == NULL) - goto out; + { + g_variant_builder_clear (&builder); + goto out; + } g_variant_iter_init (&iter, old_shared_variant); child = g_variant_iter_next_value (&iter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/src/photos-main-toolbar.c new/gnome-photos-3.26.3/src/photos-main-toolbar.c --- old/gnome-photos-3.26.2/src/photos-main-toolbar.c 2017-11-03 11:18:35.000000000 +0100 +++ new/gnome-photos-3.26.3/src/photos-main-toolbar.c 2017-12-14 13:18:44.000000000 +0100 @@ -506,7 +506,7 @@ static void photos_main_toolbar_populate_for_preview (PhotosMainToolbar *self) { - GMenu *preview_menu; + GMenu *preview_menu = NULL; GtkWidget *back_button; GtkWidget *edit_button; GtkWidget *image; @@ -565,6 +565,8 @@ G_CALLBACK (photos_main_toolbar_item_active_changed), self, G_CONNECT_SWAPPED); + + g_object_unref (preview_menu); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/src/photos-operation-insta-curve.c new/gnome-photos-3.26.3/src/photos-operation-insta-curve.c --- old/gnome-photos-3.26.2/src/photos-operation-insta-curve.c 2017-11-03 11:18:35.000000000 +0100 +++ new/gnome-photos-3.26.3/src/photos-operation-insta-curve.c 2017-12-14 13:18:54.000000000 +0100 @@ -442,7 +442,7 @@ for (i = 0; i < n_pixels; i++) { - const gfloat saturation = 0.1; + const gfloat saturation = 0.1f; guint max; out[0] = photos_operation_insta_curve_interpolate (in[0], BRANNAN_R, BRANNAN_A); @@ -453,13 +453,13 @@ max = (out[max] > out[2]) ? max : 2; if (max != 0) - out[0] += (guint8) ((out[max] - out[0]) * saturation + 0.5); + out[0] += (guint8) ((out[max] - out[0]) * saturation + 0.5f); if (max != 1) - out[1] += (guint8) ((out[max] - out[1]) * saturation + 0.5); + out[1] += (guint8) ((out[max] - out[1]) * saturation + 0.5f); if (max != 2) - out[2] += (guint8) ((out[max] - out[2]) * saturation + 0.5); + out[2] += (guint8) ((out[max] - out[2]) * saturation + 0.5f); out[3] = in[3]; @@ -483,7 +483,7 @@ for (i = 0; i < n_pixels; i++) { - const gfloat saturation = 0.1; + const gfloat saturation = 0.1f; guint max; out[0] = BRANNAN_R[in[0]]; @@ -498,13 +498,13 @@ max = (out[max] > out[2]) ? max : 2; if (max != 0) - out[0] += (guint8) ((out[max] - out[0]) * saturation + 0.5); + out[0] += (guint8) ((out[max] - out[0]) * saturation + 0.5f); if (max != 1) - out[1] += (guint8) ((out[max] - out[1]) * saturation + 0.5); + out[1] += (guint8) ((out[max] - out[1]) * saturation + 0.5f); if (max != 2) - out[2] += (guint8) ((out[max] - out[2]) * saturation + 0.5); + out[2] += (guint8) ((out[max] - out[2]) * saturation + 0.5f); out[3] = in[3]; @@ -528,7 +528,7 @@ for (i = 0; i < n_pixels; i++) { - const gfloat saturation = 0.1; + const gfloat saturation = 0.1f; guint max; out[0] = photos_operation_insta_curve_interpolate (in[0], BRANNAN_R, BRANNAN_A); @@ -539,13 +539,13 @@ max = (out[max] > out[2]) ? max : 2; if (max != 0) - out[0] += (guint8) ((out[max] - out[0]) * saturation + 0.5); + out[0] += (guint8) ((out[max] - out[0]) * saturation + 0.5f); if (max != 1) - out[1] += (guint8) ((out[max] - out[1]) * saturation + 0.5); + out[1] += (guint8) ((out[max] - out[1]) * saturation + 0.5f); if (max != 2) - out[2] += (guint8) ((out[max] - out[2]) * saturation + 0.5); + out[2] += (guint8) ((out[max] - out[2]) * saturation + 0.5f); in += 3; out += 3; @@ -567,7 +567,7 @@ for (i = 0; i < n_pixels; i++) { - const gfloat saturation = 0.1; + const gfloat saturation = 0.1f; guint max; out[0] = BRANNAN_R[in[0]]; @@ -582,13 +582,13 @@ max = (out[max] > out[2]) ? max : 2; if (max != 0) - out[0] += (guint8) ((out[max] - out[0]) * saturation + 0.5); + out[0] += (guint8) ((out[max] - out[0]) * saturation + 0.5f); if (max != 1) - out[1] += (guint8) ((out[max] - out[1]) * saturation + 0.5); + out[1] += (guint8) ((out[max] - out[1]) * saturation + 0.5f); if (max != 2) - out[2] += (guint8) ((out[max] - out[2]) * saturation + 0.5); + out[2] += (guint8) ((out[max] - out[2]) * saturation + 0.5f); in += 3; out += 3; @@ -717,12 +717,12 @@ for (i = 0; i < n_pixels; i++) { - const gfloat brightness = -0.05; - const gfloat contrast = 1.1; + const gfloat brightness = -0.05f; + const gfloat contrast = 1.1f; - out[0] = (in[0] - 0.5f) * contrast + brightness + 0.5; - out[1] = (in[1] - 0.5f) * contrast + brightness + 0.5; - out[2] = (in[2] - 0.5f) * contrast + brightness + 0.5; + out[0] = (in[0] - 0.5f) * contrast + brightness + 0.5f; + out[1] = (in[1] - 0.5f) * contrast + brightness + 0.5f; + out[2] = (in[2] - 0.5f) * contrast + brightness + 0.5f; out[0] = photos_operation_insta_curve_interpolate (out[0], NASHVILLE_R, NASHVILLE_A); out[1] = photos_operation_insta_curve_interpolate (out[1], NASHVILLE_G, NASHVILLE_A); @@ -750,24 +750,24 @@ for (i = 0; i < n_pixels; i++) { - const gfloat brightness = -0.05; - const gfloat contrast = 1.1; + const gfloat brightness = -0.05f; + const gfloat contrast = 1.1f; gfloat channel; - channel = in[0] / 255.0; - channel = (channel - 0.5f) * contrast + brightness + 0.5; - channel = CLAMP (channel, 0.0, 1.0); - out[0] = (guint8) (channel * 255.0); - - channel = in[1] / 255.0; - out[1] = (channel - 0.5f) * contrast + brightness + 0.5; - channel = CLAMP (channel, 0.0, 1.0); - out[1] = (guint8) (channel * 255.0); - - channel = in[2] / 255.0; - out[2] = (channel - 0.5f) * contrast + brightness + 0.5; - channel = CLAMP (channel, 0.0, 1.0); - out[2] = (guint8) (channel * 255.0); + channel = in[0] / 255.0f; + channel = (channel - 0.5f) * contrast + brightness + 0.5f; + channel = CLAMP (channel, 0.0f, 1.0f); + out[0] = (guint8) (channel * 255.0f); + + channel = in[1] / 255.0f; + channel = (channel - 0.5f) * contrast + brightness + 0.5f; + channel = CLAMP (channel, 0.0f, 1.0f); + out[1] = (guint8) (channel * 255.0f); + + channel = in[2] / 255.0f; + channel = (channel - 0.5f) * contrast + brightness + 0.5f; + channel = CLAMP (channel, 0.0f, 1.0f); + out[2] = (guint8) (channel * 255.0f); out[0] = NASHVILLE_R[out[0]]; out[1] = NASHVILLE_G[out[1]]; @@ -799,12 +799,12 @@ for (i = 0; i < n_pixels; i++) { - const gfloat brightness = -0.05; - const gfloat contrast = 1.1; + const gfloat brightness = -0.05f; + const gfloat contrast = 1.1f; - out[0] = (in[0] - 0.5f) * contrast + brightness + 0.5; - out[1] = (in[1] - 0.5f) * contrast + brightness + 0.5; - out[2] = (in[2] - 0.5f) * contrast + brightness + 0.5; + out[0] = (in[0] - 0.5f) * contrast + brightness + 0.5f; + out[1] = (in[1] - 0.5f) * contrast + brightness + 0.5f; + out[2] = (in[2] - 0.5f) * contrast + brightness + 0.5f; out[0] = photos_operation_insta_curve_interpolate (out[0], NASHVILLE_R, NASHVILLE_A); out[1] = photos_operation_insta_curve_interpolate (out[1], NASHVILLE_G, NASHVILLE_A); @@ -830,24 +830,24 @@ for (i = 0; i < n_pixels; i++) { - const gfloat brightness = -0.05; - const gfloat contrast = 1.1; + const gfloat brightness = -0.05f; + const gfloat contrast = 1.1f; gfloat channel; - channel = in[0] / 255.0; - channel = (channel - 0.5f) * contrast + brightness + 0.5; - channel = CLAMP (channel, 0.0, 1.0); - out[0] = (guint8) (channel * 255.0); - - channel = in[1] / 255.0; - out[1] = (channel - 0.5f) * contrast + brightness + 0.5; - channel = CLAMP (channel, 0.0, 1.0); - out[1] = (guint8) (channel * 255.0); - - channel = in[2] / 255.0; - out[2] = (channel - 0.5f) * contrast + brightness + 0.5; - channel = CLAMP (channel, 0.0, 1.0); - out[2] = (guint8) (channel * 255.0); + channel = in[0] / 255.0f; + channel = (channel - 0.5f) * contrast + brightness + 0.5f; + channel = CLAMP (channel, 0.0f, 1.0f); + out[0] = (guint8) (channel * 255.0f); + + channel = in[1] / 255.0f; + channel = (channel - 0.5f) * contrast + brightness + 0.5f; + channel = CLAMP (channel, 0.0f, 1.0f); + out[1] = (guint8) (channel * 255.0f); + + channel = in[2] / 255.0f; + channel = (channel - 0.5f) * contrast + brightness + 0.5f; + channel = CLAMP (channel, 0.0f, 1.0f); + out[2] = (guint8) (channel * 255.0f); out[0] = NASHVILLE_R[out[0]]; out[1] = NASHVILLE_G[out[1]]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/src/photos-operation-insta-hefe-curve.c new/gnome-photos-3.26.3/src/photos-operation-insta-hefe-curve.c --- old/gnome-photos-3.26.2/src/photos-operation-insta-hefe-curve.c 2017-10-12 18:24:03.000000000 +0200 +++ new/gnome-photos-3.26.3/src/photos-operation-insta-hefe-curve.c 2017-12-14 13:18:54.000000000 +0100 @@ -71,9 +71,9 @@ const float r2 = r * r; const float r3 = r2 * r; - out[0] = -13.47f * r3 * r3 + 41.23f * r3 * r2 - 45.04f * r2 * r2 + 19.17 * r3 - 1.492f * r2 + 0.5954f * r; - out[1] = -12.28f * g3 * g3 + 41.09f * g3 * g2 - 50.52f * g2 * g2 + 26.03 * g3 - 3.916f * g2 + 0.58f * g; - out[2] = -1.066f * b3 * b3 + 9.679f * b3 * b2 - 19.09f * b2 * b2 + 12.92 * b3 - 1.835f * b2 + 0.3487f * b; + out[0] = -13.47f * r3 * r3 + 41.23f * r3 * r2 - 45.04f * r2 * r2 + 19.17f * r3 - 1.492f * r2 + 0.5954f * r; + out[1] = -12.28f * g3 * g3 + 41.09f * g3 * g2 - 50.52f * g2 * g2 + 26.03f * g3 - 3.916f * g2 + 0.58f * g; + out[2] = -1.066f * b3 * b3 + 9.679f * b3 * b2 - 19.09f * b2 * b2 + 12.92f * b3 - 1.835f * b2 + 0.3487f * b; out[3] = in[3]; in += 4; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/src/photos-preview-nav-buttons.c new/gnome-photos-3.26.3/src/photos-preview-nav-buttons.c --- old/gnome-photos-3.26.2/src/photos-preview-nav-buttons.c 2017-11-03 11:18:35.000000000 +0100 +++ new/gnome-photos-3.26.3/src/photos-preview-nav-buttons.c 2017-12-14 13:18:44.000000000 +0100 @@ -145,11 +145,11 @@ static void photos_preview_nav_buttons_fade_out_button (PhotosPreviewNavButtons *self, GtkWidget *widget) { - gtk_revealer_set_reveal_child (GTK_REVEALER (widget), FALSE); g_signal_connect_swapped (widget, "notify::child-revealed", G_CALLBACK (photos_preview_nav_buttons_notify_child_revealed), self); + gtk_revealer_set_reveal_child (GTK_REVEALER (widget), FALSE); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/src/photos-properties-dialog.c new/gnome-photos-3.26.3/src/photos-properties-dialog.c --- old/gnome-photos-3.26.2/src/photos-properties-dialog.c 2017-11-03 11:18:35.000000000 +0100 +++ new/gnome-photos-3.26.3/src/photos-properties-dialog.c 2017-12-14 13:18:44.000000000 +0100 @@ -232,6 +232,7 @@ if (error != NULL) { g_warning ("Unable to query latitude and longitude: %s", error->message); + g_error_free (error); goto out; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/src/photos-spinner-box.c new/gnome-photos-3.26.3/src/photos-spinner-box.c --- old/gnome-photos-3.26.2/src/photos-spinner-box.c 2017-10-26 12:29:01.000000000 +0200 +++ new/gnome-photos-3.26.3/src/photos-spinner-box.c 2017-12-08 20:09:18.000000000 +0100 @@ -104,8 +104,8 @@ void photos_spinner_box_stop (PhotosSpinnerBox *self) { - gtk_revealer_set_reveal_child (GTK_REVEALER (self), FALSE); g_signal_connect (self, "notify::child-revealed", G_CALLBACK (photos_spinner_box_notify_child_revealed), NULL); + gtk_revealer_set_reveal_child (GTK_REVEALER (self), FALSE); gtk_spinner_stop (GTK_SPINNER (self->spinner)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-photos-3.26.2/src/photos-utils.c new/gnome-photos-3.26.3/src/photos-utils.c --- old/gnome-photos-3.26.2/src/photos-utils.c 2017-11-03 11:18:35.000000000 +0100 +++ new/gnome-photos-3.26.3/src/photos-utils.c 2017-12-14 13:18:44.000000000 +0100 @@ -418,6 +418,9 @@ } thumb_path = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH); + if (thumb_path == NULL) + goto out; + thumb_file = g_file_new_for_path (thumb_path); icon = g_file_icon_new (thumb_file);
