Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=c4eeba9aef78992524a6b142166806708c95e803
commit c4eeba9aef78992524a6b142166806708c95e803 Author: James Buren <[email protected]> Date: Mon Aug 6 06:28:16 2012 -0500 fix setting default button to NO diff --git a/src/plugins/checkdisk.c b/src/plugins/checkdisk.c index e212a85..f9a240f 100644 --- a/src/plugins/checkdisk.c +++ b/src/plugins/checkdisk.c @@ -234,6 +234,7 @@ int user_ignore_warning(const char *prompt,const char *body) int rv; dialog_vars.defaultno = 1; + dialog_vars.default_button=DLG_EXIT_CANCEL; dlg_put_backtitle(); @@ -242,6 +243,7 @@ int user_ignore_warning(const char *prompt,const char *body) rv = dialog_yesno(prompt,body,0,0); dialog_vars.defaultno = 0; + dialog_vars.default_button=DLG_EXIT_OK; return rv == DLG_EXIT_OK; } diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 1a96c97..9010f05 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -1,8 +1,8 @@ /* * configsource.c for Frugalware setup - * + * * Copyright (c) 2005 by Miklos Vajna <[email protected]> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -163,6 +163,7 @@ GList *mirrorconf(void) // merges the selected and remain mirrors newmirrorlist = g_list_concat(newmirrorlist, mirrorlist); dialog_vars.defaultno=1; + dialog_vars.default_button=DLG_EXIT_CANCEL; dialog_vars.cancel_label = strdup(_("Continue")); if(fw_inputbox(_("Custom mirror"), _("You may now specify " "a custom mirror (eg. LAN) " @@ -177,6 +178,7 @@ GList *mirrorconf(void) } } dialog_vars.defaultno=0; + dialog_vars.default_button=DLG_EXIT_OK; FREE(dialog_vars.cancel_label); updateconfig(fn, newmirrorlist); return(newmirrorlist); diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c index d874e9b..47612b5 100644 --- a/src/plugins/partdisk.c +++ b/src/plugins/partdisk.c @@ -148,9 +148,11 @@ int raid_confirm(void) #ifdef DIALOG int ret; dialog_vars.defaultno=1; + dialog_vars.default_button=DLG_EXIT_CANCEL; ret = dialog_yesno(_("Want to create RAID partitions?"), _("Do you want to create software RAID partitions during " "partitioning?"), 0, 0); + dialog_vars.default_button=DLG_EXIT_OK; dialog_vars.defaultno=0; if(ret==DLG_EXIT_OK) { diff --git a/src/plugins/select.c b/src/plugins/select.c index c91cab6..72045d9 100644 --- a/src/plugins/select.c +++ b/src/plugins/select.c @@ -1,9 +1,9 @@ /* * select.c for Frugalware setup - * + * * Copyright (c) 2005 by Miklos Vajna <[email protected]> * Copyright (c) 2006 by Alex Smith <[email protected]> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -289,6 +289,7 @@ int selpkg_confirm(void) { int ret; dialog_vars.defaultno=1; + dialog_vars.default_button=DLG_EXIT_CANCEL; dlg_put_backtitle(); dlg_clear(); ret = dialog_yesno(_("Use expert menus?"), @@ -301,6 +302,7 @@ int selpkg_confirm(void) "functioning of your system. Choose 'no' for using normal " "menus that select groups of packages, or choose 'yes' for " "using expert menus with a switch for each package."), 0, 0); + dialog_vars.default_button=DLG_EXIT_OK; dialog_vars.defaultno=0; if(ret==DLG_EXIT_OK) return(1); @@ -358,7 +360,7 @@ int prepare_pkgdb(char *repo, GList **config, GList **syncs) dialog_msgbox(_("Error"), g_strdup_printf(_("Failed to parse pacman-g2 configuration file (%s)"), pacman_strerror(pm_errno)), 0, 0, 1); return(-1); } - + LOG("getting the database"); if (mydatabase == NULL) { @@ -386,7 +388,7 @@ int prepare_pkgdb(char *repo, GList **config, GList **syncs) } } } - + LOG("cleaning up the database"); pacman_db_unregister(mydatabase); mydatabase = NULL; diff --git a/src/util.c b/src/util.c index cb09f0b..463a705 100644 --- a/src/util.c +++ b/src/util.c @@ -180,9 +180,11 @@ int exit_confirm(void) #ifdef DIALOG int ret; dialog_vars.defaultno=1; + dialog_vars.default_button=DLG_EXIT_CANCEL; ret = dialog_yesno(_("Exit from the installer"), _("Are you sure you want to exit from the installer?"), 0, 0); dialog_vars.defaultno=0; + dialog_vars.default_button=DLG_EXIT_OK; if(ret==DLG_EXIT_OK) return(1); else _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
