* Upstream merge

  * Removing status support
  * Merging the users service and the session service

45 files changed, 7 insertions, 594 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 9ba0d97..70ea880 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,7 @@
 SUBDIRS = icons
 
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files =  indicator-status.service.in \
-                    indicator-users.service.in \
+service_in_files =  indicator-users.service.in \
                     indicator-session.service.in
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 4810a68..0224d45 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1 +1 @@
-SUBDIRS = status actions
+SUBDIRS = actions
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
deleted file mode 100644
index fa874bf..0000000
--- a/data/icons/16x16/status/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
-
-icons_DATA =  \
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/16x16/status/user-available.png b/data/icons/16x16/status/user-available.png
deleted file mode 100644
index 5435e02..0000000
--- a/data/icons/16x16/status/user-available.png
+++ /dev/null
diff --git a/data/icons/16x16/status/user-away.png b/data/icons/16x16/status/user-away.png
deleted file mode 100644
index 7576a61..0000000
--- a/data/icons/16x16/status/user-away.png
+++ /dev/null
diff --git a/data/icons/16x16/status/user-busy.png b/data/icons/16x16/status/user-busy.png
deleted file mode 100644
index 90eab60..0000000
--- a/data/icons/16x16/status/user-busy.png
+++ /dev/null
diff --git a/data/icons/16x16/status/user-invisible.png b/data/icons/16x16/status/user-invisible.png
deleted file mode 100755
index ba094d3..0000000
--- a/data/icons/16x16/status/user-invisible.png
+++ /dev/null
diff --git a/data/icons/16x16/status/user-offline.png b/data/icons/16x16/status/user-offline.png
deleted file mode 100644
index 637be12..0000000
--- a/data/icons/16x16/status/user-offline.png
+++ /dev/null
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 4810a68..0224d45 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1 +1 @@
-SUBDIRS = status actions
+SUBDIRS = actions
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
deleted file mode 100644
index 0171b82..0000000
--- a/data/icons/22x22/status/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
-
-icons_DATA =  \
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/22x22/status/user-available.png b/data/icons/22x22/status/user-available.png
deleted file mode 100644
index ec8c452..0000000
--- a/data/icons/22x22/status/user-available.png
+++ /dev/null
diff --git a/data/icons/22x22/status/user-away.png b/data/icons/22x22/status/user-away.png
deleted file mode 100644
index 6c068f2..0000000
--- a/data/icons/22x22/status/user-away.png
+++ /dev/null
diff --git a/data/icons/22x22/status/user-busy.png b/data/icons/22x22/status/user-busy.png
deleted file mode 100644
index 0fe61fd..0000000
--- a/data/icons/22x22/status/user-busy.png
+++ /dev/null
diff --git a/data/icons/22x22/status/user-invisible.png b/data/icons/22x22/status/user-invisible.png
deleted file mode 100755
index af3393b..0000000
--- a/data/icons/22x22/status/user-invisible.png
+++ /dev/null
diff --git a/data/icons/22x22/status/user-offline.png b/data/icons/22x22/status/user-offline.png
deleted file mode 100644
index fe5de82..0000000
--- a/data/icons/22x22/status/user-offline.png
+++ /dev/null
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 4810a68..0224d45 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1 +1 @@
-SUBDIRS = status actions
+SUBDIRS = actions
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
deleted file mode 100644
index f92e8f1..0000000
--- a/data/icons/24x24/status/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
-
-icons_DATA =  \
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/24x24/status/user-available.png b/data/icons/24x24/status/user-available.png
deleted file mode 100644
index 95f2534..0000000
--- a/data/icons/24x24/status/user-available.png
+++ /dev/null
diff --git a/data/icons/24x24/status/user-away.png b/data/icons/24x24/status/user-away.png
deleted file mode 100644
index 3a7e01f..0000000
--- a/data/icons/24x24/status/user-away.png
+++ /dev/null
diff --git a/data/icons/24x24/status/user-busy.png b/data/icons/24x24/status/user-busy.png
deleted file mode 100644
index 7e5dced..0000000
--- a/data/icons/24x24/status/user-busy.png
+++ /dev/null
diff --git a/data/icons/24x24/status/user-invisible.png b/data/icons/24x24/status/user-invisible.png
deleted file mode 100755
index cb5bc94..0000000
--- a/data/icons/24x24/status/user-invisible.png
+++ /dev/null
diff --git a/data/icons/24x24/status/user-offline.png b/data/icons/24x24/status/user-offline.png
deleted file mode 100644
index bdfc885..0000000
--- a/data/icons/24x24/status/user-offline.png
+++ /dev/null
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 4810a68..0224d45 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -1 +1 @@
-SUBDIRS = status actions
+SUBDIRS = actions
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
deleted file mode 100644
index 92f55f4..0000000
--- a/data/icons/32x32/status/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
-
-icons_DATA =  \
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/32x32/status/user-available.png b/data/icons/32x32/status/user-available.png
deleted file mode 100644
index 5d04e0a..0000000
--- a/data/icons/32x32/status/user-available.png
+++ /dev/null
diff --git a/data/icons/32x32/status/user-away.png b/data/icons/32x32/status/user-away.png
deleted file mode 100644
index 712f68a..0000000
--- a/data/icons/32x32/status/user-away.png
+++ /dev/null
diff --git a/data/icons/32x32/status/user-busy.png b/data/icons/32x32/status/user-busy.png
deleted file mode 100644
index be1280e..0000000
--- a/data/icons/32x32/status/user-busy.png
+++ /dev/null
diff --git a/data/icons/32x32/status/user-invisible.png b/data/icons/32x32/status/user-invisible.png
deleted file mode 100755
index 39633fc..0000000
--- a/data/icons/32x32/status/user-invisible.png
+++ /dev/null
diff --git a/data/icons/32x32/status/user-offline.png b/data/icons/32x32/status/user-offline.png
deleted file mode 100644
index 3c4d664..0000000
--- a/data/icons/32x32/status/user-offline.png
+++ /dev/null
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
deleted file mode 100644
index d52da2b..0000000
--- a/data/icons/48x48/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = status
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
deleted file mode 100644
index a0f2d82..0000000
--- a/data/icons/48x48/status/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
-
-icons_DATA =  \
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/48x48/status/user-available.png b/data/icons/48x48/status/user-available.png
deleted file mode 100644
index 5bcae55..0000000
--- a/data/icons/48x48/status/user-available.png
+++ /dev/null
diff --git a/data/icons/48x48/status/user-away.png b/data/icons/48x48/status/user-away.png
deleted file mode 100644
index f9d7aee..0000000
--- a/data/icons/48x48/status/user-away.png
+++ /dev/null
diff --git a/data/icons/48x48/status/user-busy.png b/data/icons/48x48/status/user-busy.png
deleted file mode 100644
index b6c60c9..0000000
--- a/data/icons/48x48/status/user-busy.png
+++ /dev/null
diff --git a/data/icons/48x48/status/user-invisible.png b/data/icons/48x48/status/user-invisible.png
deleted file mode 100755
index 9a49d17..0000000
--- a/data/icons/48x48/status/user-invisible.png
+++ /dev/null
diff --git a/data/icons/48x48/status/user-offline.png b/data/icons/48x48/status/user-offline.png
deleted file mode 100644
index b65080b..0000000
--- a/data/icons/48x48/status/user-offline.png
+++ /dev/null
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 7c42753..7394c73 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48
+SUBDIRS = scalable 16x16 22x22 24x24 32x32
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(INDICATORICONSDIR)/hicolor
 
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 4810a68..0224d45 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -1 +1 @@
-SUBDIRS = status actions
+SUBDIRS = actions
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
deleted file mode 100644
index 479ef2c..0000000
--- a/data/icons/scalable/status/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
-
-icons_DATA =  \
-	user-available.svg			\
-	user-offline.svg		\
-	user-away.svg			\
-	user-busy.svg			\
-	user-invisible.svg
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/scalable/status/user-available.svg b/data/icons/scalable/status/user-available.svg
deleted file mode 100644
index 8d4cc58..0000000
--- a/data/icons/scalable/status/user-available.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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://web.resource.org/cc/"
-   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="16px"
-   height="16px"
-   id="svg4908"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/andreas/project/gossip/16x16"
-   sodipodi:docname="status-avaible.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-avaible.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs4910">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5899">
-      <stop
-         style="stop-color:#7fe719;stop-opacity:1"
-         offset="0"
-         id="stop5901" />
-      <stop
-         style="stop-color:#67bc13;stop-opacity:1"
-         offset="1"
-         id="stop5903" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5899"
-       id="radialGradient5905"
-       cx="9.466115"
-       cy="8.9839392"
-       fx="9.466115"
-       fy="8.9839392"
-       r="6.7474474"
-       gradientTransform="matrix(1.1671849,-3.2679277e-3,2.7524467e-3,1.0150183,-1.6222549,-0.2024225)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="14.452639"
-     inkscape:cy="6.4458104"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1674"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata4913">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient5905);fill-opacity:1;stroke:#376e01;stroke-width:0.97113216;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4926"
-       sodipodi:cx="7.9737625"
-       sodipodi:cy="7.7221532"
-       sodipodi:rx="6.2618814"
-       sodipodi:ry="6.3632426"
-       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
-       transform="matrix(1.0380267,0,0,1.0214918,-0.2769783,0.1118841)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.14770162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path5897"
-       sodipodi:cx="7.9737625"
-       sodipodi:cy="7.7221532"
-       sodipodi:rx="6.2618814"
-       sodipodi:ry="6.3632426"
-       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
-       transform="matrix(0.8783303,0,0,0.8643392,0.996403,1.3254404)" />
-  </g>
-</svg>
diff --git a/data/icons/scalable/status/user-away.svg b/data/icons/scalable/status/user-away.svg
deleted file mode 100644
index 7e7b0ed..0000000
--- a/data/icons/scalable/status/user-away.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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://web.resource.org/cc/"
-   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="16px"
-   height="16px"
-   id="svg4908"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/andreas/project/gossip/16x16"
-   sodipodi:docname="status-away.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-away.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs4910">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5917">
-      <stop
-         style="stop-color:#f80000;stop-opacity:1"
-         offset="0"
-         id="stop5919" />
-      <stop
-         style="stop-color:#e70000;stop-opacity:1"
-         offset="1"
-         id="stop5921" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5917"
-       id="linearGradient5923"
-       x1="6.5096536"
-       y1="8.5893564"
-       x2="9.9108915"
-       y2="11.540099"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9925682,6.043956e-8,1.1147803e-2)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="13.206814"
-     inkscape:cy="4.0564985"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1674"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata4913">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:url(#linearGradient5923);fill-opacity:1;fill-rule:evenodd;stroke:#8a0000;stroke-width:0.99999988px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 1.5,13.5 L 14.499999,13.5 L 7.9789933,1.4999999 L 1.5,13.5 z "
-       id="path4944"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 3.2186016,12.488535 L 12.832121,12.488535 L 8.0098272,3.5671249 L 3.2186016,12.488535 z "
-       id="path4946"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
diff --git a/data/icons/scalable/status/user-busy.svg b/data/icons/scalable/status/user-busy.svg
deleted file mode 100644
index 66fc709..0000000
--- a/data/icons/scalable/status/user-busy.svg
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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://web.resource.org/cc/"
-   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="16px"
-   height="16px"
-   id="svg6941"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/andreas/project/gossip/16x16"
-   sodipodi:docname="status-busy.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-busy.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs6943">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5899">
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1"
-         offset="0"
-         id="stop5901" />
-      <stop
-         style="stop-color:#edd400;stop-opacity:1"
-         offset="1"
-         id="stop5903" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5899"
-       id="radialGradient5905"
-       cx="9.466115"
-       cy="8.9839392"
-       fx="9.466115"
-       fy="8.9839392"
-       r="6.7474474"
-       gradientTransform="matrix(1.1671849,-3.2679277e-3,2.7524467e-3,1.0150183,-1.6222549,-0.2024225)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.696217"
-     inkscape:cx="17.665904"
-     inkscape:cy="9.7718474"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1674"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata6946">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient5905);fill-opacity:1;stroke:#8d7300;stroke-width:0.97113222;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4926"
-       sodipodi:cx="7.9737625"
-       sodipodi:cy="7.7221532"
-       sodipodi:rx="6.2618814"
-       sodipodi:ry="6.3632426"
-       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
-       transform="matrix(1.0380267,0,0,1.0214918,-0.2769782,0.1118841)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.6;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.14770162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path5897"
-       sodipodi:cx="7.9737625"
-       sodipodi:cy="7.7221532"
-       sodipodi:rx="6.2618814"
-       sodipodi:ry="6.3632426"
-       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
-       transform="matrix(0.8783303,0,0,0.8643392,0.996403,1.3254404)" />
-    <rect
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5886"
-       width="9.000001"
-       height="9"
-       x="5.5"
-       y="5.5"
-       rx="0"
-       ry="0" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5969"
-       width="7"
-       height="7"
-       x="6.5"
-       y="6.5"
-       rx="0"
-       ry="0" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#8d7300;fill-opacity:1;stroke:none;stroke-width:1.46393549;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path5888"
-       sodipodi:cx="10.676733"
-       sodipodi:cy="7.8460393"
-       sodipodi:rx="1.4415842"
-       sodipodi:ry="1.4866337"
-       d="M 12.118317 7.8460393 A 1.4415842 1.4866337 0 1 1  9.2351488,7.8460393 A 1.4415842 1.4866337 0 1 1  12.118317 7.8460393 z"
-       transform="matrix(0.6936814,0,0,0.6726606,2.5937487,2.7222784)" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 7.4772272,10.5 L 11.522773,10.5"
-       id="path5883" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 7.4872926,12.5 L 11.524094,12.5"
-       id="path5885" />
-  </g>
-</svg>
diff --git a/data/icons/scalable/status/user-invisible.svg b/data/icons/scalable/status/user-invisible.svg
deleted file mode 100644
index 1775d92..0000000
--- a/data/icons/scalable/status/user-invisible.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg4908"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/andreas/project/gossip/16x16"
-   sodipodi:docname="user-invisible.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/Users/kwwii/Desktop/user-invisible.png"
-   inkscape:export-xdpi="270"
-   inkscape:export-ydpi="270"
-   sodipodi:modified="true">
-  <defs
-     id="defs4910" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#efebe7"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="49.332695"
-     inkscape:cx="8.0156251"
-     inkscape:cy="8.0034278"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1343"
-     inkscape:window-height="894"
-     inkscape:window-x="18"
-     inkscape:window-y="36"
-     gridtolerance="10000">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2386"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4913">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 8,2 L 2,7 L 4,14 L 12,14 L 14,7 L 8,2 z M 8.03125,3.28125 L 12.875,7.34375 L 11.28125,13 L 4.75,13 L 3.15625,7.34375 L 8.03125,3.28125 z"
-       id="path3169" />
-    <path
-       style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:1, 24;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 7.90625 1 C 7.7115832 1.0193883 7.5268771 1.0954437 7.375 1.21875 L 1.375 6.21875 C 1.0663414 6.4776493 0.94315913 6.8964687 1.0625 7.28125 L 3.0625 14.28125 C 3.1850026 14.699518 3.5642702 14.99029 4 15 L 12 15 C 12.447322 15.004039 12.842922 14.710529 12.96875 14.28125 L 14.96875 7.28125 C 15.088091 6.8964689 14.964909 6.4776491 14.65625 6.21875 L 8.65625 1.21875 C 8.4462475 1.047164 8.1755683 0.96821579 7.90625 1 z M 8 2 L 14 7 L 12 14 L 4 14 L 2 7 L 8 2 z "
-       id="path2388" />
-    <path
-       style="opacity:0.38251367;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 8,2 L 14,7 L 12,14 L 4,14 L 2,7 L 8,2 z"
-       id="path3182" />
-  </g>
-</svg>
diff --git a/data/icons/scalable/status/user-offline.svg b/data/icons/scalable/status/user-offline.svg
deleted file mode 100644
index 975f7dc..0000000
--- a/data/icons/scalable/status/user-offline.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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://web.resource.org/cc/"
-   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="16px"
-   height="16px"
-   id="svg6941"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/andreas/project/gossip/16x16"
-   sodipodi:docname="status-offline.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-offline.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs6943">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7922">
-      <stop
-         style="stop-color:#e8e8e6;stop-opacity:1"
-         offset="0"
-         id="stop7924" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1"
-         id="stop7926" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7922"
-       id="linearGradient7928"
-       x1="0.67574239"
-       y1="0.81831664"
-       x2="9.8658419"
-       y2="10.594059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8666667,0,0,0.8666667,1.0666667,1.0666666)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="15.038145"
-     inkscape:cy="7.8865336"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1674"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata6946">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="opacity:1;fill:url(#linearGradient7928);fill-opacity:1;stroke:#555753;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect6949"
-       width="13"
-       height="13"
-       x="1.5"
-       y="1.4999999"
-       rx="1.4641089"
-       ry="1.4641089" />
-    <rect
-       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect7920"
-       width="11"
-       height="11"
-       x="2.5"
-       y="2.5"
-       rx="0.45049509"
-       ry="0.45049506" />
-  </g>
-</svg>
diff --git a/data/indicator-status.service.in b/data/indicator-status.service.in
deleted file mode 100644
index e920bf2..0000000
--- a/data/indicator-status.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.ayatana.indicator.status
-Exec=@libexecdir@/indicator-status-service