From e33c730858bd637c9c4896ceddc22dcd5654af17 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Feb 16 2016 15:10:36 +0000
Subject: Modify gtk_message_dialog_new_with_markup() usage


  for result dialog
- Fix bug 1308898

---

diff --git a/kanatest-0.4.8-gtk_markup_func_usage_fix.patch b/kanatest-0.4.8-gtk_markup_func_usage_fix.patch
new file mode 100644
index 0000000..afccbb9
--- /dev/null
+++ b/kanatest-0.4.8-gtk_markup_func_usage_fix.patch
@@ -0,0 +1,43 @@
+--- kanatest-0.4.8/src/test.c.dialog	2016-02-16 23:17:16.832610970 +0900
++++ kanatest-0.4.8/src/test.c	2016-02-16 23:59:25.929878319 +0900
+@@ -484,7 +484,6 @@ void
+ test_info(GUI *appGUI) {
+ 
+     GtkWidget *info_dialog;
+-    gchar   message[BUFFER_SIZE];
+     struct tm   *timer;
+     time_t      tmm;
+     guint answer_counter = appGUI->tst->right_answer_counter + appGUI->tst->wrong_answer_counter;
+@@ -498,7 +497,9 @@ test_info(GUI *appGUI) {
+ 
+     if (config.repeat_mode == REPEAT_ALL) {
+ 
+-        g_snprintf (message, BUFFER_SIZE,
++        info_dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(appGUI->main_window),
++                                                      GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
++                                                      GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
+                     "<span font_desc='16'><b>%s</b></span>\n\n"
+                     "<span font_desc='12'>%s: %d (%d %s)\n"
+                     "%s: %d\n%s: %d\n"
+@@ -518,7 +519,9 @@ test_info(GUI *appGUI) {
+                     test_sec2str (appGUI->time_counter, FALSE));
+     } else {
+ 
+-        g_snprintf (message, BUFFER_SIZE,
++        info_dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(appGUI->main_window),
++                                                      GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
++                                                      GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
+                     "<span font_desc='16'><b>%s</b></span>\n\n"
+                     "<span font_desc='12'>%s: %d\t\t\t\n"
+                     "%s: %d\n%s: %d\n"
+@@ -536,10 +539,6 @@ test_info(GUI *appGUI) {
+                     test_sec2str (appGUI->time_counter, FALSE));
+     }
+ 
+-    info_dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(appGUI->main_window),
+-                                                      GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+-                                                      GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", message);
+-
+     gtk_window_set_title (GTK_WINDOW(info_dialog), _("Information"));
+     gtk_widget_show (info_dialog);
+     gtk_dialog_run (GTK_DIALOG(info_dialog));
diff --git a/kanatest.spec b/kanatest.spec
index 01d7c16..03d25d6 100644
--- a/kanatest.spec
+++ b/kanatest.spec
@@ -1,6 +1,6 @@
 Name:           kanatest
 Version:        0.4.8
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -12,6 +12,9 @@ Source0:        http://clayo.org/kanatest/%{name}-%{version}.tar.gz
 Patch1:         kanatest-0.4.8-gtkfixes.patch
 # Format security patch
 Patch2:		kanatest-0.4.8-format-security.patch
+# gtk_message_dialog_new_with_markup() usage fix
+# bug 1308898
+Patch3:		kanatest-0.4.8-gtk_markup_func_usage_fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +35,7 @@ statistics are provided
 %setup -q
 %patch1 -p1 -b gtkfixes
 %patch2 -p1 -b .format
+%patch3 -p1 -b .dialog_markup
 
 sed -i src/Makefile.in \
 	-e 's|DISABLE_DEPRECATED|ENABLE_DEPRECATED|g'
@@ -67,6 +71,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 17 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.4.8-18
+- Modify gtk_message_dialog_new_with_markup() usage
+  for result dialog
+- Fix bug 1308898
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild