diff -Nru gnome-screenshot-3.18.0/config.guess gnome-screenshot-3.18.0/config.guess --- gnome-screenshot-3.18.0/config.guess 2015-09-22 21:30:24.000000000 +0000 +++ gnome-screenshot-3.18.0/config.guess 2016-05-13 19:01:18.000000000 +0000 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2015-01-01' +timestamp='2015-08-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -168,20 +168,27 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -197,6 +204,13 @@ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +221,13 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -235,6 +249,9 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -933,6 +950,9 @@ crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1021,7 +1041,7 @@ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} diff -Nru gnome-screenshot-3.18.0/config.sub gnome-screenshot-3.18.0/config.sub --- gnome-screenshot-3.18.0/config.sub 2015-09-22 21:30:24.000000000 +0000 +++ gnome-screenshot-3.18.0/config.sub 2016-05-13 19:01:18.000000000 +0000 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2015-01-01' +timestamp='2015-08-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -117,7 +117,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -255,11 +255,12 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ + | e2k | epiphany \ | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ @@ -305,7 +306,7 @@ | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -376,12 +377,13 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ @@ -428,12 +430,13 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -518,6 +521,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -1025,7 +1031,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1373,7 +1379,7 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ diff -Nru gnome-screenshot-3.18.0/debian/changelog gnome-screenshot-3.18.0/debian/changelog --- gnome-screenshot-3.18.0/debian/changelog 2015-11-02 18:04:23.000000000 +0000 +++ gnome-screenshot-3.18.0/debian/changelog 2016-05-13 19:04:22.000000000 +0000 @@ -1,3 +1,20 @@ +gnome-screenshot (3.18.0-2ubuntu1) xenial; urgency=emergency + + * Fix/Update hr.po + + -- Goran Vidovic (gogo) Fri, 13 May 2016 21:04:05 +0100 + +gnome-screenshot (3.18.0-2linuxmint1) sarah; urgency=medium + + * Removed help button + * Removed menu + * Removed headerbars + * Force interactive mode everywhere but in GNOME + * Only use GNOME's screenshot interface when running in GNOME + * Fixed window titles + + -- Clement Lefebvre Fri, 13 May 2016 16:44:49 +0100 + gnome-screenshot (3.18.0-1ubuntu2) xenial; urgency=medium * 0002-Scale-images-by-the-scale-factor-in-use.patch: Drop - this patch was diff -Nru gnome-screenshot-3.18.0/debian/source/format gnome-screenshot-3.18.0/debian/source/format --- gnome-screenshot-3.18.0/debian/source/format 2015-10-29 03:46:44.000000000 +0000 +++ gnome-screenshot-3.18.0/debian/source/format 2016-05-13 19:01:18.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru gnome-screenshot-3.18.0/po/hr.po gnome-screenshot-3.18.0/po/hr.po --- gnome-screenshot-3.18.0/po/hr.po 2014-03-07 02:11:36.000000000 +0000 +++ gnome-screenshot-3.18.0/po/hr.po 2016-05-13 19:01:18.000000000 +0000 @@ -5,304 +5,391 @@ msgstr "" "Project-Id-Version: gnome-utils 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-06 14:33-0400\n" -"PO-Revision-Date: 2008-04-15 00:46+0000\n" -"Last-Translator: Launchpad Translations Administrators \n" +"POT-Creation-Date: 2016-05-13 19:23+0200\n" +"PO-Revision-Date: 2016-05-03 16:49+0000\n" +"Last-Translator: gogo \n" "Language-Team: Croatian \n" "Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2008-05-27 22:39+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#: ../src/gnome-screenshot.c:143 -#, fuzzy -msgid "Error while saving screenshot" -msgstr "Nepoznata greška prilikom spremanja prikaza zaslona na disk" +"X-Launchpad-Export-Date: 2016-05-13 17:16+0000\n" +"X-Generator: Launchpad (build 18025)\n" -#: ../src/gnome-screenshot.c:147 -#, c-format -msgid "" -"Impossible to save the screenshot to %s.\n" -" Error was %s.\n" -" Please choose another location and retry." -msgstr "" +#: ../src/org.gnome.Screenshot.desktop.in.h:1 +#: ../src/screenshot-application.c:758 +msgid "Screenshot" +msgstr "Slika zaslona" -#: ../src/gnome-screenshot.c:336 -#, fuzzy -msgid "Screenshot taken" -msgstr "Direktorij prikaza zaslona" +#: ../src/org.gnome.Screenshot.desktop.in.h:2 +#: ../src/org.gnome.Screenshot.appdata.xml.in.h:2 +#: ../src/screenshot-application.c:759 +msgid "Save images of your screen or individual windows" +msgstr "Spremite slike vašeg zaslona ili određenih prozora" + +#: ../src/org.gnome.Screenshot.desktop.in.h:3 +msgid "snapshot;capture;print;screenshot;" +msgstr "snimak;snimi;ispiši;slika zaslona;" + +#: ../src/org.gnome.Screenshot.desktop.in.h:4 +msgid "Take a Screenshot of the Whole Screen" +msgstr "Uslikajte cijeli zaslon" + +#: ../src/org.gnome.Screenshot.desktop.in.h:5 +msgid "Take a Screenshot of the Current Window" +msgstr "Uslikajte trenutni prozor" + +#: ../src/org.gnome.Screenshot.desktop.in.h:6 +msgid "Take a Screenshot of a Selected Area" +msgstr "Uslikajte odabrano područje" + +#: ../src/org.gnome.Screenshot.appdata.xml.in.h:1 +msgid "GNOME Screenshot" +msgstr "GNOME Slika zaslona" -#: ../src/gnome-screenshot.c:495 -msgid "Unable to take a screenshot of the current window" -msgstr "" +#: ../src/org.gnome.Screenshot.appdata.xml.in.h:3 +msgid "" +"GNOME Screenshot is a simple utility that lets you take pictures of your " +"computer screen. Screenshots can be of your whole screen, any specific " +"application, or a selected rectangular area. You can also copy the captured " +"screenshot directly into the GNOME clipboard and paste it into other " +"applications." +msgstr "" +"GNOME Slika zaslona je jednostavan alat koji vam omogućuje uslikavanje " +"zaslona vašeg računala. Uslikati možete cijeli zaslon, određenu apliakciju " +"ili odabrano područje zaslona. Možete i kopirati sliku zaslona izravno u " +"GNOME međuspremnik i zalijepiti ju u neku drugu aplikaciju." -#: ../src/gnome-screenshot.c:662 -msgid "Send the grab directly to the clipboard" -msgstr "" +#: ../src/org.gnome.Screenshot.appdata.xml.in.h:4 +msgid "" +"GNOME Screenshot allows you to take screenshots even when it's not open: " +"just press the PrtSc button on your keyboard, and a snapshot of your whole " +"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc " +"and you will get a screenshot of only the currently selected window." +msgstr "" +"GNOME Slika zaslona omogućuje vam uslikavanje čak i ako nije otvoren. " +"Jednostavno pritisnite PrtSc tipku na vašoj tipkovnici i snimak vašeg " +"cijelog zaslona će bit spremljen u vašu mapu Slika. Držite pritisnutim Alt " +"dok pritiskate PrtSc i dobiti ćete snimku trenutno odabranog prozora." + +#: ../src/screenshot-app-menu.ui.h:1 +msgid "Help" +msgstr "Pomoć" + +#: ../src/screenshot-app-menu.ui.h:2 +msgid "About" +msgstr "O programu" + +#: ../src/screenshot-app-menu.ui.h:3 +msgid "Quit" +msgstr "Zatvori" -#: ../src/gnome-screenshot.c:663 -msgid "Grab a window instead of the entire screen" -msgstr "Snimi prozor umjesto cijelog zaslona" +#: ../src/screenshot-dialog.ui.h:1 ../src/screenshot-dialog.c:228 +msgid "Save Screenshot" +msgstr "Spremi sliku zaslona" -#: ../src/gnome-screenshot.c:664 -#, fuzzy -msgid "Grab an area of the screen instead of the entire screen" -msgstr "Snimi prozor umjesto cijelog zaslona" +#: ../src/screenshot-dialog.ui.h:2 ../src/screenshot-dialog.c:235 +msgid "C_opy to Clipboard" +msgstr "K_opiraj u međuspremnik" -#: ../src/gnome-screenshot.c:665 -msgid "Include the window border with the screenshot" -msgstr "Uključi okvir prozora u prikaz zaslona" +#: ../src/screenshot-dialog.ui.h:3 ../src/screenshot-dialog.c:240 +msgid "_Save" +msgstr "_Spremi" -#: ../src/gnome-screenshot.c:666 -#, fuzzy -msgid "Remove the window border from the screenshot" -msgstr "Uključi okvir prozora u prikaz zaslona" +#: ../src/screenshot-dialog.ui.h:4 +msgid "_Name:" +msgstr "_Naziv:" -#: ../src/gnome-screenshot.c:667 -msgid "Take screenshot after specified delay [in seconds]" -msgstr "Snimi prikaz zaslona nakon određene odgode [u sekundama]" +#: ../src/screenshot-dialog.ui.h:5 +msgid "Save in _folder:" +msgstr "Spremi u _mapu:" -#. translators: this is the last part of the "grab after a -#. * delay of seconds". -#. -#: ../src/gnome-screenshot.c:667 ../src/screenshot-interactive-dialog.c:423 -msgid "seconds" -msgstr "sekundi/e" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:1 +msgid "Window-specific screenshot (deprecated)" +msgstr "Slika određenog prozora (zastarjelo)" -#: ../src/gnome-screenshot.c:668 -msgid "Effect to add to the border (shadow, border or none)" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:2 +msgid "" +"Grab just the current window, rather than the whole desktop. This key has " +"been deprecated and it is no longer in use." msgstr "" +"Uslikaj samo trenutni prozor, a ne cijelu radnu površinu. Ova tipka je " +"zastarjela te se više ne koristi." -#: ../src/gnome-screenshot.c:668 -msgid "effect" -msgstr "efekt" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3 +msgid "Screenshot delay" +msgstr "Odgoda uslikavanja" -#: ../src/gnome-screenshot.c:669 -msgid "Interactively set options" -msgstr "" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:4 +msgid "The number of seconds to wait before taking the screenshot." +msgstr "Broj sekundi koji će se čekati prije uslikavanja." -#: ../src/gnome-screenshot.c:680 -msgid "Take a picture of the screen" -msgstr "Snimi sliku zaslona" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:5 +msgid "Screenshot directory" +msgstr "Direktorij slika zaslona" -#: ../src/gnome-screenshot.desktop.in.h:1 -msgid "Save images of your desktop or individual windows" -msgstr "" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:6 +msgid "The directory where the screenshots will be saved by default." +msgstr "Uobičajeni direktorij za spremanje slika zaslona i prozora." -#: ../src/gnome-screenshot.desktop.in.h:2 -#, fuzzy -msgid "Screenshot" -msgstr "Prikaz_zaslona.png" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:7 +msgid "Last save directory" +msgstr "Posljednji direktorij spremanja" -#: ../src/gnome-screenshot.desktop.in.h:3 -#, fuzzy -msgid "Take a screenshot of the current window" -msgstr "Snimi sliku zaslona" - -#: ../src/gnome-screenshot.desktop.in.h:4 -#, fuzzy -msgid "Take a screenshot of the whole screen" -msgstr "Snimi sliku zaslona" - -#: ../src/gnome-screenshot.ui.h:1 -msgid "*" -msgstr "*" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:8 +msgid "The last directory a screenshot was saved in interactive mode." +msgstr "Posljednji direktorij gdje je spremljena slika u interaktivnom načinu." -#: ../src/gnome-screenshot.ui.h:2 -msgid "C_opy to Clipboard" -msgstr "" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:9 +msgid "Include Border" +msgstr "Uključi rub" -#: ../src/gnome-screenshot.ui.h:3 -msgid "Save Screenshot" -msgstr "Spremi prikaz zaslona" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:10 +msgid "Include the window manager border along with the screenshot" +msgstr "Uključi rub upravitelja prozorima zajedno s prikazom zaslona" -#: ../src/gnome-screenshot.ui.h:4 -msgid "Save in _folder:" -msgstr "Spremi u _mapu:" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:11 +msgid "Include Pointer" +msgstr "Vidljiv pokazivač miša" -#: ../src/gnome-screenshot.ui.h:5 -msgid "_Name:" -msgstr "_Ime" +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:12 +msgid "Include the pointer in the screenshot" +msgstr "Uključi pokazivač u slici" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:1 +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:13 +msgid "Include ICC Profile" +msgstr "Uključi ICC profil" + +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:14 +msgid "Include the ICC profile of the target in the screenshot file" +msgstr "Uključi ICC profil mete u datoteci slike" + +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:15 msgid "Border Effect" msgstr "Efekt okvira" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:2 +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:16 msgid "" "Effect to add to the outside of a border. Possible values are \"shadow\", " "\"none\", and \"border\"." msgstr "" +"Efekt koji će se dodati vanjskom rubu. Moguće vrijednosti su \"sjena\", " +"\"ništa\" i \"rub\"." -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3 -#, fuzzy -msgid "" -"Grab just the current window, rather than the whole desktop. This key has " -"been deprecated and it is no longer in use." +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:17 +msgid "Default file type extension" +msgstr "Zadana vrsta datoteke" + +#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:18 +msgid "The default file type extension for screenshots." +msgstr "Zadana vrsta datoteke za slike zaslona." + +#: ../src/screenshot-application.c:145 +#, c-format +msgid "A file named \"%s\" already exists in \"%s\"" +msgstr "Datoteka naziva \"%s\" već postoji u \"%s\"" + +#: ../src/screenshot-application.c:152 +msgid "Overwrite existing file?" +msgstr "Prepisati preko postojeće datoteke?" + +#: ../src/screenshot-application.c:174 ../src/screenshot-application.c:183 +#: ../src/screenshot-application.c:463 ../src/screenshot-application.c:467 +#: ../src/screenshot-application.c:507 ../src/screenshot-application.c:510 +msgid "Unable to capture a screenshot" +msgstr "Nemoguće uslikati" + +#: ../src/screenshot-application.c:175 +msgid "Error creating file. Please choose another location and retry." msgstr "" -"Broj porta koji će se koristiti. Uobičajeni port je 2628. Ovaj ključ je " -"neodobravan i nije više u upotrebi." +"Greška pri stvaranju datoteke. Odaberite drugu lokaciju i pokušajte ponovno." -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:4 -msgid "Include Border" -msgstr "Uključi okvir" +#: ../src/screenshot-application.c:464 +msgid "Error creating file" +msgstr "Greška pri stvaranju datoteke" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:5 -#, fuzzy -msgid "Include ICC Profile" -msgstr "Uključi okvir" +#: ../src/screenshot-application.c:475 ../src/screenshot-application.c:543 +msgid "Screenshot taken" +msgstr "Slika zaslona uslikana" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:6 -#, fuzzy -msgid "Include Pointer" -msgstr "Uključi okvir" +#: ../src/screenshot-application.c:508 +msgid "All possible methods failed" +msgstr "Nije uspio nijedan način" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:7 -#, fuzzy -msgid "Include the ICC profile of the target in the screenshot file" -msgstr "Uključi okvir prozora u prikaz zaslona" +#: ../src/screenshot-application.c:631 +msgid "Send the grab directly to the clipboard" +msgstr "Pošalji uslikano područje izravno u međuspremnik" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:8 -#, fuzzy -msgid "Include the pointer in the screenshot" -msgstr "Uključi okvir prozora u prikaz zaslona" +#: ../src/screenshot-application.c:632 +msgid "Grab a window instead of the entire screen" +msgstr "Uslikaj prozor umjesto cijelog zaslona" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:9 -msgid "Include the window manager border along with the screenshot" -msgstr "Uključi okvir upravitelja prozorima zajedno sa prikazom zaslona" +#: ../src/screenshot-application.c:633 +msgid "Grab an area of the screen instead of the entire screen" +msgstr "Uslikaj određeno područje zaslona umjesto cijelog zaslona" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:10 -#, fuzzy -msgid "Screenshot delay" -msgstr "Direktorij prikaza zaslona" +#: ../src/screenshot-application.c:634 +msgid "Include the window border with the screenshot" +msgstr "Uključi rub prozora u slici zaslona" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:11 -msgid "Screenshot directory" -msgstr "Direktorij prikaza zaslona" +#: ../src/screenshot-application.c:635 +msgid "Remove the window border from the screenshot" +msgstr "Ukloni rub prozora sa slike prozora" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:12 -msgid "The directory the last screenshot was saved in." -msgstr "Direktorij gdje je zadnji prikaz zaslona bio spremljen." +#: ../src/screenshot-application.c:636 +msgid "Include the pointer with the screenshot" +msgstr "Uključi pokazivač miša u slici zaslona" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:13 -msgid "The number of seconds to wait before taking the screenshot." -msgstr "" +#: ../src/screenshot-application.c:637 +msgid "Take screenshot after specified delay [in seconds]" +msgstr "Uslikaj sliku zaslona nakon određene odgode [u sekundama]" -#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:14 -msgid "Window-specific screenshot (deprecated)" -msgstr "" +#. translators: this is the last part of the "grab after a +#. * delay of seconds". +#. +#: ../src/screenshot-application.c:637 +#: ../src/screenshot-interactive-dialog.c:408 +msgid "seconds" +msgstr "sekunda" + +#: ../src/screenshot-application.c:638 +msgid "Effect to add to the border (shadow, border, vintage or none)" +msgstr "Efekti za dodavanje na rubove sjenka, rub, prastaro ili ništa)" + +#: ../src/screenshot-application.c:638 +msgid "effect" +msgstr "efekt" -#: ../src/screenshot-config.c:78 +#: ../src/screenshot-application.c:639 +msgid "Interactively set options" +msgstr "Interaktivno postavi mogućnosti" + +#: ../src/screenshot-application.c:640 +msgid "Save screenshot directly to this file" +msgstr "Spremi slike zaslona izravno u ovu datoteku" + +#: ../src/screenshot-application.c:640 +msgid "filename" +msgstr "naziv datoteke" + +#: ../src/screenshot-application.c:641 +msgid "Print version information and exit" +msgstr "Ispiši podatke o inačici i izađi" + +#: ../src/screenshot-application.c:761 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Launchpad Translations Administrators https://launchpad.net/~rosetta\n" +" Miroslav Matejaš https://launchpad.net/~silverspace+amd64\n" +" antisa https://launchpad.net/~antisa\n" +" gogo https://launchpad.net/~trebelnik-stefina" + +#: ../src/screenshot-config.c:116 #, c-format msgid "" "Conflicting options: --window and --area should not be used at the same " "time.\n" msgstr "" +"Mogućnosti su u sukobu: --window i --area se ne bi trebale upotrebljavati " +"istodobno.\n" -#: ../src/screenshot-config.c:85 +#: ../src/screenshot-config.c:123 #, c-format msgid "" "Conflicting options: --area and --delay should not be used at the same " "time.\n" msgstr "" +"Mogućnosti su u sukobu: --window i --delay se ne bi trebale upotrebljavati " +"istodobno.\n" -#: ../src/screenshot-dialog.c:193 -#, fuzzy -msgid "" -"UI definition file for the screenshot program is missing.\n" -"Please check your installation of gnome-utils" -msgstr "" -"Nedostaje glade datoteka za program prikaza zaslona.\n" -"Molimo provjerite gnome-utils instalaciju" - -#: ../src/screenshot-dialog.c:214 -msgid "Select a folder" -msgstr "" - -#: ../src/screenshot-dialog.c:323 +#: ../src/screenshot-dialog.c:335 msgid "Screenshot.png" -msgstr "Prikaz_zaslona.png" +msgstr "Slika zaslona.png" #. translators: this is the name of the file that gets made up #. * with the screenshot if the entire screen is taken -#: ../src/screenshot-filename-builder.c:119 -#, fuzzy, c-format -msgid "Screenshot at %s.png" -msgstr "Prikaz_zaslona-%s.png" +#: ../src/screenshot-filename-builder.c:143 +#, c-format +msgid "Screenshot from %s.%s" +msgstr "Slika zaslona %s.%s" #. translators: this is the name of the file that gets #. * made up with the screenshot if the entire screen is #. * taken -#: ../src/screenshot-filename-builder.c:126 -#, fuzzy, c-format -msgid "Screenshot at %s - %d.png" -msgstr "Prikaz_zaslona-%s-%d.png" +#: ../src/screenshot-filename-builder.c:150 +#, c-format +msgid "Screenshot from %s - %d.%s" +msgstr "Slika zaslona %s - %d.%s" -#: ../src/screenshot-interactive-dialog.c:165 +#: ../src/screenshot-interactive-dialog.c:150 msgid "None" -msgstr "" +msgstr "Ništa" -#: ../src/screenshot-interactive-dialog.c:166 +#: ../src/screenshot-interactive-dialog.c:151 msgid "Drop shadow" -msgstr "" +msgstr "Prikaži sjenku" -#: ../src/screenshot-interactive-dialog.c:167 +#: ../src/screenshot-interactive-dialog.c:152 msgid "Border" -msgstr "" +msgstr "Rub" + +#: ../src/screenshot-interactive-dialog.c:153 +msgid "Vintage" +msgstr "Prastaro" #. * Include pointer * -#: ../src/screenshot-interactive-dialog.c:271 -#, fuzzy +#: ../src/screenshot-interactive-dialog.c:257 msgid "Include _pointer" -msgstr "Uključi okvir" +msgstr "Vidljiv _pokazivač miša" #. * Include window border * -#: ../src/screenshot-interactive-dialog.c:281 +#: ../src/screenshot-interactive-dialog.c:267 msgid "Include the window _border" -msgstr "" +msgstr "Vidljiv rub _prozora" -#: ../src/screenshot-interactive-dialog.c:298 +#: ../src/screenshot-interactive-dialog.c:284 msgid "Apply _effect:" -msgstr "" +msgstr "Primijeni _efekt:" -#: ../src/screenshot-interactive-dialog.c:360 -msgid "Grab the whole _desktop" -msgstr "" +#: ../src/screenshot-interactive-dialog.c:341 +msgid "Grab the whole sc_reen" +msgstr "Uslikaj cijeli za_slon" -#: ../src/screenshot-interactive-dialog.c:374 +#: ../src/screenshot-interactive-dialog.c:355 msgid "Grab the current _window" -msgstr "" +msgstr "Uslikaj trenutni _prozor" -#: ../src/screenshot-interactive-dialog.c:386 -#, fuzzy +#: ../src/screenshot-interactive-dialog.c:367 msgid "Select _area to grab" -msgstr "Prikaži više opcija" +msgstr "Uslikaj odabrano _područje zaslona" #. translators: this is the first part of the "grab after a #. * delay of seconds". #. -#: ../src/screenshot-interactive-dialog.c:403 -msgid "Grab _after a delay of" -msgstr "" +#: ../src/screenshot-interactive-dialog.c:387 +msgid "Grab after a _delay of" +msgstr "Uslikaj nakon _odgode od" -#: ../src/screenshot-interactive-dialog.c:441 -#: ../src/screenshot-interactive-dialog.c:449 +#: ../src/screenshot-interactive-dialog.c:446 +#: ../src/screenshot-interactive-dialog.c:455 msgid "Take Screenshot" -msgstr "Snimi prikaz zaslona" +msgstr "Uslikaj prikaz zaslona" -#: ../src/screenshot-interactive-dialog.c:450 +#: ../src/screenshot-interactive-dialog.c:456 msgid "Effects" -msgstr "" +msgstr "Efekti" -#: ../src/screenshot-interactive-dialog.c:455 +#: ../src/screenshot-interactive-dialog.c:469 +msgid "_Cancel" +msgstr "_Odustani" + +#: ../src/screenshot-interactive-dialog.c:475 msgid "Take _Screenshot" -msgstr "" +msgstr "_Uslikaj sliku zaslona" -#: ../src/screenshot-utils.c:702 -msgid "Error loading the help page" -msgstr "" +#~ msgid "_Help" +#~ msgstr "_Pomoć" + +#~ msgid "Error loading the help page" +#~ msgstr "Greška pri učitavanju stranice pomoći" diff -Nru gnome-screenshot-3.18.0/src/cheese-flash.c gnome-screenshot-3.18.0/src/cheese-flash.c --- gnome-screenshot-3.18.0/src/cheese-flash.c 2014-04-09 08:03:19.000000000 +0000 +++ gnome-screenshot-3.18.0/src/cheese-flash.c 2016-05-13 19:01:19.000000000 +0000 @@ -71,7 +71,6 @@ cairo_region_t *input_region; GtkWindow *window; GdkScreen *screen; - GdkVisual *visual; priv->flash_timeout_tag = 0; priv->fade_timeout_tag = 0; @@ -89,14 +88,6 @@ gtk_window_set_accept_focus (window, FALSE); gtk_window_set_focus_on_map (window, FALSE); - /* no shadow */ - screen = gtk_widget_get_screen (GTK_WIDGET (window)); - visual = gdk_screen_get_rgba_visual (screen); - if (visual == NULL) - visual = gdk_screen_get_system_visual (screen); - - gtk_widget_set_visual (GTK_WIDGET (window), visual); - /* Don't consume input */ gtk_widget_realize (GTK_WIDGET (window)); diff -Nru gnome-screenshot-3.18.0/src/org.gnome.Screenshot.desktop.in gnome-screenshot-3.18.0/src/org.gnome.Screenshot.desktop.in --- gnome-screenshot-3.18.0/src/org.gnome.Screenshot.desktop.in 2015-02-12 23:58:55.000000000 +0000 +++ gnome-screenshot-3.18.0/src/org.gnome.Screenshot.desktop.in 2016-05-13 19:01:19.000000000 +0000 @@ -12,7 +12,7 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-utils X-GNOME-Bugzilla-Component=screenshot -Actions=screen-shot;window-shot; +Actions=screen-shot;window-shot;area-shot DBusActivatable=true [Desktop Action screen-shot] @@ -22,3 +22,8 @@ [Desktop Action window-shot] _Name=Take a Screenshot of the Current Window Exec=gnome-screenshot -w + +[Desktop Action area-shot] +_Name=Take a Screenshot of a Selected Area +Exec=gnome-screenshot -a +OnlyShowIn=Unity; diff -Nru gnome-screenshot-3.18.0/src/screenshot-application.c gnome-screenshot-3.18.0/src/screenshot-application.c --- gnome-screenshot-3.18.0/src/screenshot-application.c 2015-09-22 21:28:24.000000000 +0000 +++ gnome-screenshot-3.18.0/src/screenshot-application.c 2016-05-13 19:01:19.000000000 +0000 @@ -129,7 +129,7 @@ save_pixbuf_handle_error (ScreenshotApplication *self, GError *error) { - if (screenshot_config->interactive) + if ((!in_desktop ("GNOME")) || screenshot_config->interactive) { ScreenshotDialog *dialog = self->priv->dialog; @@ -474,7 +474,7 @@ screenshot_play_sound_effect ("screen-capture", _("Screenshot taken")); - if (screenshot_config->interactive) + if ((!in_desktop ("GNOME")) || screenshot_config->interactive) { self->priv->dialog = screenshot_dialog_new (self->priv->screenshot, self->priv->save_uri, @@ -740,15 +740,6 @@ } static void -action_help (GSimpleAction *action, - GVariant *parameter, - gpointer user_data) -{ - GList *windows = gtk_application_get_windows (GTK_APPLICATION (user_data)); - screenshot_display_help (g_list_nth_data (windows, 0)); -} - -static void action_about (GSimpleAction *action, GVariant *parameter, gpointer user_data) @@ -815,7 +806,6 @@ static GActionEntry action_entries[] = { { "about", action_about, NULL, NULL, NULL }, - { "help", action_help, NULL, NULL, NULL }, { "quit", action_quit, NULL, NULL, NULL }, { "screen-shot", action_screen_shot, NULL, NULL, NULL }, { "window-shot", action_window_shot, NULL, NULL, NULL } @@ -824,8 +814,6 @@ static void screenshot_application_startup (GApplication *app) { - GMenuModel *menu; - GtkBuilder *builder; ScreenshotApplication *self = SCREENSHOT_APPLICATION (app); G_APPLICATION_CLASS (screenshot_application_parent_class)->startup (app); @@ -836,14 +824,6 @@ g_action_map_add_action_entries (G_ACTION_MAP (self), action_entries, G_N_ELEMENTS (action_entries), self); - - builder = gtk_builder_new (); - gtk_builder_add_from_resource (builder, "/org/gnome/screenshot/screenshot-app-menu.ui", NULL); - menu = G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")); - gtk_application_set_app_menu (GTK_APPLICATION (app), menu); - - g_object_unref (builder); - g_object_unref (menu); } static void diff -Nru gnome-screenshot-3.18.0/src/screenshot-config.c gnome-screenshot-3.18.0/src/screenshot-config.c --- gnome-screenshot-3.18.0/src/screenshot-config.c 2015-09-22 21:28:24.000000000 +0000 +++ gnome-screenshot-3.18.0/src/screenshot-config.c 2016-05-13 19:01:19.000000000 +0000 @@ -170,3 +170,24 @@ return TRUE; } + +gboolean +in_desktop (const gchar *name) +{ + const gchar *desktop_name_list; + gchar **names; + gboolean in_list = FALSE; + gint i; + + desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP"); + if (!desktop_name_list) + return FALSE; + + names = g_strsplit (desktop_name_list, ":", -1); + for (i = 0; names[i] && !in_list; i++) + if (strcmp (names[i], name) == 0) + in_list = TRUE; + g_strfreev (names); + + return in_list; +} diff -Nru gnome-screenshot-3.18.0/src/screenshot-config.h gnome-screenshot-3.18.0/src/screenshot-config.h --- gnome-screenshot-3.18.0/src/screenshot-config.h 2015-09-22 21:28:24.000000000 +0000 +++ gnome-screenshot-3.18.0/src/screenshot-config.h 2016-05-13 19:01:19.000000000 +0000 @@ -62,6 +62,7 @@ guint delay_arg, gboolean interactive_arg, const gchar *file_arg); +gboolean in_desktop (const gchar *name); G_END_DECLS diff -Nru gnome-screenshot-3.18.0/src/screenshot-dialog.c gnome-screenshot-3.18.0/src/screenshot-dialog.c --- gnome-screenshot-3.18.0/src/screenshot-dialog.c 2015-09-22 21:27:34.000000000 +0000 +++ gnome-screenshot-3.18.0/src/screenshot-dialog.c 2016-05-13 19:01:19.000000000 +0000 @@ -123,12 +123,6 @@ GdkEventKey *event, gpointer user_data) { - if (event->keyval == GDK_KEY_F1) - { - screenshot_display_help (GTK_WINDOW (widget)); - return TRUE; - } - if (event->keyval == GDK_KEY_Escape) { gtk_widget_destroy (widget); @@ -227,6 +221,31 @@ g_assert (res != 0); dialog->dialog = GTK_WIDGET (gtk_builder_get_object (ui, "toplevel")); + + GtkWidget *grid, *button_box; + + gtk_window_set_titlebar (GTK_WINDOW (dialog->dialog), NULL); + gtk_window_set_title(GTK_WINDOW (dialog->dialog), _("Save Screenshot")); + + grid = GTK_WIDGET (gtk_builder_get_object (ui, "grid1")); + button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + gtk_widget_show (button_box); + gtk_grid_attach (GTK_GRID (grid), button_box, 0, 2, 3, 1); + + dialog->copy_button = gtk_button_new_with_mnemonic (_("C_opy to Clipboard")); + gtk_widget_show (dialog->copy_button); + gtk_container_add (GTK_CONTAINER (button_box), dialog->copy_button); + + dialog->save_button = gtk_widget_new (GTK_TYPE_BUTTON, + "label", _("_Save"), + "use-underline", TRUE, + "can-default", TRUE, + NULL); + gtk_window_set_default (GTK_WINDOW (dialog->dialog), dialog->save_button); + + gtk_widget_show (dialog->save_button); + gtk_container_add (GTK_CONTAINER (button_box), dialog->save_button); + gtk_window_set_application (GTK_WINDOW (dialog->dialog), GTK_APPLICATION (g_application_get_default ())); gtk_widget_realize (dialog->dialog); g_signal_connect (dialog->dialog, "key-press-event", @@ -238,9 +257,11 @@ gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget), current_folder); gtk_entry_set_text (GTK_ENTRY (dialog->filename_entry), current_name); - dialog->save_button = GTK_WIDGET (gtk_builder_get_object (ui, "save_button")); + if (!dialog->save_button) + dialog->save_button = GTK_WIDGET (gtk_builder_get_object (ui, "save_button")); g_signal_connect (dialog->save_button, "clicked", G_CALLBACK (button_clicked), dialog); - dialog->copy_button = GTK_WIDGET (gtk_builder_get_object (ui, "copy_button")); + if (!dialog->copy_button) + dialog->copy_button = GTK_WIDGET (gtk_builder_get_object (ui, "copy_button")); g_signal_connect (dialog->copy_button, "clicked", G_CALLBACK (button_clicked), dialog); setup_drawing_area (dialog, ui); diff -Nru gnome-screenshot-3.18.0/src/screenshot-interactive-dialog.c gnome-screenshot-3.18.0/src/screenshot-interactive-dialog.c --- gnome-screenshot-3.18.0/src/screenshot-interactive-dialog.c 2015-09-22 21:27:34.000000000 +0000 +++ gnome-screenshot-3.18.0/src/screenshot-interactive-dialog.c 2016-05-13 19:01:19.000000000 +0000 @@ -126,12 +126,6 @@ GdkEventKey *event, gpointer user_data) { - if (event->keyval == GDK_KEY_F1) - { - screenshot_display_help (GTK_WINDOW (widget)); - return TRUE; - } - if (event->keyval == GDK_KEY_Escape) { gtk_widget_destroy (widget); @@ -437,7 +431,6 @@ { GtkWidget *dialog; GtkWidget *main_vbox; - GtkWidget *header_bar; GtkWidget *button_box; GtkWidget *button; GtkStyleContext *context; @@ -448,11 +441,9 @@ dialog = gtk_application_window_new (GTK_APPLICATION (g_application_get_default ())); - header_bar = gtk_header_bar_new (); - gtk_window_set_titlebar (GTK_WINDOW (dialog), header_bar); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_title(GTK_WINDOW (dialog), _("Take Screenshot")); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); @@ -464,8 +455,7 @@ create_screenshot_frame (main_vbox, _("Take Screenshot")); create_effects_frame (main_vbox, _("Effects")); - button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); - gtk_button_box_set_layout (GTK_BUTTON_BOX (button_box), GTK_BUTTONBOX_END); + button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18); gtk_container_add (GTK_CONTAINER (main_vbox), button_box); /* add help as a dialog button if we're not showing the application menu */ @@ -473,17 +463,15 @@ g_object_get (settings, "gtk-shell-shows-app-menu", &shows_app_menu, NULL); - if (!shows_app_menu) - { - button = gtk_button_new_with_mnemonic (_("_Help")); - g_signal_connect_swapped (button, "clicked", G_CALLBACK (screenshot_display_help), dialog); - gtk_container_add (GTK_CONTAINER (button_box), - button); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (button_box), button, TRUE); - } size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + button = gtk_button_new_with_mnemonic (_("_Cancel")); + gtk_widget_set_valign (button, GTK_ALIGN_CENTER); + gtk_size_group_add_widget (size_group, button); + gtk_container_add (GTK_CONTAINER (button_box), button); + g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), dialog); + button = gtk_button_new_with_mnemonic (_("Take _Screenshot")); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); context = gtk_widget_get_style_context (button); @@ -494,19 +482,10 @@ data->user_data = user_data; g_signal_connect (button, "clicked", G_CALLBACK (capture_button_clicked_cb), data); gtk_size_group_add_widget (size_group, button); - gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar), button); + gtk_container_add (GTK_CONTAINER (button_box), button); gtk_widget_set_can_default (button, TRUE); gtk_widget_grab_default (button); - g_signal_connect (dialog, "key-press-event", - G_CALLBACK (interactive_dialog_key_press_cb), - NULL); - - button = gtk_button_new_with_mnemonic (_("_Cancel")); - gtk_widget_set_valign (button, GTK_ALIGN_CENTER); - gtk_size_group_add_widget (size_group, button); - gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar), button); - g_signal_connect_swapped (button, "clicked", - G_CALLBACK (gtk_widget_destroy), dialog); + g_signal_connect (dialog, "key-press-event", G_CALLBACK (interactive_dialog_key_press_cb), NULL); g_object_unref (size_group); diff -Nru gnome-screenshot-3.18.0/src/screenshot-utils.c gnome-screenshot-3.18.0/src/screenshot-utils.c --- gnome-screenshot-3.18.0/src/screenshot-utils.c 2015-09-22 21:27:34.000000000 +0000 +++ gnome-screenshot-3.18.0/src/screenshot-utils.c 2016-05-13 19:01:19.000000000 +0000 @@ -630,6 +630,9 @@ filename); } + if (!(in_desktop ("GNOME"))) + screenshot = screenshot_fallback_get_pixbuf(rectangle); + else { connection = g_application_get_dbus_connection (g_application_get_default ()); g_dbus_connection_call_sync (connection, "org.gnome.Shell.Screenshot", @@ -659,6 +662,7 @@ screenshot = screenshot_fallback_get_pixbuf (rectangle); } + } g_free (path); g_free (tmpname); @@ -707,22 +711,3 @@ return response; } -void -screenshot_display_help (GtkWindow *parent) -{ - GError *error = NULL; - - gtk_show_uri (gtk_window_get_screen (parent), - "help:gnome-help/screen-shot-record", - gtk_get_current_event_time (), &error); - - if (error) - { - screenshot_show_dialog (parent, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("Error loading the help page"), - error->message); - g_error_free (error); - } -} diff -Nru gnome-screenshot-3.18.0/src/screenshot-utils.h gnome-screenshot-3.18.0/src/screenshot-utils.h --- gnome-screenshot-3.18.0/src/screenshot-utils.h 2015-09-22 21:27:34.000000000 +0000 +++ gnome-screenshot-3.18.0/src/screenshot-utils.h 2016-05-13 19:01:19.000000000 +0000 @@ -34,7 +34,6 @@ const gchar *detail); void screenshot_play_sound_effect (const gchar *event_id, const gchar *event_desc); -void screenshot_display_help (GtkWindow *parent); G_END_DECLS