Twitter miner: move to miners folder and add data files

16 files changed, 459 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index df0292d16..98792e8a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1707,12 +1707,12 @@ AC_CONFIG_FILES([
 	src/miners/Makefile
 	src/miners/fs/Makefile
 	src/miners/rss/Makefile
+	src/miners/twitter/Makefile
 	src/tracker-status-icon/Makefile
 	src/tracker-status-icon/tracker-status-icon.desktop.in
 	src/tracker-store/Makefile
 	src/tracker-control/Makefile
 	src/tracker-extract/Makefile
-	src/tracker-miner-twitter/Makefile
 	src/tracker-preferences/Makefile
 	src/tracker-preferences/tracker-preferences.desktop.in
 	src/tracker-search-bar/Makefile
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index 64a6f7cd9..f5e2288ec 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -23,6 +23,13 @@ service_in_files =						\
 	org.freedesktop.Tracker1.Miner.Applications.service.in	\
 	org.freedesktop.Tracker1.Miner.Files.service.in		\
 	org.freedesktop.Tracker1.Extract.service.in
+
+if HAVE_MINER_TWITTER
+service_in_files += \
+	org.freedesktop.Tracker1.Miner.Twitter.service.in \
+	org.freedesktop.Tracker1.Miner.Identica.service.in
+endif
+
 service_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Identica.service.in b/data/dbus/org.freedesktop.Tracker1.Miner.Identica.service.in
new file mode 100644
index 000000000..3888f8ff6
--- /dev/null
+++ b/data/dbus/org.freedesktop.Tracker1.Miner.Identica.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Identica
+Exec=@libexecdir@/tracker-miner-twitter
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Twitter.service.in b/data/dbus/org.freedesktop.Tracker1.Miner.Twitter.service.in
new file mode 100644
index 000000000..1e4d0c288
--- /dev/null
+++ b/data/dbus/org.freedesktop.Tracker1.Miner.Twitter.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Twitter
+Exec=@libexecdir@/tracker-miner-twitter
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 558300850..43aa6aef1 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -3,4 +3,14 @@ include $(top_srcdir)/Makefile.decl
 icondir = $(datadir)/icons/hicolor/scalable/apps
 icon_DATA = tracker.svg
 
+minericonsdir = $(datadir)/tracker/icons
+minericons_DATA =
+
+
+if HAVE_MINER_TWITTER
+minericons_DATA += \
+	tracker-miner-twitter.svg \
+	tracker-miner-identica.svg
+endif
+
 EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/scalable/tracker-miner-identica.svg b/data/icons/scalable/tracker-miner-identica.svg
new file mode 100644
index 000000000..1ea84d73b
--- /dev/null
+++ b/data/icons/scalable/tracker-miner-identica.svg
@@ -0,0 +1,207 @@
+<?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: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="48"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="identica48.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\Users\Cube\Documents\My Dropbox\Inkscape-Files\gwibber\identica\identica48.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient6323">
+      <stop
+         id="stop6325"
+         offset="0"
+         style="stop-color:#f24d4d;stop-opacity:1;" />
+      <stop
+         id="stop6327"
+         offset="1"
+         style="stop-color:#d71010;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6301">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6303" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6305" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6293">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6295" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6297" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective5482"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6293"
+       id="linearGradient6299"
+       x1="7.71875"
+       y1="9.15625"
+       x2="39.625"
+       y2="39.28125"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6301"
+       id="linearGradient6307"
+       x1="32.375"
+       y1="32.64571"
+       x2="13.352409"
+       y2="13.270708"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter6311"
+       x="-0.14511066"
+       width="1.2902213"
+       y="-0.69346154"
+       height="2.3869231">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.878125"
+         id="feGaussianBlur6313" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6323"
+       id="linearGradient6321"
+       x1="6.5355339"
+       y1="10.315667"
+       x2="32.985111"
+       y2="33.208248"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="22.607593"
+     inkscape:cy="15.686037"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="974"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Szypulka</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Jakub Szypulka</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Jakub Szypulka</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter6311);enable-background:accumulate"
+       id="path6309"
+       sodipodi:cx="25.15625"
+       sodipodi:cy="40.25"
+       sodipodi:rx="15.53125"
+       sodipodi:ry="3.25"
+       d="M 40.6875,40.25 A 15.53125,3.25 0 1 1 9.625,40.25 A 15.53125,3.25 0 1 1 40.6875,40.25 z"
+       transform="matrix(1.1911468,0,0,1,-4.4647854,-1)" />
+    <image
+       y="-27"
+       x="-135.6156"
+       id="image5484"
+       height="95.495987"
+       width="135.6156"
+       sodipodi:absref="C:\Users\Cube\AppData\Local\Microsoft\Windows\Temporary Internet Files\Content.IE5\YO6M7UNC\identi_ca[1].jpg"
+       xlink:href="C:\Users\Cube\AppData\Local\Microsoft\Windows\Temporary Internet Files\Content.IE5\YO6M7UNC\identi_ca[1].jpg" />
+    <path
+       style="opacity:1;fill:url(#linearGradient6321);fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 20.78125,3.5 C 11.243177,3.5 3.4999999,11.243177 3.5,20.78125 C 3.5,30.319323 11.243177,38.0625 20.78125,38.0625 C 24.161168,38.0625 25.534449,37.246428 28.261407,36.160217 C 29.281361,35.517129 39.901377,40.004721 39.997232,39.934717 C 40.072151,39.804954 35.376765,29.948308 36.04802,28.954836 C 37.192753,26.509341 38.0625,24.357392 38.0625,20.78125 C 38.0625,11.243177 30.319323,3.5 20.78125,3.5 z M 20.78125,10.0625 C 26.699177,10.0625 31.5,14.863323 31.5,20.78125 C 31.5,22.653038 31.019725,24.413071 30.175735,25.944789 C 29.692546,26.821706 31.639819,31.429279 31.538262,31.530836 C 31.473826,31.626522 26.958662,29.593237 26.127784,30.072549 C 24.553921,30.98047 22.72803,31.5 20.78125,31.5 C 14.863323,31.5 10.0625,26.699177 10.0625,20.78125 C 10.0625,14.863323 14.863323,10.0625 20.78125,10.0625 z"
+       id="path5488"
+       sodipodi:nodetypes="csscccsccsscsssc" />
+    <path
+       style="opacity:0.67000002;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6307);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 20.75,9.0625 C 14.308288,9.0625 9.0625,14.308289 9.0625,20.75 C 9.0625,27.191712 14.308288,32.437501 20.75,32.4375 C 22.872419,32.4375 24.849426,31.863229 26.5625,30.875 C 26.373055,30.984286 26.386716,30.932017 26.5,30.9375 C 26.613284,30.942983 26.826157,30.977621 27.0625,31.03125 C 27.535187,31.138509 28.148037,31.318045 28.75,31.53125 C 29.351963,31.744455 29.957792,31.984246 30.40625,32.15625 C 30.630479,32.242252 30.814393,32.289852 30.96875,32.34375 C 31.045928,32.370699 31.099746,32.414607 31.1875,32.4375 C 31.231377,32.448947 31.270986,32.458338 31.375,32.46875 C 31.427007,32.473956 31.490528,32.488759 31.625,32.46875 C 31.692236,32.458746 31.905208,32.375489 31.90625,32.375 C 31.906901,32.374695 32.040946,32.255035 32.15625,32.15625 L 32.1875,32.1875 C 32.187744,32.187256 32.210099,32.112653 32.25,32.0625 C 32.267457,32.040558 32.304922,32.040796 32.3125,32.03125 C 32.315748,32.027159 32.312461,32.000062 32.3125,32 C 32.312834,31.999466 32.387795,31.92048 32.40625,31.875 C 32.44316,31.78404 32.459823,31.712412 32.46875,31.65625 C 32.486603,31.543925 32.47181,31.456494 32.46875,31.40625 C 32.46263,31.305761 32.447708,31.265442 32.4375,31.21875 C 32.417083,31.125366 32.400562,31.050711 32.375,30.96875 C 32.323877,30.804828 32.269404,30.608054 32.1875,30.375 C 32.023693,29.908893 31.796539,29.308319 31.59375,28.6875 C 31.390961,28.066681 31.194371,27.428823 31.09375,26.9375 C 31.04344,26.691839 31.035487,26.499707 31.03125,26.375 C 31.027013,26.250293 31.06177,26.206182 30.96875,26.375 C 31.885462,24.711302 32.4375,22.794179 32.4375,20.75 C 32.4375,14.308288 27.191712,9.0625 20.75,9.0625 z"
+       id="path5497" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.97047156"
+       inkscape:original="M 20.78125 3.5 C 11.243177 3.5 3.4999999 11.243177 3.5 20.78125 C 3.5 30.319323 11.243177 38.0625 20.78125 38.0625 C 24.161168 38.0625 25.523042 37.242461 28.25 36.15625 C 29.269953 35.513162 39.904145 40.007504 40 39.9375 C 40.07492 39.807739 35.391245 29.962222 36.0625 28.96875 C 37.207234 26.523255 38.0625 24.357392 38.0625 20.78125 C 38.0625 11.243177 30.319323 3.5 20.78125 3.5 z "
+       style="opacity:0.67000000000000004;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6299);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6271"
+       d="M 20.78125,4.46875 C 11.768408,4.46875 4.4687499,11.768408 4.46875,20.78125 C 4.46875,29.794092 11.768408,37.09375 20.78125,37.09375 C 23.912297,37.09375 25.107938,36.398249 27.71875,35.34375 C 27.79538,35.312799 27.826987,35.281572 27.90625,35.25 L 27.90625,35.28125 C 28.131894,35.187456 28.361117,35.128081 28.53125,35.125 C 28.753496,35.120975 28.958015,35.151351 29.1875,35.1875 C 29.64647,35.259798 30.18848,35.391287 30.78125,35.5625 C 31.96679,35.904926 33.40258,36.384993 34.8125,36.90625 C 36.082278,37.375696 37.265602,37.834101 38.25,38.21875 C 37.856869,37.318422 37.378634,36.296737 36.90625,35.15625 C 36.362583,33.843665 35.827785,32.487814 35.46875,31.375 C 35.289232,30.818593 35.171091,30.31774 35.09375,29.875 C 35.022872,29.46926 34.876939,29.116844 35.1875,28.5625 C 35.208417,28.517815 35.229327,28.481873 35.25,28.4375 C 36.346303,26.08442 37.09375,24.139336 37.09375,20.78125 C 37.09375,11.768408 29.794092,4.46875 20.78125,4.46875 z" />
+  </g>
+</svg>
diff --git a/data/icons/scalable/tracker-miner-twitter.svg b/data/icons/scalable/tracker-miner-twitter.svg
new file mode 100644
index 000000000..d94d8b5e7
--- /dev/null
+++ b/data/icons/scalable/tracker-miner-twitter.svg
@@ -0,0 +1,185 @@
+<?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: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="48"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="twitter48.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\Users\Cube\Documents\My Dropbox\Inkscape-Files\twitter\twitter48.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient6340">
+      <stop
+         id="stop6342"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6344"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6316">
+      <stop
+         style="stop-color:#60daf1;stop-opacity:1;"
+         offset="0"
+         id="stop6318" />
+      <stop
+         style="stop-color:#d4f5fc;stop-opacity:1;"
+         offset="1"
+         id="stop6320" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6310">
+      <stop
+         id="stop6312"
+         offset="0"
+         style="stop-color:#85e2f4;stop-opacity:1;" />
+      <stop
+         id="stop6314"
+         offset="1"
+         style="stop-color:#85e2f4;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective5482"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter6298"
+       x="-0.14343195"
+       width="1.2868639"
+       y="-0.73454544"
+       height="2.4690909">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.7854446"
+         id="feGaussianBlur6300" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6316"
+       id="linearGradient6308"
+       x1="24.501379"
+       y1="44.006981"
+       x2="24.167694"
+       y2="3.029938"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6340"
+       id="linearGradient6338"
+       x1="9"
+       y1="14.2743"
+       x2="38.111732"
+       y2="14.2743"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="8.5722795"
+     inkscape:cy="35.655166"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="974"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Szypulka</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Jakub Szypulka</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Jakub Szypulka</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter6298);enable-background:accumulate"
+       id="path6296"
+       sodipodi:cx="25.19068"
+       sodipodi:cy="42.343147"
+       sodipodi:rx="14.937631"
+       sodipodi:ry="2.9168155"
+       d="M 40.12831,42.343147 A 14.937631,2.9168155 0 1 1 10.253049,42.343147 A 14.937631,2.9168155 0 1 1 40.12831,42.343147 z"
+       transform="matrix(1.0376478,0,0,1,-0.6390537,0)" />
+    <path
+       style="opacity:1;fill:url(#linearGradient6308);fill-opacity:1.0;fill-rule:evenodd;stroke:#0083a0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 20.530032,12.532143 C 26.126151,12.532143 29.378032,12.49547 32.007636,12.49547 C 36.985014,12.49547 37.533547,13.998714 37.533547,17.001461 C 37.533547,19.988627 36.995895,21.487699 31.98487,21.487699 C 29.379794,21.487699 26.160718,21.516721 20.499026,21.516721 C 20.499026,28.904686 19.965534,31.508117 25,31.508117 C 28.410752,31.508117 29.155369,31.49526 32.994533,31.49526 C 36.833697,31.49526 39.501461,32.72635 39.501461,37.0625 C 39.501461,41.398481 38.330683,43.50393 32.996958,43.50393 C 30.440351,43.50393 27.753233,43.506981 23,43.506981 C 10.395685,43.506981 9.5012987,37.479794 9.5012987,21.125 L 9.5012987,9.2187499 C 9.5012987,1.6637703 20.530032,1.6036238 20.530032,9.2187499 L 20.530032,12.532143 z"
+       id="path5488"
+       sodipodi:nodetypes="cszscszzssczcc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.97676325"
+       inkscape:original="M 15.03125 3.53125 C 12.274067 3.5387683 9.4999999 5.4412601 9.5 9.21875 L 9.5 21.125 C 9.5 37.479794 10.395685 43.5 23 43.5 C 27.753233 43.5 30.443391 43.500001 33 43.5 C 38.333725 43.5 39.5 41.398481 39.5 37.0625 C 39.5 32.72635 36.839163 31.5 33 31.5 C 29.160836 31.5 28.410752 31.499999 25 31.5 C 19.965534 31.5 20.500001 28.919214 20.5 21.53125 C 26.161692 21.53125 29.394923 21.499999 32 21.5 C 37.011025 21.5 37.531251 19.987166 37.53125 17 C 37.53125 13.997253 36.977377 12.5 32 12.5 C 29.370396 12.5 26.12737 12.53125 20.53125 12.53125 L 20.53125 9.21875 C 20.53125 5.411187 17.788433 3.5237317 15.03125 3.53125 z "
+       style="opacity:0.67000002;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00152731px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6294"
+       d="M 15.03125,4.5 C 13.876422,4.503149 12.714802,4.9200287 11.875,5.6875 C 11.035198,6.4549713 10.46875,7.5691062 10.46875,9.21875 L 10.46875,21.125 C 10.46875,29.284566 10.779168,34.790613 12.40625,38 C 13.219791,39.604694 14.298161,40.668402 15.96875,41.40625 C 17.639339,42.144098 19.926677,42.53125 23,42.53125 C 27.753233,42.53125 30.443392,42.531251 33,42.53125 C 35.538579,42.53125 36.833231,42.027483 37.53125,41.25 C 38.229269,40.472517 38.53125,39.142915 38.53125,37.0625 C 38.53125,35.094219 37.974123,34.089921 37.09375,33.4375 C 36.213377,32.785079 34.815578,32.46875 33,32.46875 C 29.160836,32.46875 28.410752,32.468749 25,32.46875 C 23.657932,32.46875 22.600494,32.322757 21.71875,31.84375 C 20.837006,31.364743 20.237721,30.543844 19.9375,29.59375 C 19.337059,27.693562 19.53125,25.201678 19.53125,21.53125 C 19.535659,20.998061 19.966811,20.566909 20.5,20.5625 C 26.158098,20.5625 29.387111,20.531249 32,20.53125 C 34.407217,20.53125 35.518302,20.135072 35.96875,19.6875 C 36.419198,19.239928 36.5625,18.436881 36.5625,17 C 36.5625,15.558683 36.392387,14.760819 35.9375,14.3125 C 35.482613,13.864181 34.390748,13.46875 32,13.46875 C 29.378135,13.46875 26.131006,13.5 20.53125,13.5 C 19.998061,13.495591 19.566909,13.064439 19.5625,12.53125 L 19.5625,9.21875 C 19.5625,7.549509 18.986388,6.4191275 18.15625,5.65625 C 17.326112,4.8933725 16.186077,4.496851 15.03125,4.5 z"
+       transform="matrix(0.9977728,0,0,0.9991778,5.4565513e-2,3.7184986e-3)" />
+  </g>
+</svg>
diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am
index e76837538..570d2e9a6 100644
--- a/data/miners/Makefile.am
+++ b/data/miners/Makefile.am
@@ -5,6 +5,12 @@ desktop_in_files = \
 	tracker-miner-files.desktop.in		\
 	tracker-miner-rss.desktop.in
 
+if HAVE_MINER_TWITTER
+desktop_in_files += \
+	tracker-miner-twitter.desktop.in.in \
+	tracker-miner-identica.desktop.in.in
+endif
+
 tracker_minersdir = $(datadir)/tracker/miners
 
 tracker_miners_DATA = \
@@ -15,7 +21,16 @@ if USING_MINER_RSS
 tracker_miners_DATA += 	tracker-miner-rss.desktop
 endif
 
+if HAVE_MINER_TWITTER
+tracker_miners_DATA += \
+	tracker-miner-twitter.desktop \
+	tracker-miner-identica.desktop
+endif
+
 @INTLTOOL_DESKTOP_RULE@
 
+%.desktop.in: %.desktop.in.in
+	@sed -e "s|@datadir[@]|$(datadir)|" $< > $@
+
 EXTRA_DIST = $(desktop_in_files)
 CLEANFILES = $(tracker_miners_DATA)
diff --git a/data/miners/tracker-miner-flickr.desktop.in.in b/data/miners/tracker-miner-flickr.desktop.in.in
new file mode 100644
index 000000000..a9f1ae9ab
--- /dev/null
+++ b/data/miners/tracker-miner-flickr.desktop.in.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Flickr
+_Comment=Index your Flickr photo albums
+Icon=@datadir@/tracker/icons/tracker-miner-flickr.svg
+DBusName=org.freedesktop.Tracker1.Miner.Flickr
+DBusPath=/org/freedesktop/Tracker1/Miner/Flickr
+AuthenticationMethod=Token
diff --git a/data/miners/tracker-miner-identica.desktop.in.in b/data/miners/tracker-miner-identica.desktop.in.in
new file mode 100644
index 000000000..5f0a37e71
--- /dev/null
+++ b/data/miners/tracker-miner-identica.desktop.in.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Identi.ca
+_Comment=Index your Identi.ca messages
+Icon=@datadir@/tracker/icons/tracker-miner-identica.svg
+DBusName=org.freedesktop.Tracker1.Miner.Identica
+DBusPath=/org/freedesktop/Tracker1/Miner/Identica
+AuthenticationMethod=Token
diff --git a/data/miners/tracker-miner-twitter.desktop.in.in b/data/miners/tracker-miner-twitter.desktop.in.in
new file mode 100644
index 000000000..2ba124a39
--- /dev/null
+++ b/data/miners/tracker-miner-twitter.desktop.in.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Twitter
+_Comment=Index your tweets
+Icon=@datadir@/tracker/icons/tracker-miner-twitter.svg
+DBusName=org.freedesktop.Tracker1.Miner.Twitter
+DBusPath=/org/freedesktop/Tracker1/Miner/Twitter
+AuthenticationMethod=Token
diff --git a/src/Makefile.am b/src/Makefile.am
index d0ed2ce82..cc018d0cd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,3 @@ endif
 if HAVE_TRACKER_EXPLORER
 SUBDIRS += tracker-explorer
 endif
-
-if HAVE_MINER_TWITTER
-SUBDIRS += tracker-miner-twitter
-endif
diff --git a/src/miners/Makefile.am b/src/miners/Makefile.am
index f6373b6e7..03f7f9a43 100644
--- a/src/miners/Makefile.am
+++ b/src/miners/Makefile.am
@@ -5,3 +5,7 @@ SUBDIRS = fs
 if USING_MINER_RSS
 SUBDIRS += rss
 endif
+
+if HAVE_MINER_TWITTER
+SUBDIRS += twitter
+endif
diff --git a/src/tracker-miner-twitter/Makefile.am b/src/miners/twitter/Makefile.am
index 543fd76f4..543fd76f4 100644
--- a/src/tracker-miner-twitter/Makefile.am
+++ b/src/miners/twitter/Makefile.am
diff --git a/src/tracker-miner-twitter/query-queue.vala b/src/miners/twitter/query-queue.vala
index ea3ac7393..ea3ac7393 100644
--- a/src/tracker-miner-twitter/query-queue.vala
+++ b/src/miners/twitter/query-queue.vala
diff --git a/src/tracker-miner-twitter/tracker-miner-twitter.vala b/src/miners/twitter/tracker-miner-twitter.vala
index b919af83b..b919af83b 100644
--- a/src/tracker-miner-twitter/tracker-miner-twitter.vala
+++ b/src/miners/twitter/tracker-miner-twitter.vala