Merge lp:~evfool/audience/gtk-3.12 into lp:~audience-members/audience/gtk-3.12

[Robert Roth]

Do not use deprecated stock items.

[Corentin Noël (tintou)]

review: Approve

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-06-13 16:12:01 +0000
+++ src/Audience.vala	2014-06-20 13:22:11 +0000
@@ -334,8 +334,8 @@
                     default:
                         var d = new Gtk.Dialog.with_buttons (_("Open location"),
                             this.mainwindow, Gtk.DialogFlags.MODAL,
-                            Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-                            Gtk.Stock.OK,     Gtk.ResponseType.OK);
+                            _("_Cancel"), Gtk.ResponseType.CANCEL,
+                            _("_OK"),     Gtk.ResponseType.OK);
 
                         var grid  = new Gtk.Grid ();
                         var entry = new Gtk.Entry ();
@@ -553,7 +553,7 @@
         public void run_open (int type) { //0=file, 2=dvd
             if (type == 0) {
                 var file = new Gtk.FileChooserDialog (_("Open"), mainwindow, Gtk.FileChooserAction.OPEN,
-                    Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL, Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT);
+                    _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
                 file.select_multiple = true;
 
                 var all_files_filter = new Gtk.FileFilter ();
 
=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2014-05-02 21:27:42 +0000
+++ src/Widgets/VideoPlayer.vala	2014-06-20 13:22:11 +0000
@@ -326,9 +326,9 @@
         }
 
         void show_error (string? message=null) {
-            var dlg  = new Gtk.Dialog.with_buttons (_("Error"), null, Gtk.DialogFlags.MODAL, Gtk.Stock.OK, Gtk.ResponseType.OK);
+            var dlg  = new Gtk.Dialog.with_buttons (_("Error"), null, Gtk.DialogFlags.MODAL, _("_OK"), Gtk.ResponseType.OK);
             var grid = new Gtk.Grid ();
-            var err  = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_ERROR, Gtk.IconSize.DIALOG);
+            var err  = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
             err.margin_right = 12;
             
             var err_label = new Gtk.Label ("");
@@ -351,7 +351,7 @@
             var detail = Gst.PbUtils.missing_plugin_message_get_description (msg);
             var dlg = new Gtk.Dialog.with_buttons ("Missing plugin", null, Gtk.DialogFlags.MODAL);
             var grid = new Gtk.Grid ();
-            var err  = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_ERROR, Gtk.IconSize.DIALOG);
+            var err  = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
             var phrase = new Gtk.Label (_("Some media files need extra software to be played. Audience can install this software automatically."));
 
             err.margin_right = 12;
@@ -411,4 +411,4 @@
             }
         }
     }
-}
 \ No newline at end of file
+}