[dasher] Avoid adding string - after string freeze use #if 0 part.
- From: Patrick Welche <pwelche src gnome org>
- To: svn-commits-list gnome org
- Subject: [dasher] Avoid adding string - after string freeze use #if 0 part.
- Date: Thu, 14 May 2009 18:27:03 -0400 (EDT)
commit fd5daf8a71abd5e4d25d250bc4fd6f8881d5452c
Author: Patrick Welche <prlw1 cam ac uk>
Date: Thu May 14 23:26:24 2009 +0100
Avoid adding string - after string freeze use #if 0 part.
---
ChangeLog | 3 ++-
Src/Gtk2/dasher_main.cpp | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4b482f2..b28cffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
2009-05-14 Patrick Welche <prlw1 cam ac uk>
* DasherButtons.cpp: Change box non-uniformity range again.
- * AlphabetBox.cpp: hack to avoid crash when LP_UNIFORM is zero.
+ * AlphabetBox.cpp: Hack to avoid crash when LP_UNIFORM is zero.
+ * dasher_main.cpp: Avoid adding a string during string freeze.
2009-05-14 Alan Lawrence <acl33 inf phy cam ac uk>
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index 9a86270..f32825b 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -1158,12 +1158,20 @@ dasher_main_command_help(DasherMain *pSelf) {
scr = gtk_widget_get_screen(pPrivate->pMainWindow);
if (!gtk_show_uri(scr, "ghelp:dasher", gtk_get_current_event_time(), &err)) {
GtkWidget *d;
+// XXX PRLW: after string thaw use the following:
+#if 0
d = gtk_message_dialog_new(GTK_WINDOW(pPrivate->pMainWindow),
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
"%s", _("Unable to open help file"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d),
"%s", err->message);
+#else
+ d = gtk_message_dialog_new(GTK_WINDOW(pPrivate->pMainWindow),
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+ "%s", err->message);
+#endif
g_signal_connect(d, "response", G_CALLBACK(gtk_widget_destroy), NULL);
gtk_window_present(GTK_WINDOW(d));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]