Revision: 4731 http://geany.svn.sourceforge.net/geany/?rev=4731&view=rev Author: eht16 Date: 2010-03-07 17:28:13 +0000 (Sun, 07 Mar 2010)

Log Message: ----------- Fix setting the icon for some dialogs if the parent itself is also a dialog.

Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-07 17:13:54 UTC (rev 4730) +++ trunk/ChangeLog 2010-03-07 17:28:13 UTC (rev 4731) @@ -20,6 +20,9 @@ * src/prefs.c: Correctly set the parent widget for the keybinding overwrite confirmation dialog. + * src/dialog.c: + Fix setting the icon for some dialogs if the parent itself is also + a dialog.

2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2010-03-07 17:13:54 UTC (rev 4730) +++ trunk/src/dialogs.c 2010-03-07 17:28:13 UTC (rev 4731) @@ -578,7 +578,7 @@ break; } gtk_window_set_title(GTK_WINDOW(dialog), title); - if (parent == NULL) + if (parent == NULL || GTK_IS_DIALOG(parent)) { GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO); gtk_window_set_icon(GTK_WINDOW(dialog), pb); @@ -1390,7 +1390,7 @@ GTK_BUTTONS_NONE, "%s", question_text); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); - if (parent == NULL) + if (parent == NULL || GTK_IS_DIALOG(parent)) { GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO); gtk_window_set_icon(GTK_WINDOW(dialog), pb);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.