r12033 - in packages/trunk/kanatest/debian: . patches
Evgeni Golov
evgeni at alioth.debian.org
Mon Mar 28 09:24:37 UTC 2011
Author: evgeni
Date: 2011-03-28 09:24:30 +0000 (Mon, 28 Mar 2011)
New Revision: 12033
Added:
packages/trunk/kanatest/debian/patches/003_gtk_ftbfs_fix.patch
Modified:
packages/trunk/kanatest/debian/changelog
packages/trunk/kanatest/debian/patches/series
Log:
Add 003_gtk_ftbfs_fix.patch to fix FTBFS with GTK+ >= 2.22
Modified: packages/trunk/kanatest/debian/changelog
===================================================================
--- packages/trunk/kanatest/debian/changelog 2011-03-28 09:22:23 UTC (rev 12032)
+++ packages/trunk/kanatest/debian/changelog 2011-03-28 09:24:30 UTC (rev 12033)
@@ -7,8 +7,9 @@
+ Upstream homepage has moved, update watchfile.
* Add 002_updated_emails_and_links.patch to fix old links and emails.
LP: #462599
+ * Add 003_gtk_ftbfs_fix.patch to fix FTBFS with GTK+ >= 2.22.
- -- Evgeni Golov <evgeni at debian.org> Mon, 28 Mar 2011 08:18:43 +0200
+ -- Evgeni Golov <evgeni at debian.org> Mon, 28 Mar 2011 11:23:12 +0200
kanatest (0.4.8-1) unstable; urgency=low
Added: packages/trunk/kanatest/debian/patches/003_gtk_ftbfs_fix.patch
===================================================================
--- packages/trunk/kanatest/debian/patches/003_gtk_ftbfs_fix.patch (rev 0)
+++ packages/trunk/kanatest/debian/patches/003_gtk_ftbfs_fix.patch 2011-03-28 09:24:30 UTC (rev 12033)
@@ -0,0 +1,630 @@
+From: Tomasz Maka <pasp at users.sourceforge.net>
+Subject: Compilation fixes (based on patch by Miyako Miyamura)
+Origin: upstream, http://svn.gna.org/viewcvs/kanatest?view=rev&revision=60
+
+Index: src/stats.c
+===================================================================
+--- kanatest/src/stats.c (revision 59)
++++ kanatest/src/stats.c (revision 60)
+@@ -106,7 +106,7 @@
+ info_dialog = gtk_message_dialog_new (GTK_WINDOW(appGUI->sts->stat_window),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+- "\n%s:", _("Please select options"));
++ "\n%s:", _("Please select options"));
+
+ gtk_window_set_title(GTK_WINDOW(info_dialog), _("Question"));
+ gtk_widget_show (info_dialog);
+@@ -214,7 +214,7 @@
+ MESSAGE *msg = (MESSAGE *)user_data;
+
+ msg->appGUI->sts->old_column = config.stats_sort_column;
+- config.stats_sort_column = (gint) msg->data;
++ config.stats_sort_column = (size_t) msg->data;
+
+ if (msg->appGUI->sts->disable_dir == FALSE) {
+
+@@ -484,7 +484,11 @@
+ gtk_container_add (GTK_CONTAINER (appGUI->sts->stat_window), vbox1);
+
+ appGUI->sts->notebook = gtk_notebook_new ();
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus(appGUI->sts->notebook, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS(appGUI->sts->notebook, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (appGUI->sts->notebook);
+ gtk_box_pack_start (GTK_BOX (vbox1), appGUI->sts->notebook, TRUE, TRUE, 4);
+
+@@ -537,7 +541,7 @@
+ stats_renderer, "text", i, NULL);
+ gtk_tree_view_column_set_sort_column_id (stats_column[i], i);
+ gtk_tree_view_append_column (GTK_TREE_VIEW(stats_treeview), stats_column[i]);
+- msg[i].data = (gpointer)i;
++ msg[i].data = (gpointer)((size_t)i);
+ msg[i].appGUI = appGUI;
+ g_signal_connect (G_OBJECT(stats_column[i]), "clicked",
+ G_CALLBACK(stats_column_clicked_cb), &msg[i]);
+@@ -746,8 +750,12 @@
+ g_signal_connect (G_OBJECT (close_button), "clicked",
+ G_CALLBACK (stats_window_close_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), close_button);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (close_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ #endif
++#endif
+ if (appGUI->sts->active_tab != -1) {
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (appGUI->sts->notebook), appGUI->sts->active_tab);
+ }
+Index: src/chart.c
+===================================================================
+--- kanatest/src/chart.c (revision 59)
++++ kanatest/src/chart.c (revision 60)
+@@ -287,7 +287,12 @@
+ g_signal_connect (G_OBJECT (close_button), "clicked",
+ G_CALLBACK (chart_close_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), close_button);
++
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (close_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
++#endif
+
+ chart_display_kanas(HIRAGANA, appGUI);
+
+Index: src/gui_utils.c
+===================================================================
+--- kanatest/src/gui_utils.c (revision 59)
++++ kanatest/src/gui_utils.c (revision 60)
+@@ -69,14 +69,14 @@
+ static gchar browser_cmd[PATH_MAX];
+
+ gchar *browsers[] = {
+- "xdg-open",
+- "firefox",
+- "opera",
+- "x-www-browser",
+- "htmlview",
++ "xdg-open",
++ "firefox",
++ "opera",
++ "x-www-browser",
++ "htmlview",
+ "epiphany",
+- "konqueror",
+- "netscape"
++ "konqueror",
++ "netscape"
+ };
+
+ gint i;
+@@ -106,7 +106,7 @@
+ static gchar client_cmd[PATH_MAX];
+
+ gchar *clients[] = {
+- "xdg-email", "",
++ "xdg-email", "",
+ "claws-mail", "--compose",
+ "thunderbird", "mailto:",
+ "sylpheed", "--compose",
+@@ -297,7 +297,7 @@
+ GSList *tags = NULL, *tagp = NULL;
+ GtkTextTag *tag;
+ gchar *link;
+-gint slink;
++size_t slink;
+
+ if (ev->type != GDK_BUTTON_RELEASE) {
+ return FALSE;
+@@ -325,7 +325,7 @@
+ for (tagp = tags; tagp != NULL; tagp = tagp->next) {
+
+ tag = tagp->data;
+- slink = (gint) g_object_get_data (G_OBJECT (tag), "link");
++ slink = (size_t)g_object_get_data (G_OBJECT (tag), "link");
+
+ if (slink != 0) {
+ link = g_slist_nth_data (links_list, slink);
+Index: src/about.c
+===================================================================
+--- kanatest/src/about.c (revision 59)
++++ kanatest/src/about.c (revision 60)
+@@ -230,15 +233,15 @@
+ gtk_text_buffer_get_iter_at_offset (entry_buffer, &iter, 0);
+
+ gtk_text_buffer_create_tag (entry_buffer, "bold",
+- "weight", PANGO_WEIGHT_ULTRABOLD, NULL);
++ "weight", PANGO_WEIGHT_ULTRABOLD, NULL);
+ gtk_text_buffer_create_tag (entry_buffer, "big",
+- "size", 16 * PANGO_SCALE, NULL);
++ "size", 16 * PANGO_SCALE, NULL);
+ gtk_text_buffer_create_tag (entry_buffer, "italic",
+- "style", PANGO_STYLE_ITALIC, NULL);
++ "style", PANGO_STYLE_ITALIC, NULL);
+ gtk_text_buffer_create_tag (entry_buffer, "center",
+- "justification", GTK_JUSTIFY_CENTER, NULL);
++ "justification", GTK_JUSTIFY_CENTER, NULL);
+ gtk_text_buffer_create_tag (entry_buffer, "fixed",
+- "family", "monospace", NULL);
++ "family", "monospace", NULL);
+
+ gtk_text_buffer_get_iter_at_offset (entry_buffer, &iter, 0);
+ #ifdef MAEMO
+@@ -273,7 +276,7 @@
+
+ gtk_text_buffer_insert (entry_buffer, &iter, "\n", -1);
+ gui_url_insert_link(&appGUI->about_links_list, &appGUI->about_link_index, appGUI->about_textview,
+- &iter, NULL, 0, "http://clayo.org/kanatest", TRUE, appGUI);
++ &iter, NULL, 0, "http://clayo.org/kanatest", TRUE, appGUI);
+ gtk_text_buffer_insert (entry_buffer, &iter, "\n", -1);
+ g_snprintf (buffer, BUFFER_SIZE, "\n(%s %s, %s)\n\n", _("compiled on"), __DATE__, __TIME__);
+ gtk_text_buffer_insert_with_tags_by_name (entry_buffer, &iter, buffer, -1, "center", "italic", NULL);
+@@ -282,18 +285,18 @@
+ gtk_text_buffer_insert_with_tags_by_name (entry_buffer, &iter, buffer, -1, "bold", NULL);
+ gtk_text_buffer_insert (entry_buffer, &iter, " Tomasz Mąka <", -1);
+ gui_url_insert_link (&appGUI->about_links_list, &appGUI->about_link_index, appGUI->about_textview,
+- &iter, NULL, 0, "pasp at users.sourceforge.net", TRUE, appGUI);
++ &iter, NULL, 0, "pasp at users.sourceforge.net", TRUE, appGUI);
+ gtk_text_buffer_insert (entry_buffer, &iter, ">\n", -1);
+
+ g_snprintf (buffer, BUFFER_SIZE, "\n%s:\n", _("Graphics"));
+ gtk_text_buffer_insert_with_tags_by_name (entry_buffer, &iter, buffer, -1, "bold", NULL);
+ gtk_text_buffer_insert (entry_buffer, &iter, " Maja Kocoń (", -1);
+ gui_url_insert_link (&appGUI->about_links_list, &appGUI->about_link_index, appGUI->about_textview,
+- &iter, NULL, 0, "http://pinky-babble.org", TRUE, appGUI);
++ &iter, NULL, 0, "http://pinky-babble.org", TRUE, appGUI);
+ gtk_text_buffer_insert (entry_buffer, &iter, ")\n", -1);
+ gtk_text_buffer_insert (entry_buffer, &iter, " Piotr Mąka <", -1);
+ gui_url_insert_link (&appGUI->about_links_list, &appGUI->about_link_index, appGUI->about_textview,
+- &iter, NULL, 0, "silloz at users.sourceforge.net", TRUE, appGUI);
++ &iter, NULL, 0, "silloz at users.sourceforge.net", TRUE, appGUI);
+ gtk_text_buffer_insert (entry_buffer, &iter, ">\n", -1);
+
+ g_snprintf (buffer, BUFFER_SIZE, "\n%s:\n", _("Translators"));
+@@ -339,9 +342,9 @@
+ entry_buffer = gtk_text_buffer_new (NULL);
+ gtk_text_buffer_get_iter_at_offset (entry_buffer, &iter, 0);
+ gtk_text_buffer_create_tag (entry_buffer, "underline",
+- "underline", PANGO_UNDERLINE_SINGLE, NULL);
++ "underline", PANGO_UNDERLINE_SINGLE, NULL);
+ gtk_text_buffer_create_tag (entry_buffer, "big",
+- "size", 12 * PANGO_SCALE, NULL);
++ "size", 12 * PANGO_SCALE, NULL);
+ gtk_text_buffer_get_iter_at_offset (entry_buffer, &iter, 0);
+ #ifdef MAEMO
+ text_sheet = hildon_text_view_new ();
+@@ -359,7 +362,7 @@
+ gtk_container_add (GTK_CONTAINER (viewport), text_sheet);
+
+ g_snprintf (buffer, BUFFER_SIZE, "%s\n\n",
+- _("We would like to thank the following people for suggestions, bug reports and patches:"));
++ _("We would like to thank the following people for suggestions, bug reports and patches:"));
+ gtk_text_buffer_insert (entry_buffer, &iter, buffer, -1);
+
+ gtk_text_buffer_insert (entry_buffer, &iter, text_contributors, -1);
+@@ -453,9 +456,9 @@
+ entry_buffer = gtk_text_buffer_new (NULL);
+ gtk_text_buffer_get_iter_at_offset (entry_buffer, &iter, 0);
+ gtk_text_buffer_create_tag (entry_buffer, "underline",
+- "underline", PANGO_UNDERLINE_SINGLE, NULL);
++ "underline", PANGO_UNDERLINE_SINGLE, NULL);
+ gtk_text_buffer_create_tag (entry_buffer, "big",
+- "size", 12 * PANGO_SCALE, NULL);
++ "size", 12 * PANGO_SCALE, NULL);
+ #ifdef MAEMO
+ text_sheet = hildon_text_view_new ();
+ hildon_text_view_set_buffer (HILDON_TEXT_VIEW (text_sheet), entry_buffer);
+@@ -492,7 +495,12 @@
+ g_signal_connect (G_OBJECT (close_button), "clicked",
+ G_CALLBACK (about_close_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), close_button);
++
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (close_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
++#endif
+
+ gtk_widget_grab_default (close_button);
+ #endif
+Index: src/gui.c
+===================================================================
+--- kanatest/src/gui.c (revision 59)
++++ kanatest/src/gui.c (revision 60)
+@@ -686,7 +686,11 @@
+ gtk_box_pack_start (GTK_BOX (hbox2), appGUI->timer_label, TRUE, TRUE, 0);
+ #ifndef MAEMO
+ appGUI->stat_button = gui_stock_label_button(NULL, KANATEST_STOCK_BUTTON_STATISTICS);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->stat_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->stat_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->stat_button), "clicked",
+ G_CALLBACK (show_statistics_window_cb), appGUI);
+ gtk_widget_show (appGUI->stat_button);
+@@ -695,7 +699,11 @@
+ gtk_widget_set_tooltip_text (appGUI->stat_button, _("Statistics"));
+
+ appGUI->chart_button = gui_stock_label_button(NULL, KANATEST_STOCK_BUTTON_CHART);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->chart_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->chart_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->chart_button), "clicked",
+ G_CALLBACK (show_chart_window_cb), appGUI);
+ gtk_widget_show (appGUI->chart_button);
+@@ -704,7 +712,11 @@
+ gtk_widget_set_tooltip_text (appGUI->chart_button, _("Kana chart"));
+
+ appGUI->prefs_button = gui_stock_label_button(NULL, KANATEST_STOCK_BUTTON_OPTIONS);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->prefs_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->prefs_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->prefs_button), "clicked",
+ G_CALLBACK (show_options_window_cb), appGUI);
+ gtk_widget_show (appGUI->prefs_button);
+@@ -713,7 +725,11 @@
+ gtk_widget_set_tooltip_text (appGUI->prefs_button, _("Options"));
+
+ appGUI->about_button = gui_stock_label_button(NULL, KANATEST_STOCK_BUTTON_ABOUT);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->about_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->about_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->about_button), "clicked",
+ G_CALLBACK (show_about_window_cb), appGUI);
+ gtk_widget_show (appGUI->about_button);
+@@ -829,13 +845,21 @@
+ gtk_box_set_spacing (GTK_BOX (hbuttonbox), 5);
+
+ appGUI->start_button = gui_stock_label_button(_("Start"), GTK_STOCK_EXECUTE);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->start_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->start_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->start_button), "clicked",
+ G_CALLBACK (start_test_cb), appGUI);
+ gtk_widget_show (appGUI->start_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->start_button);
+ gtk_container_set_border_width (GTK_CONTAINER (appGUI->start_button), 4);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (appGUI->start_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (appGUI->start_button, GTK_CAN_DEFAULT);
++#endif
+ gtk_widget_set_tooltip_text (appGUI->start_button, _("Press to begin testing..."));
+ #ifdef MAEMO
+ appGUI->stat_button = gui_stock_label_button(NULL, KANATEST_STOCK_BUTTON_STATISTICS);
+@@ -881,23 +905,39 @@
+ gtk_widget_set_tooltip_text (appGUI->about_button, _("About"));
+ #endif
+ appGUI->stop_button = gui_stock_label_button(_("Stop"), GTK_STOCK_STOP);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->stop_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->stop_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->stop_button), "clicked",
+ G_CALLBACK (stop_test_cb), appGUI);
+ gtk_widget_show (appGUI->stop_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->stop_button);
+ gtk_container_set_border_width (GTK_CONTAINER (appGUI->stop_button), 4);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (appGUI->stop_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (appGUI->stop_button, GTK_CAN_DEFAULT);
++#endif
+ gtk_widget_set_tooltip_text (appGUI->stop_button, _("Press to stop testing..."));
+
+ appGUI->quit_button = gui_stock_label_button(_("Quit"), GTK_STOCK_QUIT);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->quit_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->quit_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->quit_button), "clicked",
+ G_CALLBACK (gui_close_window_cb), appGUI);
+ gtk_widget_show (appGUI->quit_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->quit_button);
+ gtk_container_set_border_width (GTK_CONTAINER (appGUI->quit_button), 4);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (appGUI->quit_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (appGUI->quit_button, GTK_CAN_DEFAULT);
++#endif
+ gtk_widget_set_tooltip_text (appGUI->quit_button, _("Exit!"));
+
+ gui_disable_test (appGUI);
+Index: src/options.c
+===================================================================
+--- kanatest/src/options.c (revision 59)
++++ kanatest/src/options.c (revision 60)
+@@ -178,13 +178,13 @@
+ void
+ kana_selected_cb (GtkToggleButton *button, gpointer user_data) {
+
+-gint pos;
++size_t pos;
+
+ MESSAGE *msg = (MESSAGE *)user_data;
+
+ if (msg->appGUI->opt->disable_toggles == FALSE) {
+
+- pos = (int) msg->data;
++ pos = (size_t) msg->data;
+ #ifdef MAEMO
+ if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (button)) == TRUE) {
+ #else
+@@ -436,7 +436,7 @@
+ row_button_select_cb (GtkWidget *widget, gpointer user_data) {
+
+ MESSAGE *msg = (MESSAGE *)user_data;
+- select_deselect_row ((gint) msg->data, TRUE, msg->appGUI);
++ select_deselect_row ((size_t) msg->data, TRUE, msg->appGUI);
+ }
+
+ /*--------------------------------------------------------------------*/
+@@ -445,7 +445,7 @@
+ row_button_deselect_cb (GtkWidget *widget, gpointer user_data) {
+
+ MESSAGE *msg = (MESSAGE *)user_data;
+- select_deselect_row ((gint) msg->data, FALSE, msg->appGUI);
++ select_deselect_row ((size_t) msg->data, FALSE, msg->appGUI);
+ }
+
+ /*--------------------------------------------------------------------*/
+@@ -525,7 +525,7 @@
+ #endif
+ } else {
+ g_snprintf (buffer, BUFFER_SIZE, "%s ",
+- get_kana_sign(i, hiragana_mode == TRUE ? HIRAGANA:KATAKANA, TRUE));
++ get_kana_sign(i, hiragana_mode == TRUE ? HIRAGANA:KATAKANA, TRUE));
+ gtk_text_buffer_insert (textbuffer, &iter_start, buffer, -1);
+ n++;
+ }
+@@ -649,7 +649,7 @@
+ gtk_window_set_modal (GTK_WINDOW(appGUI->opt->auto_selection_window), TRUE);
+ gtk_window_set_default_size (GTK_WINDOW(appGUI->opt->auto_selection_window), 300, 400);
+ gtk_window_move (GTK_WINDOW (appGUI->opt->auto_selection_window),
+- config.options_window_x + 100, config.options_window_y + 80);
++ config.options_window_x + 100, config.options_window_y + 80);
+ #endif
+ g_signal_connect (G_OBJECT (appGUI->opt->auto_selection_window), "delete_event",
+ G_CALLBACK(auto_select_delete_event_cb), appGUI);
+@@ -680,7 +680,11 @@
+ gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON (appGUI->opt->hiragana_radiobutton), FALSE);
+ #endif
+ gtk_widget_show (appGUI->opt->hiragana_radiobutton);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->hiragana_radiobutton, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->hiragana_radiobutton, GTK_CAN_FOCUS);
++#endif
+ gtk_box_pack_start (GTK_BOX (hbox1), appGUI->opt->hiragana_radiobutton, FALSE, FALSE, 0);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (appGUI->opt->hiragana_radiobutton), radiobutton_group);
+ radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (appGUI->opt->hiragana_radiobutton));
+@@ -692,7 +696,11 @@
+ gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON (katakana_radiobutton), FALSE);
+ #endif
+ gtk_widget_show (katakana_radiobutton);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (katakana_radiobutton, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (katakana_radiobutton, GTK_CAN_FOCUS);
++#endif
+ gtk_box_pack_start (GTK_BOX (hbox1), katakana_radiobutton, FALSE, FALSE, 0);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (katakana_radiobutton), radiobutton_group);
+ radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (katakana_radiobutton));
+@@ -897,14 +905,22 @@
+ g_signal_connect (G_OBJECT (cancel_button), "clicked",
+ G_CALLBACK (auto_select_close_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), cancel_button);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (cancel_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (cancel_button, GTK_CAN_DEFAULT);
++#endif
+
+ appGUI->opt->select_button = gui_stock_label_button(_("Select"), GTK_STOCK_INDEX);
+ gtk_widget_show (appGUI->opt->select_button);
+ g_signal_connect (G_OBJECT (appGUI->opt->select_button), "clicked",
+ G_CALLBACK (auto_select_select_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->opt->select_button);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default(appGUI->opt->select_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (appGUI->opt->select_button, GTK_CAN_DEFAULT);
++#endif
+ #else
+ appGUI->opt->select_button = gtk_button_new_with_label ("dummy");
+ #endif
+@@ -1000,7 +1016,11 @@
+ gtk_container_add (GTK_CONTAINER (appGUI->opt->options_window), vbox1);
+
+ appGUI->opt->notebook = gtk_notebook_new();
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->notebook, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->notebook, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (appGUI->opt->notebook);
+ gtk_notebook_set_tab_pos (GTK_NOTEBOOK(appGUI->opt->notebook), GTK_POS_TOP);
+ gtk_box_pack_start (GTK_BOX (vbox1), appGUI->opt->notebook, TRUE, TRUE, 0);
+@@ -1064,7 +1084,7 @@
+ gtk_container_set_border_width (GTK_CONTAINER (appGUI->opt->rna_radio_button), 8);
+ gtk_widget_show (appGUI->opt->rna_radio_button);
+ gtk_widget_set_tooltip_text (appGUI->opt->rna_radio_button,
+- _("When this option is enabled the kanatest will display every question once"));
++ _("When this option is enabled the kanatest will display every question once"));
+ g_signal_connect (G_OBJECT (appGUI->opt->rna_radio_button), "toggled",
+ G_CALLBACK (options_repeat_mode_changed_cb), appGUI);
+
+@@ -1077,7 +1097,7 @@
+ gtk_container_set_border_width (GTK_CONTAINER (appGUI->opt->rwa_radio_button), 8);
+ gtk_widget_show (appGUI->opt->rwa_radio_button);
+ gtk_widget_set_tooltip_text (appGUI->opt->rwa_radio_button,
+- _("When this option is enabled the kanatest will repeat all wrongly answered questions at the end of test"));
++ _("When this option is enabled the kanatest will repeat all wrongly answered questions at the end of test"));
+ g_signal_connect (G_OBJECT (appGUI->opt->rwa_radio_button), "toggled",
+ G_CALLBACK (options_repeat_mode_changed_cb), appGUI);
+
+@@ -1090,7 +1110,7 @@
+ gtk_container_set_border_width (GTK_CONTAINER (appGUI->opt->raa_radio_button), 8);
+ gtk_widget_show (appGUI->opt->raa_radio_button);
+ gtk_widget_set_tooltip_text (appGUI->opt->raa_radio_button,
+- _("When this option is enabled the kanatest will repeat all questions forever"));
++ _("When this option is enabled the kanatest will repeat all questions forever"));
+ g_signal_connect (G_OBJECT (appGUI->opt->raa_radio_button), "toggled",
+ G_CALLBACK (options_repeat_mode_changed_cb), appGUI);
+
+@@ -1137,7 +1157,11 @@
+ (GtkAttachOptions) (0), 0, 0);
+
+ combobox_ca_timeout = gtk_combo_box_new_text ();
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (combobox_ca_timeout, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (combobox_ca_timeout, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (combobox_ca_timeout);
+ g_signal_connect (G_OBJECT (combobox_ca_timeout), "changed",
+ G_CALLBACK (options_combobox_ca_timeout_handler_cb), NULL);
+@@ -1331,12 +1355,16 @@
+
+ gtk_widget_show (appGUI->opt->check_buttons[pos]);
+
+- msg[pos].data = (gpointer) pos;
++ msg[pos].data = (gpointer)((size_t)pos);
+ msg[pos].appGUI = appGUI;
+ g_signal_connect (G_OBJECT (appGUI->opt->check_buttons[pos]), "toggled",
+ G_CALLBACK (kana_selected_cb), &msg[pos]);
+
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->check_buttons[pos], FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->check_buttons[pos], GTK_CAN_FOCUS);
++#endif
+ gtk_container_add (GTK_CONTAINER (frames[pos]), appGUI->opt->check_buttons[pos]);
+
+ if(config.user_defined_lesson[pos] == '+') {
+@@ -1355,14 +1383,18 @@
+
+ appGUI->opt->row_button_s[j] = gui_stock_label_button (NULL, GTK_STOCK_APPLY);
+ gtk_button_set_relief (GTK_BUTTON (appGUI->opt->row_button_s[j]), GTK_RELIEF_NONE);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->row_button_s[j], FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->row_button_s[j], GTK_CAN_FOCUS);
++#endif
+ gtk_widget_set_tooltip_text (appGUI->opt->row_button_s[j], _("Select all kanas in row"));
+ gtk_widget_show (appGUI->opt->row_button_s[j]);
+ gtk_table_attach (GTK_TABLE (table), appGUI->opt->row_button_s[j], i, i+1, j, j+1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+- msg2[j].data = (gpointer) j;
++ msg2[j].data = (gpointer)((size_t)j);
+ msg2[j].appGUI = appGUI;
+ g_signal_connect (G_OBJECT (appGUI->opt->row_button_s[j]), "clicked",
+ G_CALLBACK (row_button_select_cb), &msg2[j]);
+@@ -1371,7 +1403,11 @@
+
+ appGUI->opt->row_button_c[j] = gui_stock_label_button (NULL, GTK_STOCK_CLEAR);
+ gtk_button_set_relief (GTK_BUTTON (appGUI->opt->row_button_c[j]), GTK_RELIEF_NONE);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->row_button_c[j], FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->row_button_c[j], GTK_CAN_FOCUS);
++#endif
+ gtk_widget_set_tooltip_text (appGUI->opt->row_button_c[j], _("Deselect all kanas in row"));
+ gtk_widget_show (appGUI->opt->row_button_c[j]);
+ gtk_table_attach (GTK_TABLE (table), appGUI->opt->row_button_c[j], i, i+1, j, j+1,
+@@ -1425,7 +1461,11 @@
+ gtk_box_pack_end (GTK_BOX (hbox), combobox_dtf, FALSE, FALSE, 0);
+ #else
+ auto_select_button = gtk_button_new_with_label (_("Statistics based selection"));
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (auto_select_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (auto_select_button, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (auto_select_button);
+ gtk_box_pack_end (GTK_BOX (hbox), auto_select_button, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT (auto_select_button), "clicked",
+@@ -1443,7 +1483,11 @@
+ gtk_misc_set_padding (GTK_MISC (label), 4, 0);
+
+ combobox_dtf = gtk_combo_box_new_text ();
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (combobox_dtf, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (combobox_dtf, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (combobox_dtf);
+ gtk_box_pack_start (GTK_BOX (hbox), combobox_dtf, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT (combobox_dtf), "changed",
+@@ -1469,21 +1513,33 @@
+ gtk_misc_set_padding (GTK_MISC (label), 4, 0);
+
+ select_all_button = gtk_button_new_with_label (_("All"));
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (select_all_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (select_all_button, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (select_all_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox_s), select_all_button);
+ g_signal_connect (G_OBJECT (select_all_button), "clicked",
+ G_CALLBACK (select_all_action_cb), appGUI);
+
+ select_none_button = gtk_button_new_with_label (_("None"));
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (select_none_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (select_none_button, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (select_none_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox_s), select_none_button);
+ g_signal_connect (G_OBJECT (select_none_button), "clicked",
+ G_CALLBACK (select_none_action_cb), appGUI);
+
+ invert_selection_button = gtk_button_new_with_label (_("Invert"));
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (invert_selection_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (invert_selection_button, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (select_none_button);
+ gtk_widget_show (invert_selection_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox_s), invert_selection_button);
+@@ -1504,8 +1560,12 @@
+ g_signal_connect (G_OBJECT (close_button), "clicked",
+ G_CALLBACK (options_close_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), close_button);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (close_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ #endif
++#endif
+ switch(config.repeat_mode) {
+ case REPEAT_ALL:
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(appGUI->opt->raa_radio_button), TRUE);
+@@ -1521,7 +1581,7 @@
+
+ if (appGUI->opt->active_tab != -1) {
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (appGUI->opt->notebook), appGUI->opt->active_tab);
+- }
++ }
+
+ gtk_widget_show (appGUI->opt->options_window);
+
Modified: packages/trunk/kanatest/debian/patches/series
===================================================================
--- packages/trunk/kanatest/debian/patches/series 2011-03-28 09:22:23 UTC (rev 12032)
+++ packages/trunk/kanatest/debian/patches/series 2011-03-28 09:24:30 UTC (rev 12033)
@@ -1,2 +1,3 @@
001_PATH_MAX_fix.diff
002_updated_emails_and_links.patch
+003_gtk_ftbfs_fix.patch
More information about the Pkg-games-commits
mailing list