git://git.jankratochvil.net
/
captive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88d6ad9
)
Hopefully fixed all the modal dialogs combinations.
author
lace
<>
Wed, 25 Jan 2006 20:28:19 +0000
(20:28 +0000)
committer
lace
<>
Wed, 25 Jan 2006 20:28:19 +0000
(20:28 +0000)
src/install/acquire/ui-gnome.c
patch
|
blob
|
history
diff --git
a/src/install/acquire/ui-gnome.c
b/src/install/acquire/ui-gnome.c
index
059f491
..
b05d158
100644
(file)
--- a/
src/install/acquire/ui-gnome.c
+++ b/
src/install/acquire/ui-gnome.c
@@
-594,6
+594,7
@@
static void on_DruidButtonOK_clicked_dialog_callback(gint reply,gint *replyp /*
g_return_if_fail(replyp!=NULL);
*replyp=reply;
g_return_if_fail(replyp!=NULL);
*replyp=reply;
+ gtk_main_quit();
}
void on_DruidButtonOK_clicked(GtkButton *button,gpointer user_data /* unused */)
}
void on_DruidButtonOK_clicked(GtkButton *button,gpointer user_data /* unused */)
@@
-622,8
+623,9
@@
gint reply;
gtk_main();
if (reply==0) /* 0 for 'OK', 1 for 'Cancel', left -1 for dialog close. */
exit(EXIT_SUCCESS);
gtk_main();
if (reply==0) /* 0 for 'OK', 1 for 'Cancel', left -1 for dialog close. */
exit(EXIT_SUCCESS);
- /*
This does not work (at least not in the static build)
: gnome_dialog_set_close(,TRUE);
+ /*
It is still needed despite
: gnome_dialog_set_close(,TRUE);
* in: libgnomeui-2.10.0-1
* in: libgnomeui-2.10.0-1
+ * There may be some races regarding when is ran: gtk_main_quit();
*/
gtk_widget_destroy(dialog);
}
*/
gtk_widget_destroy(dialog);
}
@@
-750,15
+752,12
@@
GtkWidget *dialog;
dialog=gnome_app_message(App,message);
gtk_window_set_modal(GTK_WINDOW(dialog),TRUE);
dialog=gnome_app_message(App,message);
gtk_window_set_modal(GTK_WINDOW(dialog),TRUE);
- /* It looks as if eariler libgnomeui had default TRUE
- * but since libgnomeui-2.10.0 it is FALSE, weird.
- */
+ /* See also around: gnome_dialog_set_close(); */
gnome_dialog_set_close(GNOME_DIALOG(dialog),FALSE);
gnome_dialog_set_close(GNOME_DIALOG(dialog),FALSE);
- g_signal_connect((gpointer)dialog,"close",G_CALLBACK(gtk_main_quit),NULL);
+ g_signal_connect((gpointer)dialog,"close" ,G_CALLBACK(gtk_main_quit),NULL);
+ g_signal_connect((gpointer)dialog,"clicked",G_CALLBACK(gtk_main_quit),NULL);
gtk_main();
gtk_main();
- /* This does not work (at least not in the static build): gnome_dialog_set_close(,TRUE);
- * in: libgnomeui-2.10.0-1
- */
+ /* See also around: gnome_dialog_set_close(); */
gtk_widget_destroy(dialog);
gdk_flush();
gtk_widget_destroy(dialog);
gdk_flush();