applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

launch the error dialog with the proper parent so it actually becomes

Browse source 
2008-04-13  Jens Granseuer  <jensgr@gmx.net>

	* gnome-about-me-password.c: (passdlg_error_dialog),
	(passdlg_spawn_passwd), (passdlg_authenticate): launch the error
	dialog with the proper parent so it actually becomes possible to
	dismiss it. Also use GtkMessageDialog instead of eel, and reset the
	busy cursor when launching passwd fails.

svn path=/trunk/; revision=8648
This commit is contained in:
Jens Granseuer 2008-04-13 16:08:48 +00:00 • committed by Jens Granseuer
parent d9af624fd0
commit 3e446a1955
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
capplets/about-me/ChangeLog
View file

@ -1,3 +1,11 @@
2008-04-13 Jens Granseuer <jensgr@gmx.net>
* gnome-about-me-password.c: (passdlg_error_dialog),
(passdlg_spawn_passwd), (passdlg_authenticate): launch the error
dialog with the proper parent so it actually becomes possible to
dismiss it. Also use GtkMessageDialog instead of eel, and reset the
busy cursor when launching passwd fails.
2008-02-28 Jens Granseuer <jensgr@gmx.net>
* gnome-about-me-password.c: (io_watch_stdout): fix misspelling of

34
capplets/about-me/gnome-about-me-password.c
View file

@ -707,23 +707,22 @@ passdlg_set_busy (PasswordDialog *pdialog, gboolean busy)
/* Launch an error dialog */
static void
passdlg_error_dialog (const gchar *title, const gchar *msg, const gchar *details)
passdlg_error_dialog (GtkWindow *parent, const gchar *title,
const gchar *msg, const gchar *details)
{
GtkWidget *dialog;
GtkWidget *dialog;
dialog = eel_alert_dialog_new (NULL, 0,
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
msg, NULL, title);
dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
msg);
if (title)
gtk_window_set_title (GTK_WINDOW (dialog), title);
if (details != NULL) {
eel_alert_dialog_set_details_label (EEL_ALERT_DIALOG (dialog), details);
}
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (gtk_widget_destroy), NULL);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_widget_show (dialog);
if (details)
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
details);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
/* Set authenticated state of dialog according to state
@ -814,11 +813,15 @@ passdlg_spawn_passwd (PasswordDialog *pdialog)
/* Spawn backend */
if (!spawn_passwd (pdialog, &error)) {
GtkWidget *parent = glade_xml_get_widget (pdialog->xml,
"change-password");
/* translators: Unable to launch <program>: <error message> */
details = g_strdup_printf (_("Unable to launch %s: %s"),
"/usr/bin/passwd", error->message);
passdlg_error_dialog (_("Unable to launch backend"),
passdlg_error_dialog (GTK_WINDOW (parent),
_("Unable to launch backend"),
_("A system error has occurred"),
details);
@ -843,6 +846,7 @@ passdlg_authenticate (GtkButton *button, PasswordDialog *pdialog)
/* Spawn backend */
if (!passdlg_spawn_passwd (pdialog)) {
passdlg_set_busy (pdialog, FALSE);
return;
}