From ef20f620c2e41a59a43be0b1ee230219f1cf72aa Mon Sep 17 00:00:00 2001
From: Santiago Collazo <scollazo@activitycentral.com>
Date: Fri, 18 Jan 2013 14:21:39 +0000
Subject: Merge remote-tracking branch 'ajay/0.97.6-as-base' into devel

---
diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em
index 94dceda..2ae1592 100644
--- a/gtk3/theme/gtk-widgets.css.em
+++ b/gtk3/theme/gtk-widgets.css.em
@@ -817,6 +817,23 @@ SugarKeepIcon.button.toggle-press {
     background-color: @zoom_views_active;
 }
 
+/* CellRendererProgress */
+
+.cell.progressbar, .cell.trough {
+    border-style: solid;
+    border-width: $(thickness)px;
+    border-color: @selection_grey;
+    border-radius: $(2*subcell_size)px;
+}
+
+.cell.progressbar {
+    background-color: @white;
+}
+
+.cell.trough {
+    background-color: @text_field_grey;
+}
+
 /* Text cursor handles */
 
 .cursor-handle.top,
diff --git a/icons/scalable/actions/Makefile.am b/icons/scalable/actions/Makefile.am
index a0ae900..f6e02a5 100755
--- a/icons/scalable/actions/Makefile.am
+++ b/icons/scalable/actions/Makefile.am
@@ -118,7 +118,12 @@ icon_DATA =						\
 	zoom-neighborhood.svg				\
 	zoom-original.svg				\
 	zoom-out.svg					\
-	zoom-to-width.svg
+	zoom-to-width.svg				\
+	entry-cancel.svg				\
+	entry-search.svg				\
+	entry-stop.svg					\
+	entry-refresh.svg
+
 
 EXTRA_DIST = $(icon_DATA)
 
diff --git a/icons/scalable/actions/entry-cancel.svg b/icons/scalable/actions/entry-cancel.svg
new file mode 100644
index 0000000..6c6354e
--- /dev/null
+++ b/icons/scalable/actions/entry-cancel.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="22"
+   height="22"
+   viewBox="0 0 22 22"
+   id="svg5047"
+   xml:space="preserve"><g
+     transform="matrix(0.48888889,0,0,0.48888889,-2.4723111,-2.4703556)"
+     id="dialog-cancel"
+     style="fill:&fill_color;;display:block">
+	<path
+   d="m 27.557,5.053 c -12.43,0 -22.5,10.076 -22.5,22.497 0,12.432 10.07,22.503 22.5,22.503 12.431,0 22.5,-10.071 22.5,-22.503 0,-12.421 -10.07,-22.497 -22.5,-22.497 z m 10.199,28.159 c 1.254,1.256 1.257,3.291 0,4.545 -0.628,0.629 -1.451,0.943 -2.274,0.943 -0.822,0 -1.644,-0.314 -2.27,-0.94 l -5.76,-5.761 -5.76,5.761 c -0.627,0.626 -1.449,0.94 -2.271,0.94 -0.823,0 -1.647,-0.314 -2.275,-0.943 -1.254,-1.254 -1.254,-3.289 0.004,-4.545 l 5.758,-5.758 -5.758,-5.758 c -1.258,-1.254 -1.258,-3.292 -0.004,-4.546 1.255,-1.254 3.292,-1.259 4.546,0 l 5.76,5.759 5.76,-5.759 c 1.252,-1.259 3.288,-1.254 4.544,0 1.257,1.254 1.254,3.292 0,4.546 l -5.758,5.758 5.758,5.758 z"
+   id="path5050"
+   style="fill:&fill_color;;display:inline" />
+</g></svg>
diff --git a/icons/scalable/actions/entry-refresh.svg b/icons/scalable/actions/entry-refresh.svg
new file mode 100644
index 0000000..0682978
--- /dev/null
+++ b/icons/scalable/actions/entry-refresh.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22.16" height="22.16" viewBox="0 0 22.16 22.16" id="browse-view-refresh" xml:space="preserve">
+  <path
+      d="m 9.769744,17.559712 c -3.044496,-0.6084 -5.33832,-3.295344 -5.33832,-6.51768 0,-3.67224 2.97648,-6.649344 6.646848,-6.649344 3.672864,0 6.649344,2.977104 6.649344,6.649344 0,3.166176 -2.215824,5.816928 -5.18232,6.48648" id="path3220" style="fill:none;stroke:&stroke_color;;stroke-width:2.18400002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <polyline
+      points="    22.936,31.578 25.5,37.994 18.746,39.439   "
+      id="polyline3222"
+      style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+      transform="matrix(0.624,0,0,0.624,-6.142256,-6.148544)" />
+</svg>
diff --git a/icons/scalable/actions/entry-search.svg b/icons/scalable/actions/entry-search.svg
new file mode 100644
index 0000000..eda02d1
--- /dev/null
+++ b/icons/scalable/actions/entry-search.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+        <!ENTITY stroke_color "#010101">
+        <!ENTITY fill_color "#FFFFFF">
+]>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="22.156px" height="22.156px" viewBox="0 0 22.156 22.156" enable-background="new 0 0 22.156 22.156" xml:space="preserve">
+<g>
+	<path fill="none" stroke="&fill_color;" stroke-width="3.5" d="M1.75,9.216c0,4.125,3.342,7.47,7.468,7.47
+		c4.121,0,7.466-3.345,7.466-7.47c0-4.123-3.345-7.466-7.466-7.466C5.092,1.75,1.75,5.093,1.75,9.216z"/>
+	<line fill="none" stroke="&fill_color;" stroke-width="3.5" x1="14.498" y1="14.497" x2="20.918" y2="20.919"/>
+</g>
+</svg>
diff --git a/icons/scalable/actions/entry-stop.svg b/icons/scalable/actions/entry-stop.svg
new file mode 100644
index 0000000..76e2703
--- /dev/null
+++ b/icons/scalable/actions/entry-stop.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22.16" height="22.16" viewBox="0 0 22.16 22.16" id="browse-dialog-cancel" xml:space="preserve">
+  <g transform="matrix(1.3,0,0,1.3,-3.2682282,-3.3351543)" id="browse-dialog-cancel" style="stroke-width:2.69230771;stroke-miterlimit:4;stroke-dasharray:none">
+    <path
+       d="M 14.798121,7.2131543 6.9900671,15.021208"
+       id="path2986"
+       style="fill:none;stroke:&stroke_color;;stroke-width:2.69230771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 6.9900671,7.2131543 14.798121,15.021208"
+       id="path3756"
+       style="fill:none;stroke:&stroke_color;;stroke-width:2.69230771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/icons/scalable/actions/system-search.svg b/icons/scalable/actions/system-search.svg
index eda02d1..0753c7d 100644
--- a/icons/scalable/actions/system-search.svg
+++ b/icons/scalable/actions/system-search.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-        <!ENTITY stroke_color "#010101">
-        <!ENTITY fill_color "#FFFFFF">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
 ]>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="22.156px" height="22.156px" viewBox="0 0 22.156 22.156" enable-background="new 0 0 22.156 22.156" xml:space="preserve">
-<g>
-	<path fill="none" stroke="&fill_color;" stroke-width="3.5" d="M1.75,9.216c0,4.125,3.342,7.47,7.468,7.47
-		c4.121,0,7.466-3.345,7.466-7.47c0-4.123-3.345-7.466-7.466-7.466C5.092,1.75,1.75,5.093,1.75,9.216z"/>
-	<line fill="none" stroke="&fill_color;" stroke-width="3.5" x1="14.498" y1="14.497" x2="20.918" y2="20.919"/>
-</g>
-</svg>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55.125"
+   height="55"
+   viewBox="0 0 55.125 55"
+   id="svg2998"
+   xml:space="preserve"><path
+     d="m 24.041111,6.6111917 c -9.547345,0 -17.367419,7.8249603 -17.367419,17.3674193 0,9.545361 7.81901,17.367419 17.367419,17.367419 3.592743,0 6.946526,-1.113321 9.724565,-3.003612 l 9.992214,9.992214 4.639242,-4.639242 -9.962475,-10.021953 c 1.876778,-2.771091 2.973873,-6.114717 2.973873,-9.694826 0,-9.544057 -7.827328,-17.3674193 -17.367419,-17.3674193 z m 0,6.6019983 c 5.97663,0 10.765421,4.785226 10.765421,10.765421 0,5.984823 -4.789857,10.76542 -10.765421,10.76542 -5.987137,0 -10.765421,-4.778999 -10.765421,-10.76542 0,-5.981792 4.777219,-10.765421 10.765421,-10.765421 z"
+     id="path2988"
+     style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.5;stroke-linejoin:round;stroke-miterlimit:4;" /></svg>
--
cgit v0.9.1