# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: duchateau.olivier@gmail.com-20140713165635-\
#   poi9nhhkjz32jtl6
# target_branch: http://bazaar.launchpad.net/~dreamdev/eradio/trunk/
# testament_sha1: 68c89dfb4db2658b1b06a61e630c35cd07b49cd9
# timestamp: 2014-07-13 17:12:33 +0000
# message: Switch to the latest api GStreamer and Gee
# base_revision_id: georgesofianosgr@gmail.com-20140706090032-\
#   8bms5qeup20sn4wl
# 
# Begin patch
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-06 09:00:32 +0000
+++ CMakeLists.txt	2014-07-13 16:56:35 +0000
@@ -27,11 +27,11 @@
 find_package(PkgConfig)
 
 set (PROJECT_DEPS
-    gstreamer-0.10
+    gstreamer-1.0
     gtk+-3.0
     granite
     sqlite3
-    gee-1.0
+    gee-0.8
     libnotify
     json-glib-1.0
     libsoup-2.4
@@ -90,4 +90,4 @@
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/48x48/apps/eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/48x48/apps)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/64x64/apps/eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/64x64/apps)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/96x96/apps/eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/96x96/apps)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/128x128/apps/eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/128x128/apps)
\ No newline at end of file
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/128x128/apps/eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/128x128/apps)

=== modified file 'src/stream_player.vala'
--- src/stream_player.vala	2014-07-01 18:00:31 +0000
+++ src/stream_player.vala	2014-07-13 16:56:35 +0000
@@ -58,9 +58,9 @@
 
     public StreamPlayer () {
 
-        pipeline = Gst.ElementFactory.make ("playbin2","play");
+        pipeline = Gst.ElementFactory.make ("playbin","play");
         bus = pipeline.get_bus();
-        bus.add_watch (busCallback);
+        bus.add_watch (GLib.Priority.DEFAULT, busCallback);
     }
 
     public void add (string uri) throws Radio.Error{

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaL0YbUAAjbfgEQQVGf//3/v
3iC////6UATe9tQHL3u969d3RQHCUiJ6jCT1P0KHqbEjaJkGQ0NMjTT0g0NGglTSU96qeGIBQ2k0
0AAAAGgBoaAkkmmkyjR6T1DT1BvVD1PUAHpANAAABDUU0NBoaAA0GgaABoBoMnqACSQRoARp6IVP
aZNUZPSaB5Q0aAep6mhiPCm04NudqN+757WozzSnfY5wlnTKnWVUK5NTFn0XgaCLI47vizydKSQA
MA+nEzWECyZgQZNAJCEhIShHiDV8mrEt+phDr22nWlpSBdkaTz2/XTyS3QimlBxSJLhWnJeTHuv2
6XunPNdmZmeaFBTDbHTRCnZTpBoUeWzMSdpQLlFhI03LmJiiN9ows2G9eHC7AJUKRGKyW2BgeZxi
DREx8fkKLbXBBDpIchdXxCggFKcxwUCb3XVBgIewz7r0WYU8vrq4mNJdXMhG4R7z7Ch5lTmA+2Ig
6B9y/yyk2SRgBnTvnecnBaGhnbBFu+brgYQQRiF1BqYl44w0LYX2FgXYuRkW78QHUXxZnF5v3XFY
Dg+AFBICEDjzRD33Us1UgFqYYTgVIwMuMKmcmP97g0RsvjgAyNNqfu7NCSf2ZAVuDIjwanoETdJn
EbHKrZAGK3l6IIoauSFFLALFYVAXUSDYO3aFCEj7bWLmjeqAypl22wwWzPrc0LCoRy4203NpQSko
lHiEuFTHRCcM6ho0jCZ0vVj7wki0hVzRjacCJwrgVSaorHxqtAtwoT8NN8vStCVDnQcnuBoM9TIh
M2Mqxpq86hjARGkCQ02TjNsyN/Q8S7BAwA8r9I+YW0TgF4nYn9aVQlQMR2UHdhR7J7EJvjL+H1XB
wn2sSVxevNXM9dCKSWLM2+EztF8iU30WHBjWQTKGk0t9axOVKa3Qv9iOCYjGZMrDTlq8aougcwcj
EAzY9q+jbrUtww+XpoBvWfhklZ+SG+O8RwfaILQzwTnlmThpKdGikzENkdJCuEOr7mkzoFx8fIpl
SSWVZB554iNcgjPHR47RLQfLNioqtpJpYBNAHaRmkEGzkloeqRYyuMjRQ3bri5DBCLLwrYou0NKz
GXh6gxo2ExOwe5hnjDWfevVfi1J4NwXLbVGhlQxWE1dqHCxgxDsgelc9+sUHLl3X1xYK6W8gtQ9D
+BqZ+rt5mUqsYvqzBrBYRN012UqdOL6kB1Qfglp1hC0HCYRpKoD0AWgcX9KDpkA6/MPY6nt8/ahu
oiXBTEqxUwNON6Pl2Rb+eM32mqNk8UZ2Hh1oeIpG6AYAcVuDhqjiBKXMSiD0bkoM870MSWuxFEgp
TDdUyyRQTmFrp3iUin3hK6o0VdAy2NW8V0PeohEgTBlmUEBPbP1AO6xCL7EmYGXXe5kYOsCsDJBk
koI9DqCUkVBQ9SgHzBZyjt0DZmwwPVdOXh3nNbdwGNtJY83+IUI22tSyUQZIejfr4zRSlZ2ZqQVY
/B4SfhGCHYxWr4zCMb4WyBsmKyaGM5B6fqCoNGPHF1aIettbVCePuVTnicng8fF7hFzTDqztp21j
viBHwRYi07mcv0ZzKpwXzTWiJ+bIOswq6HsqVarEUI43feHeaKKMcWew4JQGILeS3Z3GPZ/i7kin
ChIUXow2oA==