Merge remote-tracking branch 'origin/master'

README.md

@@ -14,7 +14,7 @@ You'll need the following dependencies:
 * intltool
 * libappstream-dev (>= 0.10)
 * libgee-0.8-dev
-* libgranite-dev
+* libgranite-dev (>=0.5)
 * libgtk-3-dev
 * libjson-glib-dev
 * libpackagekit-glib2-dev

src/Application.vala

@@ -249,12 +249,12 @@ public class AppCenter.App : Granite.Application {
                         break;
                     }
 
-                    string body = format_error_message (error.message);
-
-                    var close_button = new Gtk.Button.with_label (_("Close"));
-
-                    var dialog = new MessageDialog (_("There Was An Error Installing %s.").printf (package.get_name ()), body, "dialog-error");
-                    dialog.add_action_widget (close_button, 0);
+                    var dialog = new Granite.MessageDialog.with_image_from_icon_name (
+                        _("There Was An Error Installing %s.").printf (package.get_name ()),
+                        format_error_message (error.message),
+                        "dialog-error",
+                        Gtk.ButtonsType.CLOSE
+                    );
                     dialog.show_all ();
                     dialog.run ();
                     dialog.destroy ();

src/CMakeLists.txt

@@ -11,7 +11,6 @@ vala_precompile(VALA_C ${EXEC_NAME}
     MainWindow.vala
     Settings.vala
     SuspendControl.vala
-    Dialogs/MessageDialog.vala
     Dialogs/RestartDialog.vala
     Dialogs/StripeDialog.vala
     Views/AppInfoView.vala
@@ -47,7 +46,7 @@ PACKAGES
     appstream
     gtk+-3.0>=3.12
     gee-0.8
-    granite
+    granite>=0.5
     packagekit-glib2
     libsoup-2.4
     json-glib-1.0