simplyfy calling of CustomMessageDialog

Author: ygerlach

src/Gtk/MainWindow.vala

@@ -450,9 +450,7 @@ class MainWindow : Gtk.Window{
 				var msg = _("Select another device?");
 
 				var type = Gtk.MessageType.ERROR;
-				var buttons_type = Gtk.ButtonsType.YES_NO;
-				
-				var dlg = new CustomMessageDialog(title, msg, type, this, buttons_type);
+				var dlg = new CustomMessageDialog(title, msg, type, this, Gtk.ButtonsType.YES_NO);
 				var response = dlg.run();
 				dlg.destroy();
 

src/Gtk/RestoreWindow.vala

@@ -230,11 +230,8 @@ class RestoreWindow : Gtk.Window{
 				var title = _("Cancel restore?");
 
 				var msg = _("Cancelling the restore process will leave the target system in an inconsistent state. The system may fail to boot or you may run into various issues. After cancelling, you need to restore another snapshot, to bring the system to a consistent state. Click Yes to confirm.");
-				
-				var type = Gtk.MessageType.ERROR;
-				var buttons_type = Gtk.ButtonsType.YES_NO;
-				
-				var dlg = new CustomMessageDialog(title, msg, type, this, buttons_type);
+
+				var dlg = new CustomMessageDialog(title, msg, Gtk.MessageType.ERROR, this, Gtk.ButtonsType.YES_NO);
 				var response = dlg.run();
 				dlg.destroy();
 

src/Utility/GtkHelper.vala

@@ -43,27 +43,11 @@ namespace TeeJee.GtkHelper{
 		gtk_do_events ();
 	}
 
-	public void gtk_messagebox(string title, string message, Gtk.Window? parent_win, bool is_error = false){
+	public static void gtk_messagebox(string title, string message, Gtk.Window? parent_win, bool is_error = false){
 
 		/* Shows a simple message box */
 
-		var type = Gtk.MessageType.INFO;
-		if (is_error){
-			type = Gtk.MessageType.ERROR;
-		}
-		else{
-			type = Gtk.MessageType.INFO;
-		}
-
-		/*var dlg = new Gtk.MessageDialog.with_markup(null, Gtk.DialogFlags.MODAL, type, Gtk.ButtonsType.OK, message);
-		dlg.title = title;
-		dlg.set_default_size (200, -1);
-		if (parent_win != null){
-			dlg.set_transient_for(parent_win);
-			dlg.set_modal(true);
-		}
-		dlg.run();
-		dlg.destroy();*/
+		Gtk.MessageType type = is_error ? Gtk.MessageType.ERROR : Gtk.MessageType.INFO;
 
 		var dlg = new CustomMessageDialog(title,message,type,parent_win, Gtk.ButtonsType.OK);
 		dlg.run();