[Pkg-bazaar-commits] ./bzr-gtk/unstable r439: Merge with trunk
Aaron Bentley
aaron at aaronbentley.com
Fri Apr 10 07:50:18 UTC 2009
------------------------------------------------------------
revno: 439
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr-gtk
timestamp: Tue 2008-03-04 22:31:46 +0000
message:
Merge with trunk
added:
icons/emblem-bzr-added.svg
icons/emblem-bzr-conflict.svg
icons/emblem-bzr-controlled.svg
icons/emblem-bzr-modified.svg
icons/emblem-bzr-removed.svg
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 423.13.1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nautilus-fix
timestamp: Tue 2008-03-04 18:56:50 +0100
message:
Fix handling of NoWorkingTree error.
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 437.1.1
committer: Martin Albisetti <beuno at beuno-laptop>
branch nick: bzr-gtk
timestamp: Tue 2008-03-04 18:17:37 +0000
message:
Merges
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 437.1.2
committer: Martin Albisetti <beuno at beuno-laptop>
branch nick: bzr-gtk
timestamp: Tue 2008-03-04 18:17:44 +0000
message:
Merges
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 423.13.2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nautilus-fix
timestamp: Tue 2008-03-04 19:02:55 +0100
message:
Fix handling of NoWorkingTree exception in a couple more places.
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 437.1.3
committer: Martin Albisetti <beuno at beuno-laptop>
branch nick: bzr-gtk
timestamp: Tue 2008-03-04 18:29:24 +0000
message:
Merge
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 423.13.3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nautilus-fix
timestamp: Tue 2008-03-04 19:05:39 +0100
message:
Remove fork() hack, it breaks X.
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 423.13.4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nautilus-fix
timestamp: Tue 2008-03-04 19:23:21 +0100
message:
Fix commit dialog from nautilus.
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 437.1.4
committer: Martin Albisetti <argentina at gmail.com>
branch nick: bzr-gtk
timestamp: Tue 2008-03-04 22:13:43 +0000
message:
Added custom colored context icons
added:
icons/emblem-bzr-added.svg
icons/emblem-bzr-conflict.svg
icons/emblem-bzr-controlled.svg
icons/emblem-bzr-modified.svg
icons/emblem-bzr-removed.svg
-------------- next part --------------
=== added file 'icons/emblem-bzr-added.svg'
--- a/icons/emblem-bzr-added.svg 1970-01-01 00:00:00 +0000
+++ b/icons/emblem-bzr-added.svg 2008-03-04 22:13:43 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0"
+ id="svg1872" inkscape:version="0.45+devel" sodipodi:version="0.32" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docbase="/usr/share/icons/Human/48x48/emblems" xmlns:dc="http://purl.org/dc/elements/1.1/" sodipodi:docname="emblem-cvs-added.svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
+ viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
+<sodipodi:namedview inkscape:window-height="701" inkscape:pageshadow="2" inkscape:window-width="1024" height="48px" width="48px" id="base" gridempspacing="5" grid_units="px" inkscape:document-units="px" gridoriginx="0px" gridspacingy="1px" gridspacingx="1px" showgrid="true" inkscape:current-layer="svg1872" inkscape:window-y="24" inkscape:window-x="0" inkscape:cy="10.637821" inkscape:cx="10.096111" inkscape:zoom="25.4375" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" objecttolerance="10.0" gridtolerance="10.0" guidetolerance="10.0" inkscape:pageopacity="0.0">
+ </sodipodi:namedview>
+<g id="g2311" transform="matrix(2.4054897,0,0,2.428644,-2.5152837,-3.0014924)">
+ <path id="path1880" fill="#99B925" d="M21,11.185C21,16.606,16.533,21,11.023,21c-5.51,0-9.977-4.394-9.977-9.815
+ c0-5.421,4.467-9.815,9.977-9.815C16.533,1.37,21,5.764,21,11.185L21,11.185z"/>
+
+ <path id="path1876" sodipodi:type="star" sodipodi:sides="3" sodipodi:cx="5.0319409" sodipodi:cy="4.4422603" sodipodi:r1="2.387377" sodipodi:r2="1.1936886" sodipodi:arg1="1.2698761" sodipodi:arg2="2.3170736" inkscape:flatsided="true" inkscape:rounded="-5.8980598e-17" inkscape:randomized="0" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.26" stroke-linecap="round" stroke-linejoin="round" d="
+ M4.317,7.075l13.321-0.076l-6.591,10.938L4.317,7.075z"/>
+
+ <path id="path7379" sodipodi:type="star" sodipodi:sides="5" sodipodi:cx="6.9975429" sodipodi:cy="7.0761671" sodipodi:r1="2.1492579" sodipodi:r2="0.32023942" sodipodi:arg1="0.87605805" sodipodi:arg2="1.5043766" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" fill="#99B925" stroke="#99B925" stroke-width="0.8125" stroke-linecap="round" stroke-linejoin="round" d="
+ M12.752,13.325l-1.781-1.99l-1.783,1.988l1.354-2.298L8.089,9.953l2.618,0.57l0.267-2.65l0.264,2.65l2.618-0.566l-2.455,1.069
+ L12.752,13.325z"/>
+ <polygon id="rect2942" fill="none" points="5.129,9.064 12.491,7.016 13.767,11.55 6.405,13.597 "/>
+ <g id="layer1" transform="matrix(1.410646,0,0,1.402164,-0.11903,2.433592e-2)" inkscape:label="Layer 1">
+
+ <linearGradient id="path2394_1_" gradientUnits="userSpaceOnUse" x1="-61.6577" y1="89.6161" x2="-66.3054" y2="102.9791" gradientTransform="matrix(3.3933 0 0 -3.4054 218.8807 317.8763)">
+ <stop offset="0" style="stop-color:#EEEEEC"/>
+ <stop offset="1" style="stop-color:#EEEEEC"/>
+ </linearGradient>
+ <path id="path2394" sodipodi:nodetypes="cscssscc" fill="url(#path2394_1_)" d="M7.943,0.864c-3.904,0-7.094,3.136-7.094,7
+ c0,0.222,0.015,0.544,0.035,0.76C1.34,8.366,1.738,8.039,2.268,7.809c1.525-0.66,3.315-1.326,5.331-1.695
+ c2.016-0.369,4.206-0.562,6.531-0.562c0.144,0,0.263,0.03,0.406,0.031C13.571,2.854,11.028,0.864,7.943,0.864z"/>
+ </g>
+</g>
+</svg>
=== added file 'icons/emblem-bzr-conflict.svg'
--- a/icons/emblem-bzr-conflict.svg 1970-01-01 00:00:00 +0000
+++ b/icons/emblem-bzr-conflict.svg 2008-03-04 22:13:43 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0"
+ id="svg2289" inkscape:version="0.45+devel" sodipodi:version="0.32" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:dc="http://purl.org/dc/elements/1.1/" sodipodi:docname="emblem-cvs-conflict.svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
+ viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
+<sodipodi:namedview inkscape:window-height="656" inkscape:pageshadow="2" inkscape:window-width="741" height="48px" width="48px" id="base" inkscape:grid-bbox="true" inkscape:document-units="px" showgrid="true" inkscape:current-layer="layer1" inkscape:window-y="24" inkscape:window-x="209" inkscape:cy="16" inkscape:cx="16" inkscape:zoom="1" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0">
+ </sodipodi:namedview>
+<g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1">
+ <g id="g2279" transform="matrix(1.5999996,0,0,1.5964294,-1.5999998,-1.4893082)">
+ <g id="g4372" transform="matrix(1.5,0,0,1.498328,-0.5,-0.464893)">
+ <path id="path1880" fill="#FAA81C" d="M21,11.014C21,16.529,16.523,21,11,21S1,16.529,1,11.014c0-5.515,4.477-9.986,10-9.986
+ S21,5.499,21,11.014L21,11.014z"/>
+
+ <path id="path1876" sodipodi:type="star" sodipodi:sides="3" sodipodi:cx="5.0319409" sodipodi:cy="4.4422603" sodipodi:r1="2.387377" sodipodi:r2="1.1936886" sodipodi:arg1="1.2698761" sodipodi:arg2="2.3170736" inkscape:flatsided="true" inkscape:rounded="-5.8980598e-17" inkscape:randomized="0" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.2603" stroke-linecap="round" stroke-linejoin="round" d="
+ M4.279,6.833L17.63,6.756l-6.606,11.128L4.279,6.833z"/>
+
+ <rect id="rect1878" x="10.161" y="7.316" fill="#FAA81C" stroke="#FAA81C" stroke-width="0.3382" stroke-linecap="round" stroke-linejoin="round" width="1.662" height="4.873"/>
+
+ <rect id="rect1880" x="10.05" y="13.794" fill="#FAA81C" stroke="#FAA81C" stroke-width="0.1993" stroke-linecap="round" stroke-linejoin="round" width="1.938" height="1.451"/>
+ <polygon id="rect2942" fill="none" points="5.148,9.137 12.528,7.054 13.806,11.666 6.427,13.749 "/>
+ <g id="g1972" transform="matrix(1.413873,0,0,1.426527,-0.151245,-0.299685)" inkscape:label="Layer 1">
+
+ <linearGradient id="path2394_1_" gradientUnits="userSpaceOnUse" x1="-61.6691" y1="89.5024" x2="-66.3167" y2="102.8654" gradientTransform="matrix(3.3933 0 0 -3.4122 218.9189 318.1022)">
+ <stop offset="0" style="stop-color:#EEEEEC"/>
+ <stop offset="1" style="stop-color:#EEEEEC"/>
+ </linearGradient>
+ <path id="path2394" sodipodi:nodetypes="cscssscc" fill="url(#path2394_1_)" d="M7.943,0.864c-3.904,0-7.094,3.136-7.094,7
+ c0,0.222,0.014,0.544,0.035,0.76C1.34,8.366,1.738,8.039,2.268,7.809c1.525-0.661,3.315-1.326,5.331-1.695
+ c2.015-0.369,4.206-0.563,6.531-0.563c0.144,0,0.263,0.03,0.406,0.031C13.571,2.854,11.028,0.864,7.943,0.864z"/>
+ </g>
+ </g>
+ </g>
+</g>
+</svg>
=== added file 'icons/emblem-bzr-controlled.svg'
--- a/icons/emblem-bzr-controlled.svg 1970-01-01 00:00:00 +0000
+++ b/icons/emblem-bzr-controlled.svg 2008-03-04 22:13:43 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0"
+ id="svg1872" inkscape:version="0.45+devel" sodipodi:version="0.32" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docbase="/usr/share/icons/Human/48x48/emblems" xmlns:dc="http://purl.org/dc/elements/1.1/" sodipodi:docname="emblem-cvs-controlled.svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
+ viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
+<sodipodi:namedview inkscape:window-height="701" inkscape:pageshadow="2" inkscape:window-width="1024" height="48px" width="48px" id="base" showgrid="true" inkscape:current-layer="svg1872" inkscape:window-y="24" inkscape:window-x="0" inkscape:cy="10.597879" inkscape:cx="2.3755476" inkscape:zoom="12.71875" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" objecttolerance="10.0" gridtolerance="10.0" guidetolerance="10.0" inkscape:pageopacity="0.0">
+ </sodipodi:namedview>
+<g id="g16004" transform="matrix(3.3855501,0,0,3.3744962,-2.7832517,-2.6174632)">
+ <path id="path1880" fill="#1E4E94" d="M15,8c0,3.866-3.167,7-7.073,7s-7.073-3.134-7.073-7c0-3.866,3.167-7,7.073-7S15,4.134,15,8
+ L15,8z"/>
+
+ <path id="path1876" sodipodi:type="star" sodipodi:sides="3" sodipodi:cx="5.0319409" sodipodi:cy="4.4422603" sodipodi:r1="2.387377" sodipodi:r2="1.1936886" sodipodi:arg1="1.2698761" sodipodi:arg2="2.3170736" inkscape:flatsided="true" inkscape:rounded="-5.8980598e-17" inkscape:randomized="0" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.2617" stroke-linecap="round" stroke-linejoin="round" d="
+ M3.174,5.069l9.443-0.054l-4.672,7.801L3.174,5.069z"/>
+ <path id="path6404" fill="#1E4E94" stroke="#1E4E94" stroke-width="0.8802" stroke-linecap="round" d="M5.821,6.465
+ C7.86,9.731,7.86,9.731,7.86,9.731"/>
+ <path id="path2786" fill="#1E4E94" stroke="#1E4E94" stroke-width="0.8802" stroke-linecap="round" d="M9.943,6.426
+ C7.905,9.692,7.905,9.692,7.905,9.692"/>
+ <g id="g2901" transform="translate(-6.813306e-2,-0.163139)">
+ <polygon id="rect2942" fill="none" points="3.817,6.69 9.036,5.23 9.941,8.462 4.722,9.923 "/>
+ <g id="layer1" transform="translate(4.12207e-2,7.47524e-2)" inkscape:label="Layer 1">
+
+ <linearGradient id="path2394_1_" gradientUnits="userSpaceOnUse" x1="-61.721" y1="90.1311" x2="-66.369" y2="103.4951" gradientTransform="matrix(3.3856 0 0 -3.3745 218.6171 316.849)">
+ <stop offset="0" style="stop-color:#EEEEEC"/>
+ <stop offset="1" style="stop-color:#EEEEEC"/>
+ </linearGradient>
+ <path id="path2394" sodipodi:nodetypes="cscssscc" fill="url(#path2394_1_)" d="M7.943,0.864c-3.904,0-7.094,3.136-7.094,7
+ c0,0.222,0.014,0.544,0.035,0.76C1.34,8.366,1.738,8.039,2.268,7.809c1.525-0.66,3.315-1.326,5.331-1.695
+ c2.015-0.369,4.206-0.562,6.531-0.562c0.144,0,0.263,0.03,0.406,0.031C13.571,2.854,11.028,0.864,7.943,0.864z"/>
+ </g>
+ </g>
+</g>
+</svg>
=== added file 'icons/emblem-bzr-modified.svg'
--- a/icons/emblem-bzr-modified.svg 1970-01-01 00:00:00 +0000
+++ b/icons/emblem-bzr-modified.svg 2008-03-04 22:13:43 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0"
+ id="svg1872" inkscape:version="0.45+devel" sodipodi:version="0.32" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docbase="/usr/share/icons/Human/48x48/emblems" xmlns:dc="http://purl.org/dc/elements/1.1/" sodipodi:docname="emblem-cvs-modified.svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
+ viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
+<sodipodi:namedview inkscape:window-height="701" inkscape:pageshadow="2" inkscape:window-width="1024" height="48px" width="48px" id="base" showgrid="true" inkscape:current-layer="svg1872" inkscape:window-y="24" inkscape:window-x="0" inkscape:cy="37.881892" inkscape:cx="11.784039" inkscape:zoom="12.71875" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" objecttolerance="10.0" gridtolerance="10.0" guidetolerance="10.0" inkscape:pageopacity="0.0">
+ </sodipodi:namedview>
+<g id="g16016" transform="matrix(3.3855502,0,0,3.3932522,-2.7832531,-2.8988029)">
+ <path id="path1880" fill="#B824D1" d="M15,8c0,3.866-3.167,7-7.073,7c-3.906,0-7.073-3.134-7.073-7c0-3.866,3.167-7,7.073-7
+ C11.833,1,15,4.134,15,8L15,8z"/>
+
+ <path id="path1876" sodipodi:type="star" sodipodi:sides="3" sodipodi:cx="5.0319409" sodipodi:cy="4.4422603" sodipodi:r1="2.387377" sodipodi:r2="1.1936886" sodipodi:arg1="1.2698761" sodipodi:arg2="2.3170736" inkscape:flatsided="true" inkscape:rounded="-5.8980598e-17" inkscape:randomized="0" fill="#B824D1" stroke="#FFFFFF" stroke-width="0.2614" stroke-linecap="round" stroke-linejoin="round" d="
+ M3.174,5.069l9.443-0.054l-4.672,7.801L3.174,5.069z"/>
+ <g id="g2901" transform="translate(-6.813266e-2,-8.451501e-2)">
+ <polygon id="rect2942" fill="none" points="3.817,6.69 9.036,5.23 9.941,8.463 4.722,9.923 "/>
+ <g id="layer1" transform="translate(4.12207e-2,7.47524e-2)" inkscape:label="Layer 1">
+
+ <linearGradient id="path2394_1_" gradientUnits="userSpaceOnUse" x1="-61.7213" y1="89.8176" x2="-66.369" y2="103.1806" gradientTransform="matrix(3.3856 0 0 -3.3933 218.6177 317.476)">
+ <stop offset="0" style="stop-color:#EEEEEC"/>
+ <stop offset="1" style="stop-color:#EEEEEC"/>
+ </linearGradient>
+ <path id="path2394" sodipodi:nodetypes="cscssscc" fill="url(#path2394_1_)" d="M7.943,0.864c-3.904,0-7.094,3.136-7.094,7
+ c0,0.222,0.014,0.544,0.035,0.76C1.34,8.366,1.738,8.039,2.268,7.809c1.525-0.66,3.315-1.326,5.331-1.695
+ c2.015-0.369,4.206-0.562,6.531-0.562c0.144,0,0.263,0.03,0.406,0.031C13.571,2.854,11.028,0.864,7.943,0.864z"/>
+ </g>
+ </g>
+</g>
+</svg>
=== added file 'icons/emblem-bzr-removed.svg'
--- a/icons/emblem-bzr-removed.svg 1970-01-01 00:00:00 +0000
+++ b/icons/emblem-bzr-removed.svg 2008-03-04 22:13:43 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0"
+ id="svg1872" inkscape:version="0.45+devel" sodipodi:version="0.32" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docbase="/usr/share/icons/Human/48x48/emblems" xmlns:dc="http://purl.org/dc/elements/1.1/" sodipodi:docname="emblem-cvs-removed.svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
+ viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
+<sodipodi:namedview inkscape:window-height="701" inkscape:pageshadow="2" inkscape:window-width="1024" height="48px" width="48px" id="base" gridempspacing="5" grid_units="px" inkscape:document-units="px" gridoriginx="0px" gridspacingy="1px" gridspacingx="1px" showgrid="true" inkscape:current-layer="svg1872" inkscape:window-y="24" inkscape:window-x="0" inkscape:cy="16.927748" inkscape:cx="10.096111" inkscape:zoom="25.4375" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" objecttolerance="10.0" gridtolerance="10.0" guidetolerance="10.0" inkscape:pageopacity="0.0">
+ </sodipodi:namedview>
+<g id="g2755" transform="matrix(2.3999995,0,0,2.4047271,-2.4000005,-2.499263)">
+ <g id="layer1" transform="matrix(1.413873,0,0,1.417795,-0.20809,-0.266936)">
+ <path id="path1880" fill="#FF0D0D" d="M15,8c0,3.866-3.167,7-7.073,7s-7.073-3.134-7.073-7c0-3.866,3.167-7,7.073-7S15,4.134,15,8
+ L15,8z"/>
+ </g>
+
+ <path id="path1876" sodipodi:type="star" sodipodi:sides="3" sodipodi:cx="5.0319409" sodipodi:cy="4.4422603" sodipodi:r1="2.387377" sodipodi:r2="1.1936886" sodipodi:arg1="1.2698761" sodipodi:arg2="2.3170736" inkscape:flatsided="true" inkscape:rounded="-5.8980598e-17" inkscape:randomized="0" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.26" stroke-linecap="round" stroke-linejoin="round" d="
+ M4.279,6.919L17.63,6.843l-6.606,11.06L4.279,6.919z"/>
+ <path id="path6404" fill="#FF0D0D" stroke="#FF0D0D" stroke-width="1.1504" stroke-linecap="round" d="M8.851,8.393
+ c4.112,4.185,4.112,4.185,4.112,4.185"/>
+ <path id="path7291" fill="#FF0D0D" stroke="#FF0D0D" stroke-width="1.1504" stroke-linecap="round" d="M12.763,8.206
+ c-3.792,4.403-3.792,4.403-3.792,4.403"/>
+ <polygon id="rect2942" fill="none" points="5.148,9.154 12.528,7.084 13.806,11.667 6.427,13.738 "/>
+ <g id="g1996" transform="matrix(1.413873,0,0,1.417795,-0.151245,-0.185729)" inkscape:label="Layer 1">
+
+ <linearGradient id="path2394_1_" gradientUnits="userSpaceOnUse" x1="-61.6692" y1="89.5487" x2="-66.3172" y2="102.9126" gradientTransform="matrix(3.3933 0 0 -3.4094 218.9194 318.0096)">
+ <stop offset="0" style="stop-color:#EEEEEC"/>
+ <stop offset="1" style="stop-color:#EEEEEC"/>
+ </linearGradient>
+ <path id="path2394" sodipodi:nodetypes="cscssscc" fill="url(#path2394_1_)" d="M7.943,0.864c-3.904,0-7.094,3.136-7.094,7
+ c0,0.222,0.014,0.544,0.035,0.76C1.34,8.366,1.738,8.039,2.268,7.809c1.525-0.661,3.315-1.326,5.331-1.695
+ c2.015-0.369,4.206-0.563,6.531-0.563c0.144,0,0.263,0.03,0.406,0.031C13.571,2.854,11.028,0.864,7.943,0.864z"/>
+ </g>
+</g>
+</svg>
=== modified file 'nautilus-bzr.py'
--- a/nautilus-bzr.py 2007-12-20 19:50:25 +0000
+++ b/nautilus-bzr.py 2008-03-04 18:23:21 +0000
@@ -2,20 +2,18 @@
#
# Copyright (C) 2006 Jeff Bailey
# Copyright (C) 2006 Wouter van Heyst
-# Copyright (C) 2006 Jelmer Vernooij
+# Copyright (C) 2006-2008 Jelmer Vernooij <jelmer at samba.org>
#
# Published under the GNU GPL
import gtk
import nautilus
import bzrlib
+from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir
-from bzrlib.errors import NotBranchError
-from bzrlib.errors import NoWorkingTree
-from bzrlib.errors import UnsupportedProtocol
+from bzrlib.errors import NotBranchError, NoWorkingTree, UnsupportedProtocol
+from bzrlib.tree import file_status
from bzrlib.workingtree import WorkingTree
-from bzrlib.branch import Branch
-from bzrlib.tree import file_status
from bzrlib.plugin import load_plugins
load_plugins()
@@ -160,7 +158,7 @@
path = e.path
from bzrlib.plugins.gtk.commit import CommitDialog
- dialog = CommitDialog(tree, path, not branch)
+ dialog = CommitDialog(tree, path)
response = dialog.run()
if response != gtk.RESPONSE_NONE:
dialog.hide()
@@ -241,6 +239,8 @@
items.append(item)
return items
+ except NoWorkingTree:
+ return
item = nautilus.MenuItem('BzrNautilus::log',
'Log',
@@ -268,7 +268,6 @@
return items
-
def get_file_items(self, window, files):
items = []
@@ -276,19 +275,21 @@
for vfs_file in files:
# We can only cope with local files
if vfs_file.get_uri_scheme() != 'file':
- return
+ continue
file = vfs_file.get_uri()
try:
tree, path = WorkingTree.open_containing(file)
except NotBranchError:
if not vfs_file.is_directory():
- return
+ continue
item = nautilus.MenuItem('BzrNautilus::newtree',
'Make directory versioned',
'Create new Bazaar tree in %s' % vfs_file.get_name())
item.connect('activate', self.newtree_cb, vfs_file)
return item,
+ except NoWorkingTree:
+ continue
# Refresh the list of filestatuses in the working tree
if path not in wtfiles.keys():
tree.lock_read()
@@ -362,6 +363,8 @@
tree, path = WorkingTree.open_containing(file.get_uri())
except NotBranchError:
return
+ except NoWorkingTree:
+ return
emblem = None
status = None
More information about the Pkg-bazaar-commits
mailing list