AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Set error when returning FALSE. (#333268, Paolo Maggi, Christian Persch)

Browse Source 
2006-03-06  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmain.c (post_parse_hook): Set error when returning
	FALSE.  (#333268, Paolo Maggi, Christian Persch)
This commit is contained in:
Matthias Clasen 2006-03-06 17:34:35 +00:00 committed by Matthias Clasen
parent a319bd94de
commit ede9695875
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-03-06 Matthias Clasen <mclasen@redhat.com> 2006-03-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c (post_parse_hook): Set error when returning
FALSE. (#333268, Paolo Maggi, Christian Persch)
* gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap * gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap
has the right depth. (#333363, Ed Catmur) has the right depth. (#333363, Ed Catmur)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-03-06 Matthias Clasen <mclasen@redhat.com> 2006-03-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c (post_parse_hook): Set error when returning
FALSE. (#333268, Paolo Maggi, Christian Persch)
* gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap * gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap
has the right depth. (#333363, Ed Catmur) has the right depth. (#333363, Ed Catmur)

17
gtk/gtkmain.c
View File

@ -550,9 +550,20 @@ post_parse_hook (GOptionContext *context,
do_post_parse_initialization (NULL, NULL); do_post_parse_initialization (NULL, NULL);
if (info->open_default_display) if (info->open_default_display)
return gdk_display_open_default_libgtk_only () != NULL; {
else if (gdk_display_open_default_libgtk_only () == NULL)
return TRUE; {
g_set_error (error,
G_OPTION_ERROR,
G_OPTION_ERROR_FAILED,
"cannot open display: %s",
gdk_get_display_arg_name ());
return FALSE;
}
}
return TRUE;
} }