AUTOMAKE_OPTIONS = gnu
-SUBDIRS = katze midori po data
+SUBDIRS = katze midori po icons
desktopdir = $(datadir)/applications
desktop_in_files = midori.desktop
AC_SUBST(GTK_LIBS)
# Checks for gtksourceview
-PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview, have_gtksourceview=true, have_gtksourceview=false)
+PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0, have_gtksourceview=true, have_gtksourceview=false)
AC_SUBST(GTKSOURCEVIEW_CFLAGS)
AC_SUBST(GTKSOURCEVIEW_LIBS)
katze/Makefile \
midori/Makefile \
po/Makefile.in \
- data/Makefile
+ icons/Makefile
])
AC_OUTPUT
+++ /dev/null
-iconsdir = $(datadir)/icons/hicolor/scalable/apps
-icons_DATA = midori.svg
-
-EXTRA_DIST = $(icons_DATA)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
- @-if test -z "$(DESTDIR)"; then \
- echo "Updating Gtk icon cache."; \
- $(gtk_update_icon_cache); \
- else \
- echo "*** Icon cache not updated. After (un)install, run this:"; \
- echo "*** $(gtk_update_icon_cache)"; \
- fi
+++ /dev/null
-<?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://creativecommons.org/ns#"
- 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://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="48"
- height="48"
- id="svg3612"
- sodipodi:version="0.32"
- inkscape:version="0.46"
- version="1.0"
- sodipodi:docname="drawing-1.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs3614">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 19.696583 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="34.692669 : 19.696583 : 1"
- inkscape:persp3d-origin="17.346334 : 13.131055 : 1"
- id="perspective42" />
- <linearGradient
- id="linearGradient3412">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.59836066;"
- offset="0"
- id="stop3414" />
- <stop
- style="stop-color:#4e9a06;stop-opacity:0;"
- offset="1"
- id="stop3416" />
- </linearGradient>
- <linearGradient
- id="linearGradient3458">
- <stop
- style="stop-color:#41a100;stop-opacity:1;"
- offset="0"
- id="stop3460" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3462" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3412"
- id="linearGradient2416"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,325.6313,407.16081)"
- x1="13"
- y1="11"
- x2="40"
- y2="19" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3458"
- id="linearGradient2427"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,327.75135,406.92561)"
- x1="33"
- y1="33"
- x2="4"
- y2="5" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="11.2"
- inkscape:cx="-2.4112669"
- inkscape:cy="21.831798"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:window-width="1443"
- inkscape:window-height="766"
- inkscape:window-x="0"
- inkscape:window-y="22"
- inkscape:snap-global="false">
- <inkscape:grid
- type="xygrid"
- id="grid3623"
- visible="true"
- enabled="true" />
- <sodipodi:guide
- orientation="0,1"
- position="-24.285714,35.982143"
- id="guide3782" />
- <sodipodi:guide
- orientation="0,1"
- position="10.535714,-15.357143"
- id="guide3784" />
- <sodipodi:guide
- orientation="1,0"
- position="8.3928572,12.321429"
- id="guide3786" />
- </sodipodi:namedview>
- <metadata
- id="metadata3617">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-322.76854,-423.39033)">
- <g
- transform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,327.85931,406.67587)"
- style="stroke:none"
- id="g3562">
- <path
- sodipodi:nodetypes="ccsssscssccc"
- id="path3564"
- d="M 32.62692,6.6695339 C 28.943103,10.347154 11.111941,12.664469 9,33 C 9.3414198,38.11565 11.750163,44.619293 16.499797,43.597643 C 17.482576,43.386246 18.538501,43.794446 19.203605,44.407481 C 23.555343,48.418538 27.732345,46.782233 28.855024,43.962447 C 29.070261,43.421846 29.754997,43.365614 30.315916,43.589557 C 36.857006,46.201039 38.613158,38.645886 39,33 C 39.096949,30.551387 37.800853,11.942617 35.822153,10.473066 C 35.232485,10.035129 33.801652,12.187441 32.644545,14.379307 C 23.397466,31.895713 11.762403,24.057082 32.238499,7.1548098 L 32.4735,6.6276491 L 32.744417,6.6586341"
- style="fill:#c5f199;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
- <g
- style="fill:#c5f199;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
- id="g3566">
- <path
- style="fill:#c5f199;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
- d="M 24,45 L 24,33"
- id="path3568" />
- <path
- style="fill:#c5f199;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
- d="M 15,42 L 15,35"
- id="path3570" />
- <path
- style="fill:#c5f199;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
- d="M 33,42 L 33,35"
- id="path3572" />
- </g>
- </g>
- <g
- transform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,327.85931,406.67587)"
- id="g3574"
- style="fill:#73d216;fill-opacity:1;stroke:none">
- <path
- sodipodi:nodetypes="csccsssscc"
- id="path3576"
- d="M 35.234589,13.724224 C 31.496538,21.805793 21.999895,29.946967 19.494746,24.633171 C 18.259214,22.012423 20.444587,17.339475 24.970511,12.046117 C 19.052984,15.684909 9.0048605,24.657969 10.614085,33.891165 C 10.240096,37.730699 13.217584,44.854617 17.074704,42.528018 C 18.102914,41.907806 19.832336,42.804046 20.452936,43.859693 C 21.771483,46.102557 26.565305,45.447239 27.607052,44.011061 C 28.374886,42.952509 29.980607,42.339501 31.245483,42.634122 C 36.778838,43.922978 37.16615,36.508792 37.142809,33.588177 C 38.771623,22.841659 35.355682,17.704462 35.234589,13.724224 z"
- style="fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
- <g
- style="fill:#73d216;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
- id="g3578">
- <path
- style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
- d="M 33,42 L 33,35"
- id="path3580" />
- <path
- style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
- d="M 24,45 L 24,33"
- id="path3582" />
- <path
- style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
- d="M 15,42 L 15,35"
- id="path3584" />
- </g>
- </g>
- <path
- sodipodi:nodetypes="cccsscsc"
- id="path3586"
- d="M 329.51073,447.61372 C 332.22018,442.31643 337.23637,442.25529 346.02247,445.13278 C 351.85692,445.13277 359.69811,439.61104 364.13235,434.66153 C 365.12684,453.86745 356.57278,473.21027 348.95566,465.678 C 347.93716,464.67086 347.17038,465.7736 345.66657,466.61478 C 344.22635,467.4204 343.53424,467.54511 341.98051,467.14292 C 336.85873,467.46725 335.86518,459.21391 333.59195,460.87858 C 329.28077,464.03562 327.73041,455.09453 329.51073,447.61372 z"
- style="fill:url(#linearGradient2427);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cc"
- id="path3590"
- d="M 334.53834,462.27896 C 334.2078,459.40748 333.844,454.00043 336.35842,450.8616"
- style="fill:none;fill-rule:evenodd;stroke:#c5f199;stroke-width:3.6246419;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3592"
- d="M 347.26802,454.03922 C 344.36973,461.6067 346.25402,462.8854 347.66323,466.99966 L 347.66323,466.99966 L 347.66323,466.99966 L 347.48466,466.37466"
- style="fill:none;fill-rule:evenodd;stroke:#c5f199;stroke-width:3.6246419;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <g
- transform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,300.43486,392.47027)"
- id="g3596">
- <path
- style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#204c00;stroke-width:0.82766795;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 58.836696,11.191679 C 54.60152,13.283618 34.371877,21.539565 34.111956,38.37916 C 34.23937,44.016827 37.022977,50.949008 42.995777,48.976423 C 43.419099,48.836853 43.503143,48.965524 43.757523,49.283134 C 47.911767,54.469973 53.736445,51.666736 54.462077,48.968721 C 54.565425,48.584458 54.107103,48.849125 54.462077,48.968721 C 61.90878,51.477628 63.638909,44.604122 64.115394,38.779293 C 65.224194,33.529058 61.312968,14.079248 60.37612,15.673393 C 44.414802,42.833251 39.236631,24.348064 58.836696,11.191679"
- id="path3598"
- sodipodi:nodetypes="ccsssscsc" />
- <g
- id="g3600"
- style="fill:none;fill-opacity:1;stroke:#306600;stroke-width:0.82766795;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- transform="translate(25,5)">
- <g
- style="stroke:#204c00;stroke-width:0.82766795;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g3602">
- <path
- sodipodi:nodetypes="cc"
- style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#204c00;stroke-width:0.82766795;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 18.645566,43.903974 C 15.051587,37.187354 16.540541,35.406359 16.713974,33.280216"
- id="path3606" />
- <path
- sodipodi:nodetypes="cc"
- style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#204c00;stroke-width:0.82766795;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 29.35012,43.828988 C 26.087374,40.085035 25.418677,36.423326 26.118423,33.355781"
- id="path3608" />
- </g>
- </g>
- </g>
- <path
- sodipodi:nodetypes="ccccccc"
- id="path3610"
- d="M 351.92318,429.5918 C 352.10808,427.28792 329.31466,436.91697 329.60494,447.76046 C 333.57302,442.60412 337.42833,442.17904 343.75497,444.76136 C 348.36775,449.06988 334.57289,441.21352 351.92318,429.5918 L 351.92318,429.5918 L 351.92318,429.5918 L 351.92318,429.5918 z"
- style="fill:url(#linearGradient2416);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
- </g>
-</svg>
+++ /dev/null
-#! /usr/bin/env python
-# WAF build script for midori
-
-import os
-import pproc as subprocess
-
-srcdir = os.getcwd ()
-blddir = bld.m_bdir
-
-install_files ('DATADIR', 'icons/hicolor/scalable/apps', 'midori.svg')
-
-if bld.env ()['CONVERT']:
- def mkdir (path):
- if not os.access (path, os.F_OK):
- os.mkdir (path)
-
- mkdir (blddir + '/icons')
-
- for size in [16, 24, 32, 48]:
- format = str (size) + 'x' + str (size)
- if size < 32:
- small = str ((size / 3)) + 'x' + str ((size / 3.5))
- else:
- small = '0x0'
-
- mkdir (blddir + '/icons/' + format)
- convert = subprocess.Popen (['convert', '-adaptive-sharpen', small,
- '-background', 'transparent',
- '-geometry', format, '-extent', format,
- srcdir + '/data/midori.svg',
- blddir + '/icons/' + format + '/midori.png'],
- stderr=subprocess.PIPE)
- if not convert.wait ():
- install_files ('DATADIR', 'icons/hicolor/' + format + '/apps',
- blddir + '/icons/' + format + '/midori.png')
- else:
- Params.pprint ('BLUE', "Optimized icons could not be created.")
- break
--- /dev/null
+iconsdir = $(datadir)/icons/hicolor/scalable/apps
+icons_DATA = scalable/midori.svg
+
+EXTRA_DIST = $(icons_DATA)
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
--- /dev/null
+<?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://creativecommons.org/ns#"
+ 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://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg3612"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="drawing-1.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3614">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 19.696583 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="34.692669 : 19.696583 : 1"
+ inkscape:persp3d-origin="17.346334 : 13.131055 : 1"
+ id="perspective42" />
+ <linearGradient
+ id="linearGradient3412">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.59836066;"
+ offset="0"
+ id="stop3414" />
+ <stop
+ style="stop-color:#4e9a06;stop-opacity:0;"
+ offset="1"
+ id="stop3416" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3458">
+ <stop
+ style="stop-color:#41a100;stop-opacity:1;"
+ offset="0"
+ id="stop3460" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3462" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3412"
+ id="linearGradient2416"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,325.6313,407.16081)"
+ x1="13"
+ y1="11"
+ x2="40"
+ y2="19" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3458"
+ id="linearGradient2427"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,327.75135,406.92561)"
+ x1="33"
+ y1="33"
+ x2="4"
+ y2="5" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.2"
+ inkscape:cx="-2.4112669"
+ inkscape:cy="21.831798"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1443"
+ inkscape:window-height="766"
+ inkscape:window-x="0"
+ inkscape:window-y="22"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3623"
+ visible="true"
+ enabled="true" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-24.285714,35.982143"
+ id="guide3782" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="10.535714,-15.357143"
+ id="guide3784" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="8.3928572,12.321429"
+ id="guide3786" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3617">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-322.76854,-423.39033)">
+ <g
+ transform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,327.85931,406.67587)"
+ style="stroke:none"
+ id="g3562">
+ <path
+ sodipodi:nodetypes="ccsssscssccc"
+ id="path3564"
+ d="M 32.62692,6.6695339 C 28.943103,10.347154 11.111941,12.664469 9,33 C 9.3414198,38.11565 11.750163,44.619293 16.499797,43.597643 C 17.482576,43.386246 18.538501,43.794446 19.203605,44.407481 C 23.555343,48.418538 27.732345,46.782233 28.855024,43.962447 C 29.070261,43.421846 29.754997,43.365614 30.315916,43.589557 C 36.857006,46.201039 38.613158,38.645886 39,33 C 39.096949,30.551387 37.800853,11.942617 35.822153,10.473066 C 35.232485,10.035129 33.801652,12.187441 32.644545,14.379307 C 23.397466,31.895713 11.762403,24.057082 32.238499,7.1548098 L 32.4735,6.6276491 L 32.744417,6.6586341"
+ style="fill:#c5f199;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+ <g
+ style="fill:#c5f199;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+ id="g3566">
+ <path
+ style="fill:#c5f199;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+ d="M 24,45 L 24,33"
+ id="path3568" />
+ <path
+ style="fill:#c5f199;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+ d="M 15,42 L 15,35"
+ id="path3570" />
+ <path
+ style="fill:#c5f199;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+ d="M 33,42 L 33,35"
+ id="path3572" />
+ </g>
+ </g>
+ <g
+ transform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,327.85931,406.67587)"
+ id="g3574"
+ style="fill:#73d216;fill-opacity:1;stroke:none">
+ <path
+ sodipodi:nodetypes="csccsssscc"
+ id="path3576"
+ d="M 35.234589,13.724224 C 31.496538,21.805793 21.999895,29.946967 19.494746,24.633171 C 18.259214,22.012423 20.444587,17.339475 24.970511,12.046117 C 19.052984,15.684909 9.0048605,24.657969 10.614085,33.891165 C 10.240096,37.730699 13.217584,44.854617 17.074704,42.528018 C 18.102914,41.907806 19.832336,42.804046 20.452936,43.859693 C 21.771483,46.102557 26.565305,45.447239 27.607052,44.011061 C 28.374886,42.952509 29.980607,42.339501 31.245483,42.634122 C 36.778838,43.922978 37.16615,36.508792 37.142809,33.588177 C 38.771623,22.841659 35.355682,17.704462 35.234589,13.724224 z"
+ style="fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+ <g
+ style="fill:#73d216;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+ id="g3578">
+ <path
+ style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+ d="M 33,42 L 33,35"
+ id="path3580" />
+ <path
+ style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+ d="M 24,45 L 24,33"
+ id="path3582" />
+ <path
+ style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+ d="M 15,42 L 15,35"
+ id="path3584" />
+ </g>
+ </g>
+ <path
+ sodipodi:nodetypes="cccsscsc"
+ id="path3586"
+ d="M 329.51073,447.61372 C 332.22018,442.31643 337.23637,442.25529 346.02247,445.13278 C 351.85692,445.13277 359.69811,439.61104 364.13235,434.66153 C 365.12684,453.86745 356.57278,473.21027 348.95566,465.678 C 347.93716,464.67086 347.17038,465.7736 345.66657,466.61478 C 344.22635,467.4204 343.53424,467.54511 341.98051,467.14292 C 336.85873,467.46725 335.86518,459.21391 333.59195,460.87858 C 329.28077,464.03562 327.73041,455.09453 329.51073,447.61372 z"
+ style="fill:url(#linearGradient2427);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path3590"
+ d="M 334.53834,462.27896 C 334.2078,459.40748 333.844,454.00043 336.35842,450.8616"
+ style="fill:none;fill-rule:evenodd;stroke:#c5f199;stroke-width:3.6246419;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path3592"
+ d="M 347.26802,454.03922 C 344.36973,461.6067 346.25402,462.8854 347.66323,466.99966 L 347.66323,466.99966 L 347.66323,466.99966 L 347.48466,466.37466"
+ style="fill:none;fill-rule:evenodd;stroke:#c5f199;stroke-width:3.6246419;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="matrix(1.1626866,0.3285437,-0.3285437,1.1626866,300.43486,392.47027)"
+ id="g3596">
+ <path
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#204c00;stroke-width:0.82766795;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 58.836696,11.191679 C 54.60152,13.283618 34.371877,21.539565 34.111956,38.37916 C 34.23937,44.016827 37.022977,50.949008 42.995777,48.976423 C 43.419099,48.836853 43.503143,48.965524 43.757523,49.283134 C 47.911767,54.469973 53.736445,51.666736 54.462077,48.968721 C 54.565425,48.584458 54.107103,48.849125 54.462077,48.968721 C 61.90878,51.477628 63.638909,44.604122 64.115394,38.779293 C 65.224194,33.529058 61.312968,14.079248 60.37612,15.673393 C 44.414802,42.833251 39.236631,24.348064 58.836696,11.191679"
+ id="path3598"
+ sodipodi:nodetypes="ccsssscsc" />
+ <g
+ id="g3600"
+ style="fill:none;fill-opacity:1;stroke:#306600;stroke-width:0.82766795;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ transform="translate(25,5)">
+ <g
+ style="stroke:#204c00;stroke-width:0.82766795;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="g3602">
+ <path
+ sodipodi:nodetypes="cc"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#204c00;stroke-width:0.82766795;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 18.645566,43.903974 C 15.051587,37.187354 16.540541,35.406359 16.713974,33.280216"
+ id="path3606" />
+ <path
+ sodipodi:nodetypes="cc"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#204c00;stroke-width:0.82766795;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 29.35012,43.828988 C 26.087374,40.085035 25.418677,36.423326 26.118423,33.355781"
+ id="path3608" />
+ </g>
+ </g>
+ </g>
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path3610"
+ d="M 351.92318,429.5918 C 352.10808,427.28792 329.31466,436.91697 329.60494,447.76046 C 333.57302,442.60412 337.42833,442.17904 343.75497,444.76136 C 348.36775,449.06988 334.57289,441.21352 351.92318,429.5918 L 351.92318,429.5918 L 351.92318,429.5918 L 351.92318,429.5918 z"
+ style="fill:url(#linearGradient2416);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+ </g>
+</svg>
--- /dev/null
+<?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://creativecommons.org/ns#"
+ 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://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ width="48"
+ height="48"
+ xml:space="preserve"
+ sodipodi:docname="tango-rss.svg"
+ version="1.0"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+ id="metadata7"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs5"><linearGradient
+ id="linearGradient3300"><stop
+ style="stop-color:#ce5c00;stop-opacity:1;"
+ offset="0"
+ id="stop3302" /><stop
+ style="stop-color:#893d00;stop-opacity:1;"
+ offset="1"
+ id="stop3304" /></linearGradient><linearGradient
+ id="linearGradient3275"><stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3277" /><stop
+ style="stop-color:#f57900;stop-opacity:0;"
+ offset="1"
+ id="stop3279" /></linearGradient><inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective9" /><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath17"><path
+ d="M 0,128 L 128,128 L 128,0 L 0,0 L 0,128 z"
+ id="path19" /></clipPath><linearGradient
+ x1="0"
+ y1="0"
+ x2="1"
+ y2="0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-104.01236,104.01237,104.01237,104.01237,116.00586,11.994141)"
+ spreadMethod="pad"
+ id="linearGradient37"><stop
+ style="stop-opacity:1;stop-color:#d95b29"
+ offset="0"
+ id="stop39" /><stop
+ style="stop-opacity:1;stop-color:#fb9e3a"
+ offset="0.5"
+ id="stop41" /><stop
+ style="stop-opacity:1;stop-color:#e3702d"
+ offset="1"
+ id="stop43" /></linearGradient><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3281"
+ x1="28.140682"
+ y1="59.007069"
+ x2="123.56256"
+ y2="64.008011"
+ gradientUnits="userSpaceOnUse" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3283"
+ gradientUnits="userSpaceOnUse"
+ x1="-22.962652"
+ y1="-26.856916"
+ x2="113.12444"
+ y2="103.36325" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3285"
+ gradientUnits="userSpaceOnUse"
+ x1="4.4374332"
+ y1="64.008011"
+ x2="123.56256"
+ y2="64.008011" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3287"
+ gradientUnits="userSpaceOnUse"
+ x1="4.4374332"
+ y1="64.008011"
+ x2="123.56256"
+ y2="64.008011" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3300"
+ id="linearGradient3306"
+ x1="-0.98719376"
+ y1="119.27105"
+ x2="39.936729"
+ y2="88.299164"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9961613,0,0,1.0000405,6.8742977e-4,-4.4021459e-3)" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3300"
+ id="linearGradient3351"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9961613,0,0,1.0000405,6.8742977e-4,-4.4021459e-3)"
+ x1="-0.98719376"
+ y1="119.27105"
+ x2="39.936729"
+ y2="88.299164" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3353"
+ gradientUnits="userSpaceOnUse"
+ x1="-22.962652"
+ y1="-26.856916"
+ x2="113.12444"
+ y2="103.36325" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3355"
+ gradientUnits="userSpaceOnUse"
+ x1="4.4374332"
+ y1="64.008011"
+ x2="123.56256"
+ y2="64.008011" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3357"
+ gradientUnits="userSpaceOnUse"
+ x1="4.4374332"
+ y1="64.008011"
+ x2="123.56256"
+ y2="64.008011" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3359"
+ gradientUnits="userSpaceOnUse"
+ x1="28.140682"
+ y1="59.007069"
+ x2="123.56256"
+ y2="64.008011" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3300"
+ id="linearGradient3209"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9961613,0,0,1.0000405,6.8742977e-4,-4.4021459e-3)"
+ x1="-0.98719376"
+ y1="119.27105"
+ x2="39.936729"
+ y2="88.299164" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3211"
+ gradientUnits="userSpaceOnUse"
+ x1="-22.962652"
+ y1="-26.856916"
+ x2="113.12444"
+ y2="103.36325" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3213"
+ gradientUnits="userSpaceOnUse"
+ x1="4.4374332"
+ y1="64.008011"
+ x2="123.56256"
+ y2="64.008011" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3215"
+ gradientUnits="userSpaceOnUse"
+ x1="4.4374332"
+ y1="64.008011"
+ x2="123.56256"
+ y2="64.008011" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3217"
+ gradientUnits="userSpaceOnUse"
+ x1="28.140682"
+ y1="59.007069"
+ x2="123.56256"
+ y2="64.008011" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3300"
+ id="linearGradient3232"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9961613,0,0,1.0000405,6.4944458e-2,-4.4021459e-3)"
+ x1="-0.98719376"
+ y1="119.27105"
+ x2="39.936729"
+ y2="88.299164" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3275"
+ id="linearGradient3234"
+ gradientUnits="userSpaceOnUse"
+ x1="-17.119463"
+ y1="-35.774288"
+ x2="113.12444"
+ y2="103.36325" /></defs><sodipodi:namedview
+ inkscape:window-height="720"
+ inkscape:window-width="888"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="true"
+ inkscape:snap-global="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:zoom="8.8034794"
+ inkscape:cx="3.3324561"
+ inkscape:cy="40.010499"
+ inkscape:window-x="542"
+ inkscape:window-y="39"
+ inkscape:current-layer="g11"><inkscape:grid
+ type="xygrid"
+ id="grid2432"
+ visible="true"
+ enabled="true" /></sodipodi:namedview><g
+ id="g11"
+ inkscape:groupmode="layer"
+ inkscape:label="feed-icon-legacy"
+ transform="matrix(1.25,0,0,-1.25,0,160)"><path
+ style="fill:#fcaf3e;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3232);stroke-width:0.80048220999999986"
+ d="M 38.002169,119.5841 C 38.136627,124.13453 33.833799,128.04502 29.34011,127.60391 C 22.114004,127.57701 14.884487,127.65816 7.6605468,127.56249 C 3.374464,127.23569 0.043196567,123.0315 0.4796428,118.78629 C 0.50646108,111.58944 0.42554092,104.38919 0.52093827,97.194505 C 0.84590169,92.898821 5.0383763,89.557076 9.2743628,89.994993 C 16.456202,90.021864 23.641448,89.940771 30.821119,90.036395 C 35.107237,90.362998 38.438787,94.566998 38.002169,98.8123 C 38.002169,105.73624 38.002169,112.66018 38.002169,119.5841 z"
+ id="path21" /><g
+ id="g27"
+ transform="matrix(0.2954876,0,0,-0.2955267,0.3513908,127.60862)"
+ style="fill:#f57900;fill-opacity:1"><g
+ id="g33"
+ style="fill:#f57900;fill-opacity:1"><g
+ id="g35"
+ style="fill:#f57900;fill-opacity:1"><path
+ id="path45"
+ d="M 123.429,29.915001 C 123.85961,15.464801 110.11454,3.1099424 95.831258,4.571 C 72.994905,4.6555834 50.147792,4.4001008 27.318303,4.7018714 C 13.655392,5.7359945 3.1212452,19.154954 4.571,32.63029 C 4.6555615,55.310488 4.4001543,78.001434 4.701815,100.67478 C 5.732848,114.33766 19.14685,124.88003 32.62429,123.429 C 55.309345,123.34447 78.005156,123.59982 100.68335,123.29816 C 114.34614,122.26269 124.87863,108.84276 123.429,95.36771 C 123.429,73.55014 123.429,51.732571 123.429,29.915001 z"
+ style="fill:#f57900;fill-opacity:1;stroke:none" /></g></g></g><g
+ id="g3267"
+ transform="matrix(0.2954876,0,0,-0.2955267,0.3016452,127.60042)"
+ style="fill:url(#linearGradient3217);fill-opacity:1"><g
+ id="g3269"
+ style="fill:url(#linearGradient3215);fill-opacity:1"><g
+ id="g3271"
+ style="fill:url(#linearGradient3213);fill-opacity:1"><path
+ id="path3273"
+ d="M 120.35364,17.922673 C 115.55613,8.6998977 107.96179,4.6474204 95.831258,4.571 C 72.994905,4.6555834 50.147792,4.4001008 27.318303,4.7018714 C 13.655392,5.7359945 3.1212452,19.154954 4.571,32.63029 C 4.6555615,55.310488 4.4001543,80.768894 4.701815,103.44224 C 6.1143957,104.77002 9.3538134,119.64674 16.281216,115.55817 C 32.747299,105.83986 62.937668,76.829161 61.921742,67.38561 C 61.921742,45.56804 120.35364,39.740243 120.35364,17.922673 z"
+ style="fill:url(#linearGradient3234);fill-opacity:1;stroke:none"
+ sodipodi:nodetypes="cccccscc" /></g></g></g><g
+ id="g3295"
+ transform="translate(-0.7068273,-0.4497993)"
+ style="fill:#eeeeec;stroke:#eeeeec"><path
+ transform="matrix(0.8,0,0,-0.8,0,128)"
+ sodipodi:nodetypes="ccccc"
+ id="path3293"
+ d="M 8.7550201,7.1164658 C 27.144226,9.188466 39.179126,18.429426 40.883534,39.325301 L 35.180723,39.325301 C 33.384365,22.620491 23.902594,14.889021 8.8353414,13.381526 L 8.7550201,7.1164658 z"
+ style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+ sodipodi:nodetypes="ccccc"
+ transform="matrix(0.8,0,0,-0.8,0,128)"
+ id="path3291"
+ d="M 9.0763052,24.2249 C 18.841763,24.662007 23.0271,30.700076 23.935743,39.405622 L 29.879518,39.485944 C 28.300152,25.30521 20.281142,19.207838 9.0763052,18.120482 L 9.0763052,24.2249 z"
+ style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+ transform="matrix(0.8,0,0,-0.8,0.8178584,128)"
+ d="M 16.290628,35.107368 A 4.3635263,4.3537817 0 1 1 7.5635757,35.107368 A 4.3635263,4.3537817 0 1 1 16.290628,35.107368 z"
+ sodipodi:ry="4.3537817"
+ sodipodi:rx="4.3635263"
+ sodipodi:cy="35.107368"
+ sodipodi:cx="11.927102"
+ id="path2493"
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" /></g></g></svg>
\ No newline at end of file
--- /dev/null
+#! /usr/bin/env python
+# WAF build script for midori
+
+def add_image (bld, install_files, category, name):
+ import os
+ import pproc as subprocess
+
+ srcdir = os.getcwd ()
+ blddir = bld.m_bdir
+
+ def mkdir (path):
+ if not os.access (path, os.F_OK):
+ os.mkdir (path)
+
+ def _install_files (folder, destination, source):
+ try:
+ install_files (folder, destination, source)
+ except:
+ pass
+
+ if bld.env ()['CONVERT']:
+ mkdir (blddir + '/icons')
+
+ for size in [16, 22, 32, 48]:
+ format = str (size) + 'x' + str (size)
+ if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK):
+ _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category,
+ srcdir + '/icons/' + format + '/' + name + '.png')
+ elif not bld.env ()['CONVERT']:
+ pass
+ elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK):
+ mkdir (blddir + '/icons/' + format)
+ convert = subprocess.Popen (['convert',
+ '-background', 'transparent',
+ '-geometry', format, '-extent', format,
+ srcdir + '/icons/scalable/' + name + '.svg',
+ blddir + '/icons/' + format + '/' + name + '.png'],
+ stderr=subprocess.PIPE)
+ if not convert.wait ():
+ _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category,
+ blddir + '/icons/' + format + '/' + name + '.png')
+ else:
+ Params.pprint ('BLUE', "Optimized icons could not be created.")
+ break
+
+add_image (bld, install_files, 'apps', 'midori')
+add_image (bld, install_files, 'status', 'news-feed')
{
static GtkStockItem items[] =
{
+ { STOCK_NEWS_FEED },
{ STOCK_LOCK_OPEN },
{ STOCK_LOCK_SECURE },
{ STOCK_LOCK_BROKEN },
#define STOCK_BOOKMARK GTK_STOCK_FILE /* "stock_bookmark" "bookmark-web" */
#define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL /* "insert-text" "form-fill" */
-#define STOCK_NEWSFEED GTK_STOCK_INDEX
+#define STOCK_NEWS_FEED "news-feed"
/* We assume that these legacy icon names are usually present */
GtkWidget* statusbar;
GtkWidget* progressbar;
+ const gchar* stock_news_feed;
+
gchar* statusbar_text;
MidoriWebSettings* settings;
GList* tab_titles;
{
gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (
gtk_bin_get_child (GTK_BIN (browser->location))),
- GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INDEX);
+ GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed);
}
static gboolean
"</ui>";
static void
-midori_browser_realize_cb (GtkStyle* style, MidoriBrowser* browser)
+midori_browser_realize_cb (GtkStyle* style,
+ MidoriBrowser* browser)
{
- GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (browser));
+ GdkScreen* screen;
+ GtkIconTheme* icon_theme;
+
+ screen = gtk_widget_get_screen (GTK_WIDGET (browser));
if (screen)
{
- GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen);
+ icon_theme = gtk_icon_theme_get_for_screen (screen);
if (gtk_icon_theme_has_icon (icon_theme, "midori"))
gtk_window_set_icon_name (GTK_WINDOW (browser), "midori");
else
gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser");
+ if (gtk_icon_theme_has_icon (icon_theme, STOCK_NEWS_FEED))
+ browser->stock_news_feed = STOCK_NEWS_FEED;
+ else
+ browser->stock_news_feed = GTK_STOCK_INDEX;
}
}
{
GtkRcStyle* rcstyle;
+ browser->stock_news_feed = GTK_STOCK_INDEX;
+
/* Setup the window metrics */
g_signal_connect (browser, "realize",
G_CALLBACK (midori_browser_realize_cb), browser);
/* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */
gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (
gtk_bin_get_child (GTK_BIN (browser->location))),
- GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INDEX);
+ GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed);
gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (
gtk_bin_get_child (GTK_BIN (browser->location))),
GTK_ICON_ENTRY_SECONDARY, TRUE);
help='Disables native language support', dest='disable_nls')
def build (bld):
- bld.add_subdirs ('katze midori data')
+ bld.add_subdirs ('katze midori icons')
if bld.env ()['INTLTOOL']:
bld.add_subdirs ('po')
if not Params.g_options.destdir:
# update the pixmap cache directory
try:
- subprocess.call (['gtk-update-icon-cache', '-q', '-f', '-t', dir])
- Params.pprint ('YELLOW', "Updated Gtk icon cache.")
- icon_cache_updated = True
+ uic = subprocess.Popen (['gtk-update-icon-cache', '-q', '-f', '-t', dir],
+ stderr=subprocess.PIPE)
+ if not uic.wait ():
+ Params.pprint ('YELLOW', "Updated Gtk icon cache.")
+ icon_cache_updated = True
except:
Params.pprint ('RED', "Failed to update icon cache.")
if not icon_cache_updated:
projects / midori / commitdiff
