Satellite icon diet

[Dirk Hohndel: converted to png and .h]

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

4 files changed, 27 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 1610443b4..30e9fedbb 100644
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,11 @@ statistics.o: statistics.c dive.h display.h divelist.h
 gps.o: gps.c dive.h display.h divelist.h
 		$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(OSMGPSMAPFLAGS) -c gps.c
 
-#satellite.h: satellite.png
+# this should work but it doesn't preserve the transparancy - so I manually converted with gimp
+# satellite.png: satellite.svg
+#	convert -resize 11x16 -depth 8 satellite.svg satellite.png
+
+# satellite.h: satellite.png
 #	gdk-pixbuf-csource --struct satellite.png > satellite.h
 
 divelist.o: divelist.c dive.h display.h divelist.h satellite.h
diff --git a/satellite.h b/satellite.h
index c13bb0cf4..629a91f08 100644
--- a/satellite.h
+++ b/satellite.h
@@ -2,28 +2,27 @@
 
 static const GdkPixdata my_pixbuf = {
   0x47646b50, /* Pixbuf magic: 'GdkP' */
-  24 + 458, /* header length + pixel_data length */
+  24 + 445, /* header length + pixel_data length */
   0x2010002, /* pixdata_type */
   44, /* rowstride */
   11, /* width */
-  16, /* height */
+  15, /* height */
   /* pixel_data: */
-  "\12\0\0\0\0\0\0\0""4\0\0\0\216\0\0\0\1\0\0\0\34\0\0\0\254\0\0\0\261\0"
-  "\0\0\274\0\0\0\207\0\0\0\17\202\0\0\0\0\5\0\0\0\301\0\0\0\377\0\0\0\235"
-  "\0\0\0\6\0\0\0\14\202\0\0\0\20\4\0\0\0=\0\0\0\260\0\0\0\5\0\0\0.\203"
-  "\0\0\0\377\10\0\0\0\263\0\0\0\27\0\0\0\234\0\0\0\260\0\0\0M\0\0\0Z\0"
-  "\0\0e\0\0\0w\204\0\0\0\377\7\0\0\0\265\0\0\0\11\0\0\0\3\0\0\0\257\0\0"
-  "\0\7\0\0\0\242\0\0\0\245\205\0\0\0\377\6\0\0\0\277\0\0\0\15\0\0\0\222"
-  "\0\0\0\6\0\0\0\243\0\0\0\261\206\0\0\0\377\5\0\0\0\311\0\0\0\22\0\0\0"
-  "\15\0\0\0C\0\0\0\232\207\0\0\0\377\4\0\0\0\330\0\0\0\35\0\0\0\0\0\0\0"
-  "^\210\0\0\0\377\4\0\0\0\332\0\0\0\37\0\0\0\13\0\0\0\345\210\0\0\0\377"
-  "\4\0\0\0\306\0\0\0\0\0\0\0H\0\0\0\371\206\0\0\0\377\6\0\0\0\341\0\0\0"
-  "&\0\0\0\0\0\0\0e\0\0\0z\0\0\0\320\203\0\0\0\377\3\0\0\0\371\0\0\0\236"
-  "\0\0\0\22\202\0\0\0\0\7\0\0\0\272\0\0\0\377\0\0\0\300\0\0\0""0\0\0\0"
-  "U\0\0\0G\0\0\0\20\203\0\0\0\0\2\0\0\0\14\0\0\0\371\202\0\0\0\377\1\0"
-  "\0\0R\206\0\0\0\0\1\0\0\0M\203\0\0\0\377\1\0\0\0\256\206\0\0\0\0\1\0"
-  "\0\0\224\203\0\0\0\377\2\0\0\0\371\0\0\0\23\205\0\0\0\0\1\0\0\0\334\204"
-  "\0\0\0\377\1\0\0\0h\205\0\0\0\0",
+  "\204\0\0\0\0\6\0\0\0\27\0\0\0\243\0\0\0\240\0\0\0\253\0\0\0\215\0\0\0"
+  "\22\202\0\0\0\0\2\0\0\0(\0\0\0\23\202\0\0\0\0\11\0\0\0\4\0\0\0.\0\0\0"
+  ")\0\0\0,\0\0\0\256\0\0\0\14\0\0\0\0\0\0\0""0\0\0\0\241\202\0\0\0\0\12"
+  "\0\0\0\12\0\0\0u\0\0\0\221\0\0\0n\0\0\0A\0\0\0r\0\0\0\0\0\0\0\"\0\0\0"
+  "\376\0\0\0<\204\0\0\0\0\10\0\0\0\254\0\0\0\2\0\0\0\245\0\0\0\0\0\0\0"
+  "\2\0\0\0\357\0\0\0\337\0\0\0\23\203\0\0\0\0\3\0\0\0[\0\0\0\17\0\0\0\232"
+  "\202\0\0\0\0\4\0\0\0\257\0\0\0\377\0\0\0\321\0\0\0\36\204\0\0\0\0\1\0"
+  "\0\0\24\202\0\0\0\0\6\0\0\0""7\0\0\0\376\0\0\0\377\0\0\0\362\0\0\0y\0"
+  "\0\0\23\206\0\0\0\0\2\0\0\0g\0\0\0\374\202\0\0\0\377\4\0\0\0\373\0\0"
+  "\0\301\0\0\0{\0\0\0,\204\0\0\0\0\12\0\0\0\35\0\0\0o\0\0\0\206\0\0\0\200"
+  "\0\0\0d\0\0\0""3\0\0\0\4\0\0\0\0\0\0\0-\0\0\0\7\211\0\0\0\0\3\0\0\0\243"
+  "\0\0\0\307\0\0\0P\207\0\0\0\0\5\0\0\0\5\0\0\0\360\0\0\0\377\0\0\0\372"
+  "\0\0\0\33\206\0\0\0\0\1\0\0\0@\203\0\0\0\377\1\0\0\0\201\206\0\0\0\0"
+  "\1\0\0\0\215\203\0\0\0\377\2\0\0\0\352\0\0\0\10\205\0\0\0\0\1\0\0\0\331"
+  "\204\0\0\0\377\1\0\0\0_\205\0\0\0\0",
 };
 
 
diff --git a/satellite.png b/satellite.png
index b85b396dc..f01953836 100644
--- a/satellite.png
+++ b/satellite.png
diff --git a/satellite.svg b/satellite.svg
index 3e4c2c578..10b2ee5db 100644
--- a/satellite.svg
+++ b/satellite.svg
@@ -52,15 +52,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="2"
-     inkscape:cx="74.420662"
+     inkscape:cx="75.420662"
      inkscape:cy="127.07939"
      inkscape:document-units="px"
      inkscape:current-layer="g108374"
      showgrid="true"
      inkscape:window-width="1507"
      inkscape:window-height="1119"
-     inkscape:window-x="921"
-     inkscape:window-y="251"
+     inkscape:window-x="407"
+     inkscape:window-y="59"
      inkscape:window-maximized="0"
      fit-margin-top="0"
      fit-margin-left="0"
@@ -103,13 +103,13 @@
       <path
          sodipodi:nodetypes="ccccc"
          id="path101559"
-         d="m 479.34671,-1507.5186 -55.39678,0 16.66803,-56.6225 c 6.91443,6.0951 14.07395,10.9645 22.21396,13.138 l 16.51479,43.4845 z"
+         d="m 479.34671,-1507.5186 -55.39678,0 16.66803,-56.6225 c 6.91443,6.0951 5.12802,10.1512 20.1808,12.7314 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
          inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="ccc"
          id="path101561"
-         d="m 444.53989,-1659.4921 c 29.57763,26.9631 59.15529,53.9261 88.73292,80.8892 -56.54068,65.6919 -144.45653,0.9803 -88.73292,-80.8892 z"
+         d="m 441.28682,-1648.1064 c 25.10467,45.2616 36.79048,57.1792 90.35945,68.6902 -59.3871,16.8959 -91.59423,5.0467 -90.35945,-68.6902 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
          inkscape:connector-curvature="0" />
       <path