Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=d6b8e98bcf0e1134a9e609a73d00ad8618b695d1
commit d6b8e98bcf0e1134a9e609a73d00ad8618b695d1 Author: James Buren <[email protected]> Date: Tue Aug 7 14:26:57 2012 -0500 frugalwareutils-1.0.0-9-x86_64 * backport more fixes from git diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index ab6fd0a..af15619 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -10,7 +10,7 @@ USE_APIDOCS=${USE_APIDOCS:-"y"} pkgname=frugalwareutils pkgver=1.0.0 Fuse $USE_DEVEL && pkgver=0.9.9.7.gb874e50 -pkgrel=8 +pkgrel=9 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils"; depends=('glib2>=2.16.4-2' 'ncurses>=5.6-4' 'parted>=3.1' \ diff --git a/source/base/frugalwareutils/git.patch b/source/base/frugalwareutils/git.patch index c51bee9..c9ee879 100644 --- a/source/base/frugalwareutils/git.patch +++ b/source/base/frugalwareutils/git.patch @@ -82,6 +82,32 @@ index 1751ad0..1389258 100644 } if(argv!=NULL) +diff --git a/libfwdialog/libfwdialog.c b/libfwdialog/libfwdialog.c +index 18ccb91..2775197 100644 +--- a/libfwdialog/libfwdialog.c ++++ b/libfwdialog/libfwdialog.c +@@ -66,8 +66,10 @@ int fwdialog_confirm(void) + { + int ret; + dialog_vars.defaultno=1; ++ dialog_vars.default_button=DLG_EXIT_CANCEL; + ret = dialog_yesno(_("Exit"), _("Are you sure you want to exit?"), 0, 0); + dialog_vars.defaultno=0; ++ dialog_vars.default_button=DLG_EXIT_OK; + if(ret==DLG_EXIT_OK) + return(1); + else +@@ -99,8 +101,10 @@ char *fwdialog_ask(char *title, char *desc, char *init) + dlg_clear(); + while(1) + { ++ dialog_vars.default_button=-1; + dialog_vars.input_result = my_buffer; + ret = dialog_inputbox(title, desc, 0, 0, init, 0); ++ dialog_vars.default_button=DLG_EXIT_OK; + if (ret != DLG_EXIT_CANCEL) + break; + if(fwdialog_confirm()) diff --git a/libfwgrubconfig/libfwgrubconfig.c b/libfwgrubconfig/libfwgrubconfig.c index 364a417..9d32fcf 100644 --- a/libfwgrubconfig/libfwgrubconfig.c _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
