minecraft-pi-reborn/zenity
Archived
1
0
Fork 0
Code Pull Requests Activity

dependency on glib >= 2.7.3 Add G_OPTION_FLAG_NOALIAS flag on options that

Browse Source 
2005-07-12  Lucas Rocha  <lucasr@cvs.gnome.org>

	* configure.in: dependency on glib >= 2.7.3
	* src/option.c: Add G_OPTION_FLAG_NOALIAS flag
	on options that are present in more than on
	group.
This commit is contained in:
Lucas Rocha 2005-07-13 03:28:15 +00:00 committed by Lucas Almeida Rocha
parent 68ab19d2c4
commit beffc3f8a9
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-07-12 Lucas Rocha <lucasr@cvs.gnome.org>
* configure.in: dependency on glib >= 2.7.3
* src/option.c: Add G_OPTION_FLAG_NOALIAS flag
on options that are present in more than on
group.
2005-07-12 Lucas Rocha <lucasr@cvs.gnome.org> 2005-07-12 Lucas Rocha <lucasr@cvs.gnome.org>
* src/option.c: activate option help translations * src/option.c: activate option help translations

2
configure.in
View File

@ -11,7 +11,7 @@ AC_PROG_CC
GTK_REQUIRED=2.3.1 GTK_REQUIRED=2.3.1
PKG_CHECK_MODULES(ZENITY, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 libgnomecanvas-2.0 glib-2.0 >= 2.5.3) PKG_CHECK_MODULES(ZENITY, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 libgnomecanvas-2.0 glib-2.0 >= 2.7.3)
AC_SUBST(ZENITY_CFLAGS) AC_SUBST(ZENITY_CFLAGS)
AC_SUBST(ZENITY_LIBS) AC_SUBST(ZENITY_LIBS)

42
src/option.c
View File

@ -150,7 +150,7 @@ static GOptionEntry calendar_options[] = {
{ {
"text", "text",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_dialog_text, &zenity_general_dialog_text,
N_("Set the dialog text"), N_("Set the dialog text"),
@ -210,7 +210,7 @@ static GOptionEntry entry_options[] = {
{ {
"text", "text",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_dialog_text, &zenity_general_dialog_text,
N_("Set the dialog text"), N_("Set the dialog text"),
@ -220,7 +220,7 @@ static GOptionEntry entry_options[] = {
"entry-text", "entry-text",
'\0', '\0',
0, 0,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING | G_OPTION_FLAG_NOALIAS,
&zenity_entry_entry_text, &zenity_entry_entry_text,
N_("Set the entry text"), N_("Set the entry text"),
NULL NULL
@ -253,7 +253,7 @@ static GOptionEntry error_options[] = {
{ {
"text", "text",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_dialog_text, &zenity_general_dialog_text,
N_("Set the dialog text"), N_("Set the dialog text"),
@ -262,7 +262,7 @@ static GOptionEntry error_options[] = {
{ {
"no-wrap", "no-wrap",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE, G_OPTION_ARG_NONE,
&zenity_general_dialog_no_wrap, &zenity_general_dialog_no_wrap,
N_("Do not enable text wrapping"), N_("Do not enable text wrapping"),
@ -286,7 +286,7 @@ static GOptionEntry info_options[] = {
{ {
"text", "text",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_dialog_text, &zenity_general_dialog_text,
N_("Set the dialog text"), N_("Set the dialog text"),
@ -295,7 +295,7 @@ static GOptionEntry info_options[] = {
{ {
"no-wrap", "no-wrap",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE, G_OPTION_ARG_NONE,
&zenity_general_dialog_no_wrap, &zenity_general_dialog_no_wrap,
N_("Do not enable text wrapping"), N_("Do not enable text wrapping"),
@ -319,7 +319,7 @@ static GOptionEntry file_selection_options[] = {
{ {
"filename", "filename",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_FILENAME, G_OPTION_ARG_FILENAME,
&zenity_general_uri, &zenity_general_uri,
N_("Set the filename"), N_("Set the filename"),
@ -328,7 +328,7 @@ static GOptionEntry file_selection_options[] = {
{ {
"multiple", "multiple",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE, G_OPTION_ARG_NONE,
&zenity_general_multiple, &zenity_general_multiple,
N_("Allow multiple files to be selected"), N_("Allow multiple files to be selected"),
@ -355,7 +355,7 @@ static GOptionEntry file_selection_options[] = {
{ {
"separator", "separator",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_separator, &zenity_general_separator,
N_("Set output separator character"), N_("Set output separator character"),
@ -379,7 +379,7 @@ static GOptionEntry list_options[] = {
{ {
"text", "text",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_dialog_text, &zenity_general_dialog_text,
N_("Set the dialog text"), N_("Set the dialog text"),
@ -424,7 +424,7 @@ static GOptionEntry list_options[] = {
{ {
"multiple", "multiple",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE, G_OPTION_ARG_NONE,
&zenity_general_multiple, &zenity_general_multiple,
N_("Allow multiple rows to be selected"), N_("Allow multiple rows to be selected"),
@ -433,7 +433,7 @@ static GOptionEntry list_options[] = {
{ {
"editable", "editable",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE, G_OPTION_ARG_NONE,
&zenity_general_editable, &zenity_general_editable,
N_("Allow changes to text"), N_("Allow changes to text"),
@ -475,7 +475,7 @@ static GOptionEntry notification_options[] = {
{ {
"text", "text",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_dialog_text, &zenity_general_dialog_text,
N_("Set the notification text"), N_("Set the notification text"),
@ -508,7 +508,7 @@ static GOptionEntry progress_options[] = {
{ {
"text", "text",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_dialog_text, &zenity_general_dialog_text,
N_("Set the dialog text"), N_("Set the dialog text"),
@ -560,7 +560,7 @@ static GOptionEntry question_options[] = {
{ {
"text", "text",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_dialog_text, &zenity_general_dialog_text,
N_("Set the dialog text"), N_("Set the dialog text"),
@ -569,7 +569,7 @@ static GOptionEntry question_options[] = {
{ {
"no-wrap", "no-wrap",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE, G_OPTION_ARG_NONE,
&zenity_general_dialog_no_wrap, &zenity_general_dialog_no_wrap,
N_("Do not enable text wrapping"), N_("Do not enable text wrapping"),
@ -593,7 +593,7 @@ static GOptionEntry text_options[] = {
{ {
"filename", "filename",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_FILENAME, G_OPTION_ARG_FILENAME,
&zenity_general_uri, &zenity_general_uri,
N_("Open file"), N_("Open file"),
@ -602,7 +602,7 @@ static GOptionEntry text_options[] = {
{ {
"editable", "editable",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE, G_OPTION_ARG_NONE,
&zenity_general_editable, &zenity_general_editable,
N_("Allow changes to text"), N_("Allow changes to text"),
@ -626,7 +626,7 @@ static GOptionEntry warning_options[] = {
{ {
"text", "text",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_STRING, G_OPTION_ARG_STRING,
&zenity_general_dialog_text, &zenity_general_dialog_text,
N_("Set the dialog text"), N_("Set the dialog text"),
@ -635,7 +635,7 @@ static GOptionEntry warning_options[] = {
{ {
"no-wrap", "no-wrap",
'\0', '\0',
0, G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_NONE, G_OPTION_ARG_NONE,
&zenity_general_dialog_no_wrap, &zenity_general_dialog_no_wrap,
N_("Do not enable text wrapping"), N_("Do not enable text wrapping"),