Compatibility fix for Gtk+ < 2.6
This commit is contained in:
parent
e27e993324
commit
cb8ea76e9b
23
src/surfer.c
23
src/surfer.c
@ -924,9 +924,11 @@ int surfer_confirm(Surfer * surfer, char const * message, gboolean * confirmed)
|
|||||||
dialog = gtk_message_dialog_new((surfer != NULL)
|
dialog = gtk_message_dialog_new((surfer != NULL)
|
||||||
? GTK_WINDOW(surfer->window) : NULL,
|
? GTK_WINDOW(surfer->window) : NULL,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s",
|
GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
|
||||||
_("Question"));
|
#if GTK_CHECK_VERSION(2, 6, 0)
|
||||||
|
"%s", _("Question"));
|
||||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
|
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
|
||||||
|
#endif
|
||||||
"%s", message);
|
"%s", message);
|
||||||
gtk_window_set_title(GTK_WINDOW(dialog), _("Question"));
|
gtk_window_set_title(GTK_WINDOW(dialog), _("Question"));
|
||||||
res = gtk_dialog_run(GTK_DIALOG(dialog));
|
res = gtk_dialog_run(GTK_DIALOG(dialog));
|
||||||
@ -1982,7 +1984,7 @@ void surfer_view_security(Surfer * surfer)
|
|||||||
dialog = gtk_message_dialog_new(GTK_WINDOW(surfer->window),
|
dialog = gtk_message_dialog_new(GTK_WINDOW(surfer->window),
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
|
GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
|
||||||
#if GTK_CHECK_VERSION(2, 8, 0)
|
#if GTK_CHECK_VERSION(2, 6, 0)
|
||||||
"%s", _("Security information"));
|
"%s", _("Security information"));
|
||||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
|
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
|
||||||
#endif
|
#endif
|
||||||
@ -2075,9 +2077,11 @@ void surfer_warning(Surfer * surfer, char const * message)
|
|||||||
dialog = gtk_message_dialog_new((surfer != NULL)
|
dialog = gtk_message_dialog_new((surfer != NULL)
|
||||||
? GTK_WINDOW(surfer->window) : NULL,
|
? GTK_WINDOW(surfer->window) : NULL,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, "%s",
|
GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
|
||||||
_("Warning"));
|
#if GTK_CHECK_VERSION(2, 6, 0)
|
||||||
|
"%s", _("Warning"));
|
||||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
|
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
|
||||||
|
#endif
|
||||||
"%s", message);
|
"%s", message);
|
||||||
gtk_window_set_title(GTK_WINDOW(dialog), _("Warning"));
|
gtk_window_set_title(GTK_WINDOW(dialog), _("Warning"));
|
||||||
gtk_dialog_run(GTK_DIALOG(dialog));
|
gtk_dialog_run(GTK_DIALOG(dialog));
|
||||||
@ -2135,13 +2139,12 @@ static gboolean _surfer_filename_confirm(Surfer * surfer,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
dialog = gtk_message_dialog_new(GTK_WINDOW(surfer->window),
|
dialog = gtk_message_dialog_new(GTK_WINDOW(surfer->window),
|
||||||
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, "%s",
|
GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO,
|
||||||
#if GTK_CHECK_VERSION(2, 6, 0)
|
#if GTK_CHECK_VERSION(2, 6, 0)
|
||||||
_("Warning"));
|
"%s", _("Warning"));
|
||||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(
|
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
|
||||||
dialog), "%s",
|
|
||||||
#endif
|
#endif
|
||||||
_("This file already exists. Overwrite?"));
|
"%s", _("This file already exists. Overwrite?"));
|
||||||
gtk_window_set_title(GTK_WINDOW(dialog), _("Warning"));
|
gtk_window_set_title(GTK_WINDOW(dialog), _("Warning"));
|
||||||
res = gtk_dialog_run(GTK_DIALOG(dialog));
|
res = gtk_dialog_run(GTK_DIALOG(dialog));
|
||||||
gtk_widget_destroy(dialog);
|
gtk_widget_destroy(dialog);
|
||||||
|
Loading…
Reference in New Issue
Block a user