Merge pull request #1548 from FreeRDP/secplugin_28

Missing secret plugin handling

Author: giox069

remmina/src/remmina_file.c

@@ -239,7 +239,7 @@ remmina_file_load(const gchar *filename)
 		}
 
 		secret_plugin = remmina_plugin_manager_get_secret_plugin();
-		secret_service_available = secret_plugin->is_service_available();
+		secret_service_available = secret_plugin && secret_plugin->is_service_available();
 
 		remminafile->filename = g_strdup(filename);
 		keys = g_key_file_get_keys(gkeyfile, "remmina", NULL, NULL);
@@ -433,7 +433,7 @@ void remmina_file_save(RemminaFile *remminafile)
 	}
 
 	secret_plugin = remmina_plugin_manager_get_secret_plugin();
-	secret_service_available = secret_plugin->is_service_available();
+	secret_service_available = secret_plugin && secret_plugin->is_service_available();
 
 	g_hash_table_iter_init(&iter, remminafile->settings);
 	while (g_hash_table_iter_next(&iter, (gpointer*)&key, (gpointer*)&value)) {

remmina/src/remmina_mpchange.c

@@ -313,15 +313,30 @@ static gboolean remmina_file_multipasswd_changer_mt(gpointer d)
 	GtkDialog* dialog;
 	GtkWindow* mainwindow;
 	GtkCellRendererToggle *toggle;
+	RemminaSecretPlugin *secret_plugin;
+	char *initerror;
 
+	mainwindow = remmina_main_get_window();
 
 	/* The multiple passowrd changer works only when a secret plugin is available */
-	if (remmina_plugin_manager_get_secret_plugin() == NULL) {
-		remmina_log_printf("The multi password changer does not work without a secret plugin\n");
+	initerror = NULL;
+	secret_plugin = remmina_plugin_manager_get_secret_plugin();
+	if (secret_plugin == NULL) {
+		initerror = _("The multi password changer cannot work without a secret plugin.\n");
+	}else {
+		if (!secret_plugin->is_service_available()) {
+			initerror = _("The multi password changer does not work without a secret service.\n");
+		}
+	}
+	if (initerror) {
+		GtkWidget *msgDialog;
+		msgDialog = gtk_message_dialog_new(mainwindow, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
+			"%s", initerror);
+		gtk_dialog_run(GTK_DIALOG(msgDialog));
+		gtk_widget_destroy(msgDialog);
 		return FALSE;
 	}
 
-	mainwindow = remmina_main_get_window();
 
 	bu = remmina_public_gtk_builder_new_from_file("remmina_mpc.glade");
 	if (!bu) {