Update dependencies and fix build

src/ui/entry.rs

@@ -4,9 +4,9 @@
 use app_state::*;
 use audio::frontend::*;
 use gtk::DialogExt;
+use gtk::GtkWindowExt;
 use gtk::MessageDialogExt;
 use gtk::WidgetExt;
-use gtk::WindowExt;
 use gtk;
 use gtk_sys::GTK_RESPONSE_YES;
 use prefs::*;
@@ -115,7 +115,7 @@ fn run_audio_error_dialog(parent: &gtk::Window) -> i32 {
 
     let dialog = gtk::MessageDialog::new(
         Some(parent),
-        gtk::DIALOG_DESTROY_WITH_PARENT,
+        gtk::DialogFlags::DESTROY_WITH_PARENT,
         gtk::MessageType::Error,
         gtk::ButtonsType::YesNo,
         "Warning: Connection to sound system failed.",

src/ui/hotkey_dialog.rs

@@ -10,7 +10,6 @@ use gdk_sys;
 use glib::translate::*;
 use gtk::prelude::*;
 use gtk;
-use gtk_sys;
 use libc::c_uint;
 use std;
 
@@ -87,7 +86,7 @@ impl HotkeyDialog {
 
 
         hotkey_dialog.connect_key_release_event(move |w, _| {
-            w.response(gtk_sys::GtkResponseType::Ok as i32);
+            w.response(gtk::ResponseType::Ok.into());
             return Inhibit(false);
         });
 
@@ -112,7 +111,7 @@ impl HotkeyDialog {
             &window,
             gdk::GrabOwnership::Application,
             true,
-            gdk::KEY_PRESS_MASK,
+            gdk::EventMask::KEY_PRESS_MASK,
             None,
             gdk_sys::GDK_CURRENT_TIME as u32,
         );

src/ui/popup_window.rs

@@ -8,9 +8,10 @@ use app_state::*;
 use audio::frontend::*;
 use errors::*;
 use gdk::DeviceExt;
-use gdk::{GrabOwnership, GrabStatus, BUTTON_PRESS_MASK, KEY_PRESS_MASK};
+use gdk::{GrabOwnership, GrabStatus};
 use gdk;
 use gdk_sys::{GDK_KEY_Escape, GDK_CURRENT_TIME};
+use glib::translate::*;
 use glib;
 use gtk::ToggleButtonExt;
 use gtk::prelude::*;
@@ -81,7 +82,8 @@ impl PopupWindow {
     {
         let m_muted = audio.get_mute();
 
-        glib::signal_handler_block(&self.mute_check, self.toggle_signal.get());
+        glib::signal_handler_block(&self.mute_check,
+                                   &from_glib(self.toggle_signal.get()));
 
         match m_muted {
             Ok(val) => {
@@ -101,7 +103,7 @@ impl PopupWindow {
 
         glib::signal_handler_unblock(
             &self.mute_check,
-            self.toggle_signal.get(),
+            &from_glib(self.toggle_signal.get()),
         );
     }
 
@@ -159,7 +161,7 @@ where
         let toggle_signal = mute_check.connect_toggled(move |_| {
             on_mute_check_toggled(&_appstate)
         });
-        appstate.gui.popup_window.toggle_signal.set(toggle_signal);
+        appstate.gui.popup_window.toggle_signal.set(toggle_signal.to_glib());
     }
 
     /* popup_window.connect_show */
@@ -177,7 +179,7 @@ where
             on_vol_scale_value_changed(&_appstate)
         });
 
-        appstate.gui.popup_window.changed_signal.set(changed_signal);
+        appstate.gui.popup_window.changed_signal.set(changed_signal.to_glib());
     }
 
     /* popup_window.connect_event */
@@ -212,12 +214,12 @@ where
     );
     glib::signal_handler_block(
         &popup_window.vol_scale_adj,
-        popup_window.changed_signal.get(),
+        &from_glib(popup_window.changed_signal.get()),
     );
     try_w!(appstate.gui.popup_window.update(appstate.audio.as_ref()));
     glib::signal_handler_unblock(
         &popup_window.vol_scale_adj,
-        popup_window.changed_signal.get(),
+        &from_glib(popup_window.changed_signal.get()),
     );
     popup_window.vol_scale.grab_focus();
     try_w!(grab_devices(&appstate.gui.popup_window.popup_window));
@@ -302,7 +304,7 @@ fn grab_devices(window: &gtk::Window) -> Result<()> {
         &gdk_window,
         GrabOwnership::None,
         true,
-        BUTTON_PRESS_MASK,
+        gdk::EventMask::BUTTON_PRESS_MASK,
         None,
         GDK_CURRENT_TIME as u32,
     );
@@ -323,7 +325,7 @@ fn grab_devices(window: &gtk::Window) -> Result<()> {
         &gdk_window,
         GrabOwnership::None,
         true,
-        KEY_PRESS_MASK,
+        gdk::EventMask::KEY_PRESS_MASK,
         None,
         GDK_CURRENT_TIME as u32,
     );

src/ui/prefs_dialog.rs

@@ -10,7 +10,6 @@ use gtk::ResponseType;
 use gtk::prelude::*;
 use gtk;
 use prefs::*;
-use std::ascii::AsciiExt;
 use std::cell::RefCell;
 use std::rc::Rc;
 use support::audio::*;