Evince use it's own icon. Fix for the bug #313392.

	* data/Makefile.am:
	* data/evince.png:
	* data/evince-16.png:
	* data/evince-22.png:
	* data/evince.svg:
	* shell/main.c: (main):

	Evince use it's own icon. Fix for the bug #313392.

	* shell/ev-window.c: (fullscreen_timeout_cb),
	(fullscreen_set_timeout), (fullscreen_clear_timeout),
	(ev_window_cmd_help_about), (ev_window_dispose):

	Simplify fullscreen timeout code.

diff --git a/ChangeLog b/ChangeLog
index be35cf75d34b271e7b97fa9e8c77853f9f4f807c..a9e9791363948bf9b6233253ad460ea6ff191503 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2006-05-02  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+       * data/Makefile.am:
+       * data/evince.png:
+       * data/evince-16.png:
+       * data/evince-22.png:
+       * data/evince.svg:
+       * shell/main.c: (main):
+       
+       Evince use it's own icon. Fix for the bug #313392.
+
+       * shell/ev-window.c: (fullscreen_timeout_cb),
+       (fullscreen_set_timeout), (fullscreen_clear_timeout),
+       (ev_window_cmd_help_about), (ev_window_dispose):
+       
+       Simplify fullscreen timeout code.
+
 2006-04-29  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * backend/ev-attachment.c: 

diff --git a/data/Makefile.am b/data/Makefile.am
index d7d6dafe3c60a193636042f14077909d498c5410..39835b31a4e58d4f2cde2d46c43d859867d25cda 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -26,6 +26,16 @@ schema_in_files = evince.schemas.in
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
+icon_16dir = $(datadir)/icons/hicolor/16x16/apps
+icon_16_DATA = evince-16.png
+icon_22dir = $(datadir)/icons/hicolor/22x22/apps
+icon_22_DATA = evince-22.png
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = evince.png
+svgicondir = $(datadir)/icons/hicolor/scalable/apps
+svgicon_DATA = evince.svg
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
        if test -z "$(DESTDIR)" ; then \
@@ -34,14 +44,27 @@ if GCONF_SCHEMAS_INSTALL
        done \
        fi
 endif
+       if test -z "$(DESTDIR)"; then \
+               echo "Updating Gtk icon cache."; \
+               $(gtk_update_icon_cache); \
+       else \
+               echo "*** Icon cache not updated.  After install, run this:"; \
+               echo "***   $(gtk_update_icon_cache)"; \
+               fi
 
 EXTRA_DIST =                           \
        $(glade_DATA)                   \
        $(ui_DATA)                      \
        $(DESKTOP_IN_FILES)             \
        $(schema_in_files)              \
-       $(NULL)
+       $(icon_16_DATA)                 \
+       $(icon_22_DATA)                 \
+       $(icon_DATA)                    \
+       $(svgicon_DATA)                 \
+       $(NULL)                         
 
 DISTCLEANFILES = \
        $(DESKTOP_FILES)        \
        $(schema_DATA)
+
+

diff --git a/data/evince-16.png b/data/evince-16.png
new file mode 100644 (file)
index 0000000..e2e7fae
Binary files /dev/null and b/data/evince-16.png differ

diff --git a/data/evince-22.png b/data/evince-22.png
new file mode 100644 (file)
index 0000000..e8b8c12
Binary files /dev/null and b/data/evince-22.png differ

diff --git a/data/evince.png b/data/evince.png
new file mode 100644 (file)
index 0000000..f0b382f
Binary files /dev/null and b/data/evince.png differ

diff --git a/data/evince.svg b/data/evince.svg
new file mode 100644 (file)
index 0000000..9b0332f
--- /dev/null
+++ b/data/evince.svg
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90.000000"
+   inkscape:export-xdpi="90.000000"
+   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   width="48px"
+   height="48px"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/jimmac/gfx/ximian/art/icons/application-icons"
+   sodipodi:docname="evince.svg">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3507">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3509" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3511" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3497">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3499" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.56730771;"
+         offset="1"
+         id="stop3501" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4598">
+      <stop
+         style="stop-color:#e6eef7;stop-opacity:1;"
+         offset="0"
+         id="stop4600" />
+      <stop
+         style="stop-color:#8ab0d8;stop-opacity:1;"
+         offset="1"
+         id="stop4602" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4590">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1;"
+         offset="0"
+         id="stop4592" />
+      <stop
+         style="stop-color:#ffa2a2;stop-opacity:1;"
+         offset="1"
+         id="stop4594" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4582">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4584" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4586" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4570">
+      <stop
+         style="stop-color:#eceeea;stop-opacity:1;"
+         offset="0"
+         id="stop4572" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="1"
+         id="stop4574" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11520">
+      <stop
+         id="stop11522"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop11524"
+         offset="1.0000000"
+         style="stop-color:#dcdcdc;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11508"
+       inkscape:collect="always">
+      <stop
+         id="stop11510"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop11512"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11494"
+       inkscape:collect="always">
+      <stop
+         id="stop11496"
+         offset="0"
+         style="stop-color:#ef2929;stop-opacity:1;" />
+      <stop
+         id="stop11498"
+         offset="1"
+         style="stop-color:#ef2929;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11415">
+      <stop
+         id="stop11417"
+         offset="0.0000000"
+         style="stop-color:#204a87;stop-opacity:0.0000000;" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1.0000000;"
+         offset="0.50000000"
+         id="stop11423" />
+      <stop
+         id="stop11419"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11399"
+       inkscape:collect="always">
+      <stop
+         id="stop11401"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop11403"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-60.28571,-0.285714)"
+       y2="34.462429"
+       x2="43.615788"
+       y1="3.7744560"
+       x1="15.828360"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11425"
+       xlink:href="#linearGradient11415"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-60.57143,0.000000)"
+       y2="39.033859"
+       x2="35.679932"
+       y1="9.3458843"
+       x1="9.6957054"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11427"
+       xlink:href="#linearGradient11415"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.462429"
+       x2="26.758644"
+       y1="19.774456"
+       x1="13.267134"
+       gradientTransform="translate(-60.85714,0.428571)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11439"
+       xlink:href="#linearGradient11415"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.5000000"
+       fy="39.142857"
+       fx="12.071428"
+       cy="39.142857"
+       cx="12.071428"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.487395,0.000000,20.06483)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11441"
+       xlink:href="#linearGradient11399"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
+       gradientUnits="userSpaceOnUse"
+       r="3.8335034"
+       fy="15.048258"
+       fx="27.577173"
+       cy="15.048258"
+       cx="27.577173"
+       id="radialGradient11500"
+       xlink:href="#linearGradient11494"
+       inkscape:collect="always" />
+    <radialGradient
+       r="3.8335034"
+       fy="16.049133"
+       fx="27.577173"
+       cy="16.049133"
+       cx="27.577173"
+       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11504"
+       xlink:href="#linearGradient11494"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,2.166583e-14,29.48178)"
+       r="6.5659914"
+       fy="44.565483"
+       fx="30.203562"
+       cy="44.565483"
+       cx="30.203562"
+       id="radialGradient11514"
+       xlink:href="#linearGradient11508"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(1.995058,-1.651527e-32,0.000000,1.995058,-24.32488,-35.70087)"
+       gradientUnits="userSpaceOnUse"
+       r="20.530962"
+       fy="35.878170"
+       fx="24.445690"
+       cy="35.878170"
+       cx="24.445690"
+       id="radialGradient11526"
+       xlink:href="#linearGradient11520"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.5659914"
+       fy="44.565483"
+       fx="30.203562"
+       cy="44.565483"
+       cx="30.203562"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,3.185827e-15,29.48178)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11532"
+       xlink:href="#linearGradient11508"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11508"
+       id="radialGradient1348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,-1.353344e-14,29.48178)"
+       cx="30.203562"
+       cy="44.565483"
+       fx="30.203562"
+       fy="44.565483"
+       r="6.5659914" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11520"
+       id="radialGradient1350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.995058,-1.651527e-32,0.000000,1.995058,-24.32488,-35.70087)"
+       cx="24.445690"
+       cy="35.878170"
+       fx="24.445690"
+       fy="35.878170"
+       r="20.530962" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11494"
+       id="radialGradient1352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
+       cx="27.577173"
+       cy="16.049133"
+       fx="27.577173"
+       fy="16.049133"
+       r="3.8335034" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11494"
+       id="radialGradient1354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
+       cx="27.577173"
+       cy="15.048258"
+       fx="27.577173"
+       fy="15.048258"
+       r="3.8335034" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11508"
+       id="radialGradient1356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,2.220359e-14,29.48178)"
+       cx="30.203562"
+       cy="44.565483"
+       fx="30.203562"
+       fy="44.565483"
+       r="6.5659914" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11520"
+       id="radialGradient1366"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.049266,-1.696401e-32,0.000000,2.049266,-25.65002,-37.31089)"
+       cx="24.445690"
+       cy="35.878170"
+       fx="24.445690"
+       fy="35.878170"
+       r="20.530962" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4582"
+       id="radialGradient4588"
+       cx="24.625"
+       cy="38.625"
+       fx="24.625"
+       fy="38.625"
+       r="21.125"
+       gradientTransform="matrix(1,0,0,0.420118,0,22.39793)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4590"
+       id="linearGradient4596"
+       x1="24.689142"
+       y1="24.109001"
+       x2="53.568085"
+       y2="24.109001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-6.8085e-2,-5.100256)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4598"
+       id="radialGradient4604"
+       cx="24.502396"
+       cy="12.604746"
+       fx="24.502396"
+       fy="12.604746"
+       r="20.507692"
+       gradientTransform="matrix(2.319263,1.846486e-24,-3.426469e-24,2.374685,-32.32511,-17.59985)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3497"
+       id="radialGradient3503"
+       cx="24.621058"
+       cy="19.188286"
+       fx="24.621058"
+       fy="19.188286"
+       r="19.378943"
+       gradientTransform="matrix(2.476948,-1.582729e-16,7.838822e-8,1.851413,-36.36402,-15.71214)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3507"
+       id="radialGradient3513"
+       cx="25.986174"
+       cy="26.786797"
+       fx="25.986174"
+       fy="26.786797"
+       r="15.465359"
+       gradientTransform="matrix(0.863137,0,0,0.438896,3.556549,15.03019)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     stroke="#3465a4"
+     fill="#729fcf"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.25490196"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="23.885378"
+     inkscape:cy="21.61759"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="866"
+     inkscape:window-height="861"
+     inkscape:window-x="597"
+     inkscape:window-y="231" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:title>Evince</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;color:#000000;fill:url(#radialGradient4588);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path4580"
+       sodipodi:cx="24.625"
+       sodipodi:cy="38.625"
+       sodipodi:rx="21.125"
+       sodipodi:ry="8.875"
+       d="M 45.75 38.625 A 21.125 8.875 0 1 1  3.5,38.625 A 21.125 8.875 0 1 1  45.75 38.625 z" />
+    <rect
+       style="opacity:1;color:#000000;fill:url(#radialGradient4604);fill-opacity:1.0;fill-rule:evenodd;stroke:#3465a4;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2362"
+       width="40.015385"
+       height="40.995502"
+       x="4.4947042"
+       y="3.5019624"
+       rx="5.25"
+       ry="5.249999" />
+    <rect
+       ry="4.1893401"
+       rx="4.1893401"
+       y="4.5014553"
+       x="5.4887967"
+       height="38.996178"
+       width="38.016666"
+       id="rect4578"
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.33516487;color:#000000;fill:url(#radialGradient3513);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3505"
+       sodipodi:cx="25.986174"
+       sodipodi:cy="26.786797"
+       sodipodi:rx="13.965359"
+       sodipodi:ry="6.3639612"
+       d="M 39.951532 26.786797 A 13.965359 6.3639612 0 1 1  12.020815,26.786797 A 13.965359 6.3639612 0 1 1  39.951532 26.786797 z"
+       transform="matrix(1.341772,0,0,0.722222,-10.47234,10.2692)" />
+    <path
+       sodipodi:nodetypes="csscccssc"
+       d="M 7.1259973,31.741117 C 11.765805,27.68571 30.893861,10.081732 25.852282,9.673849 C 23.236513,9.462225 17.109192,11.147428 14.375577,16.263462 C 9.2571747,25.842698 20.796041,27.247528 25.587041,26.667586 C 33.436885,25.444662 42.417893,19.773745 42.417893,19.773745 L 42.287308,26.225495 C 25.462936,30.983654 15.478556,29.674247 9.6155212,23.977042 C 3.9116018,18.434447 17.535095,5.924967 28.574516,7.075922 C 39.972698,8.264281 7.1259973,31.741117 7.1259973,31.741117 z "
+       id="path3495"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient3503);stroke-width:3;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="opacity:1;color:#000000;fill:url(#linearGradient4596);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3695"
+       d="M 6.2421138,32 C 10.881922,27.944593 30.893861,9.456732 25.852282,9.048849 C 23.236513,8.837225 17.109192,10.522428 14.375577,15.638462 C 9.2571747,25.217698 20.796041,26.622528 25.587041,26.042586 C 33.436885,24.819662 43,19.721968 43,19.721968 L 42.994415,24.923718 C 26.170043,29.681877 15.478556,29.049247 9.6155212,23.352042 C 3.9116018,17.809447 17.535095,5.299967 28.574516,6.450922 C 39.972698,7.639281 6.2421138,32 6.2421138,32 z "
+       sodipodi:nodetypes="csscccssc" />
+    <rect
+       y="35"
+       x="10"
+       height="1"
+       width="28"
+       id="rect4626"
+       style="opacity:0.33516487;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       style="opacity:0.33516487;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect4628"
+       width="28"
+       height="1"
+       x="10"
+       y="37" />
+    <rect
+       y="39"
+       x="10"
+       height="1"
+       width="18"
+       id="rect4630"
+       style="opacity:0.33516487;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+  </g>
+</svg>

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 71cf0ec403ed172517154773eeca045abf128ba0..6ca0de647735b131757a4e53428c0b29a2d7cc28 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -127,7 +127,7 @@ struct _EvWindowPrivate {
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
        GtkWidget *fullscreen_popup;
-       GSource   *fullscreen_timeout_source;
+       guint      fullscreen_timeout_id;
        
        /* Popup link */
        GtkWidget *view_popup;
@@ -1563,8 +1563,8 @@ fullscreen_timeout_cb (gpointer data)
 
        g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL);
        ev_view_hide_cursor (EV_VIEW (window->priv->view));
-       g_source_unref (window->priv->fullscreen_timeout_source);
-       window->priv->fullscreen_timeout_source = NULL;
+
+       window->priv->fullscreen_timeout_id = 0;
 
        return FALSE;
 }
@@ -1572,28 +1572,22 @@ fullscreen_timeout_cb (gpointer data)
 static void
 fullscreen_set_timeout (EvWindow *window)
 {
-       GSource *source;
-
-       if (window->priv->fullscreen_timeout_source != NULL) {
-               g_source_unref (window->priv->fullscreen_timeout_source);
-               g_source_destroy (window->priv->fullscreen_timeout_source);
+       if (window->priv->fullscreen_timeout_id != 0) {
+               g_source_remove (window->priv->fullscreen_timeout_id);
        }
-
-       source = g_timeout_source_new (FULLSCREEN_TIMEOUT);
-       g_source_set_callback (source, fullscreen_timeout_cb, window, NULL);
-       g_source_attach (source, NULL);
-       window->priv->fullscreen_timeout_source = source;
+       
+       window->priv->fullscreen_timeout_id = 
+           g_timeout_add (FULLSCREEN_TIMEOUT, fullscreen_timeout_cb, window);
 }
 
 static void
 fullscreen_clear_timeout (EvWindow *window)
 {
-       if (window->priv->fullscreen_timeout_source != NULL) {
-               g_source_unref (window->priv->fullscreen_timeout_source);
-               g_source_destroy (window->priv->fullscreen_timeout_source);
+       if (window->priv->fullscreen_timeout_id != 0) {
+               g_source_remove (window->priv->fullscreen_timeout_id);
        }
 
-       window->priv->fullscreen_timeout_source = NULL;
+       window->priv->fullscreen_timeout_id = 0;
        ev_view_show_cursor (EV_VIEW (window->priv->view));
 }
 
@@ -2428,6 +2422,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                "authors", authors,
                "documenters", documenters,
                "translator-credits", _("translator-credits"),
+               "logo-icon-name", "evince",
                NULL);
 
        g_free (comments);
@@ -2809,10 +2804,9 @@ ev_window_dispose (GObject *object)
                priv->uri = NULL;
        }
 
-       if (window->priv->fullscreen_timeout_source) {
-               g_source_unref (window->priv->fullscreen_timeout_source);
-               g_source_destroy (window->priv->fullscreen_timeout_source);
-               window->priv->fullscreen_timeout_source = NULL;
+       if (priv->fullscreen_timeout_id) {
+               g_source_remove (priv->fullscreen_timeout_id);
+               priv->fullscreen_timeout_id = 0;
        }
        destroy_fullscreen_popup (window);
 

diff --git a/shell/main.c b/shell/main.c
index 3a24e0583796898061569737025e264da5725d41..b874b28bb3856abb02a49b862a067deb966e2681 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -288,7 +288,7 @@ main (int argc, char *argv[])
        ev_file_helpers_init ();
        ev_debug_init ();
        ev_stock_icons_init ();
-       gtk_window_set_default_icon_name ("postscript-viewer");
+       gtk_window_set_default_icon_name ("evince");
 
        load_files (poptGetArgs (context));