Merge branch 'master' of git.sugarlabs.org:sugar-artwork/walters-sugarartwork-clone

10 files changed, 53 insertions, 10 deletions

diff --git a/autogen.sh b/autogen.sh
index 9bd6fd0..d09dc6a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 autoreconf -i
-./configure "$@"
+./configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 4f1348b..04e1071 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,20 @@
 AC_PREREQ(2.53)
 
-AC_INIT([sugar-artwork],[0.86.0],[],[sugar-artwork])
+AC_INIT([sugar-artwork],[0.88.1],[],[sugar-artwork])
 
 AM_CONFIG_HEADER(config.h)
 
 AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
 
+AM_MAINTAINER_MODE
 AM_DISABLE_STATIC
 
 PKG_PROG_PKG_CONFIG([0.19])
 
+dnl These catch plenty of subtle bugs and miscompilation problems
+WARN_CFLAGS="-Wall -W -Werror=implicit-function-declaration"
+AC_SUBST(WARN_CFLAGS)
+
 AC_PROG_CC
 AC_HEADER_STDC
 AC_PROG_LIBTOOL
@@ -20,7 +25,7 @@ if test -z "$ICON_SLICER"; then
 fi
 
 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0,,
-	          AC_MSG_ERROR([GTK+-2.0 is required to compile redhat-artwork]))
+	          AC_MSG_ERROR([GTK+-2.0 is required to compile sugar-artwork]))
 
 GDK_PIXBUF2_CFLAGS=`$PKG_CONFIG --cflags gdk-pixbuf-2.0`
 GDK_PIXBUF2_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0`
diff --git a/gtk/engine/Makefile.am b/gtk/engine/Makefile.am
index eb720ff..d23508a 100644
--- a/gtk/engine/Makefile.am
+++ b/gtk/engine/Makefile.am
@@ -1,7 +1,4 @@
 INCLUDES = \
-	-DGTK_DISABLE_DEPRECATED \
-	-DGDK_DISABLE_DEPRECATED \
-	-DG_DISABLE_DEPRECATED \
 	$(ENGINE_CFLAGS) $(WARN_CFLAGS)
 
 enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
diff --git a/gtk/engine/sugar-style.c b/gtk/engine/sugar-style.c
index 443a708..b81fe69 100644
--- a/gtk/engine/sugar-style.c
+++ b/gtk/engine/sugar-style.c
@@ -389,8 +389,12 @@ sugar_style_draw_box (GtkStyle       *style,
         SugarInfo info;
         sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
 
-        /* Fill the background with bg_color. */
-        sugar_fill_background (cr, &info);
+        /* Fill the background as it is initilized to base[NORMAL].
+         * Relevant GTK+ bug: http://bugzilla.gnome.org/show_bug.cgi?id=513471
+         * The fill only happens if no hint has been added by some application
+         * that is faking GTK+ widgets. */
+        if (!widget || !g_object_get_data(G_OBJECT (widget), "transparent-bg-hint"))
+            sugar_fill_background (cr, &info);
 
         info.cont_edges = info.ltr ? EDGE_LEFT : EDGE_RIGHT;
         sugar_remove_corners (&info.corners, info.cont_edges);
@@ -444,7 +448,8 @@ sugar_style_draw_box (GtkStyle       *style,
                 info.state = GTK_STATE_INSENSITIVE;
 
             /* Needed because the trough and bar are cached in a buffer inside GtkProgress. */
-            sugar_fill_background (cr, &info);
+            if (!widget || !g_object_get_data(G_OBJECT (widget), "transparent-bg-hint"))
+                sugar_fill_background (cr, &info);
             sugar_draw_progressbar_trough (cr, &info);
         }
     } else if (DETAIL ("bar")) {
@@ -641,7 +646,8 @@ sugar_style_draw_shadow (GtkStyle       *style,
         }
 
         /* Fill the background with bg_color. */
-        sugar_fill_background (cr, &info);
+        if (!widget || !g_object_get_data(G_OBJECT (widget), "transparent-bg-hint"))
+            sugar_fill_background (cr, &info);
         sugar_draw_entry (cr, &info);
     } else {
         gdouble line_width;
diff --git a/gtk/theme/gtkrc.em b/gtk/theme/gtkrc.em
index 56770ea..69dccd9 100644
--- a/gtk/theme/gtkrc.em
+++ b/gtk/theme/gtkrc.em
@@ -149,6 +149,11 @@ style "default"
     GtkButtonBox::child-internal-pad-x = 0
     GtkButtonBox::child-internal-pad-y = 0
 
+    # The following line hints to gecko (and possibly other appliations)
+    # that the entry should be drawn transparently on the canvas.
+    # Without this, gecko will fill in the background of the entry.
+    GtkEntry::honors-transparent-bg-hint = 1
+
     engine "sugar" {
         line_width = $line_width
         thick_line_width = $thick_line_width
diff --git a/icons/scalable/device/Makefile.am b/icons/scalable/device/Makefile.am
index 207d1d3..28818ab 100644
--- a/icons/scalable/device/Makefile.am
+++ b/icons/scalable/device/Makefile.am
@@ -48,6 +48,7 @@ icon_DATA =				\
 	media-disk.svg			\
 	media-flash-sd.svg		\
 	microphone.svg			\
+	network-gsm.svg			\
 	network-mesh.svg		\
 	network-mesh.icon		\
 	network-wired.svg		\
diff --git a/icons/scalable/device/network-gsm.svg b/icons/scalable/device/network-gsm.svg
new file mode 100644
index 0000000..9d7a533
--- /dev/null
+++ b/icons/scalable/device/network-gsm.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#666666">
+	<!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 56.167 55" height="55px" version="1.1" viewBox="0 0 56.167 55" width="56.167px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="network-gsm">
+	<g>
+		<path d="M13.759,11.28    v28.937h0.002c0,0.004-0.002,0.008-0.002,0.014c0,7.05,5.715,12.763,12.764,12.763c7.047,0,12.762-5.713,12.762-12.763v-0.014    V11.28H13.759z" fill="&fill_color;" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+		<rect fill="&stroke_color;" height="9.702" width="14.063" x="19.43" y="16.902"/>
+		
+			<line fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" x1="39.286" x2="39.286" y1="11.28" y2="1.993"/>
+	</g>
+</g></svg>
\ No newline at end of file
diff --git a/icons/scalable/status/Makefile.am b/icons/scalable/status/Makefile.am
index 9ec1684..c977c22 100644
--- a/icons/scalable/status/Makefile.am
+++ b/icons/scalable/status/Makefile.am
@@ -7,6 +7,8 @@ icon_DATA =			\
 	audio-volume-low.svg	\
 	audio-volume-medium.svg	\
 	audio-volume-muted.svg	\
+	data-download.svg	\
+	data-upload.svg		\
 	image-missing.svg
 
 EXTRA_DIST = $(icon_DATA)
diff --git a/icons/scalable/status/data-download.svg b/icons/scalable/status/data-download.svg
new file mode 100644
index 0000000..f9ebab9
--- /dev/null
+++ b/icons/scalable/status/data-download.svg
@@ -0,0 +1,8 @@
+<?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 stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+    <polyline points="14,27.5 27.5,42 41,27.5 34,27.5 34,16 21,16 21,27.5" style="fill:&fill_color;;stroke:none"/>
+</svg>
\ No newline at end of file
diff --git a/icons/scalable/status/data-upload.svg b/icons/scalable/status/data-upload.svg
new file mode 100644
index 0000000..7365fe3
--- /dev/null
+++ b/icons/scalable/status/data-upload.svg
@@ -0,0 +1,8 @@
+<?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 stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+    <polyline points="14,27.5 27.5,13 41,27.5 34,27.5 34,39 21,39 21,27.5" style="fill:&fill_color;;stroke:none"/>
+</svg>
\ No newline at end of file