Dear maintainer,
I've prepared an NMU for scim-skk (versioned as 0.5.2-7.1) and will have it uploaded soon. Cheers Luk
diff -u scim-skk-0.5.2/debian/changelog scim-skk-0.5.2/debian/changelog --- scim-skk-0.5.2/debian/changelog +++ scim-skk-0.5.2/debian/changelog @@ -1,3 +1,10 @@ +scim-skk (0.5.2-7.1) unstable; urgency=low + + * Non-maintainer upload. + * Add patch to build with gtk3 (Closes: #676014). + + -- Luk Claes <l...@debian.org> Sun, 08 Jul 2012 23:02:16 +0000 + scim-skk (0.5.2-7) unstable; urgency=low * debian/control: add "Uploaders: Yukiharu YABUKI" diff -u scim-skk-0.5.2/debian/control scim-skk-0.5.2/debian/control --- scim-skk-0.5.2/debian/control +++ scim-skk-0.5.2/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ikuya Awashiro <ik...@oooug.jp> Uploaders: Yukiharu YABUKI <yyab...@debian.org> -Build-Depends: debhelper (>= 7.0.0), dpatch (>= 1.11), libscim-dev (>= 1.4.6), autotools-dev, pkg-config, libltdl-dev +Build-Depends: debhelper (>= 7.0.0), dpatch (>= 1.11), libscim-dev (>= 1.4.6), autotools-dev, pkg-config, libltdl-dev, libgtk-3-dev Standards-Version: 3.9.1.0 Homepage: http://scim-imengine.sourceforge.jp/ diff -u scim-skk-0.5.2/debian/patches/00list scim-skk-0.5.2/debian/patches/00list --- scim-skk-0.5.2/debian/patches/00list +++ scim-skk-0.5.2/debian/patches/00list @@ -3,0 +4 @@ +30_gtk3-fixes only in patch2: unchanged: --- scim-skk-0.5.2.orig/debian/patches/30_gtk3-fixes.dpatch +++ scim-skk-0.5.2/debian/patches/30_gtk3-fixes.dpatch @@ -0,0 +1,550 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_gtk3-fixes.dpatch by Tz-Huan Huang <tzh...@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +Index: scim-skk-0.5.2/src/scim_skk_imengine_setup.cpp +=================================================================== +--- scim-skk-0.5.2.orig/src/scim_skk_imengine_setup.cpp 2005-12-18 12:15:53.000000000 +0000 ++++ scim-skk-0.5.2/src/scim_skk_imengine_setup.cpp 2012-07-08 22:45:11.000000000 +0000 +@@ -178,7 +178,10 @@ + static GtkWidget * __widget_annot_highlight = 0; + static GtkWidget * __widget_ignore_return = 0; + static GtkWidget * __widget_selection_style = 0; ++#if GTK_CHECK_VERSION(2, 12, 0) ++#else + static GtkTooltips * __widget_tooltips = 0; ++#endif + + static KeyboardConfigData __config_keyboards_common [] = + { +@@ -476,25 +479,43 @@ + { + GtkWidget *hbox, *label; + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else + hbox = gtk_hbox_new (FALSE, 0); ++#endif + gtk_widget_show (hbox); + + label = gtk_label_new (label_text); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4); + ++#if GTK_CHECK_VERSION(2, 4, 0) ++ *widget = gtk_combo_box_text_new_with_entry (); ++ gtk_editable_set_editable ( ++ GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (*widget))), FALSE); ++#else + *widget = gtk_combo_new (); + gtk_combo_set_value_in_list (GTK_COMBO (*widget), TRUE, FALSE); + gtk_combo_set_case_sensitive (GTK_COMBO (*widget), TRUE); +- gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (*widget)->entry), FALSE); ++ gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (*widget)->entry), FALSE); ++#endif + gtk_widget_show (*widget); + gtk_box_pack_start (GTK_BOX (hbox), *widget, FALSE, FALSE, 4); ++#if GTK_CHECK_VERSION(2, 4, 0) ++ g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (*widget))), DATA_POINTER_KEY, ++ (gpointer) candidates_p); ++ g_signal_connect ((gpointer) gtk_bin_get_child (GTK_BIN (*widget)), "changed", ++ G_CALLBACK (on_default_combo_changed), ++ data_p); ++#else + g_object_set_data (G_OBJECT (GTK_COMBO (*widget)->entry), DATA_POINTER_KEY, + (gpointer) candidates_p); + + g_signal_connect ((gpointer) GTK_COMBO (*widget)->entry, "changed", + G_CALLBACK (on_default_combo_changed), + data_p); ++#endif + + return hbox; + } +@@ -505,7 +526,11 @@ + GtkWidget *hbox, *label = NULL; + if (!entry) return NULL; + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else + hbox = gtk_hbox_new (FALSE, 0); ++#endif + gtk_widget_show (hbox); + + if (entry->label) { +@@ -527,11 +552,18 @@ + if (label) + gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry->widget); + ++#if GTK_CHECK_VERSION(2, 12, 0) ++#else + if (!__widget_tooltips) + __widget_tooltips = gtk_tooltips_new(); ++#endif + if (entry->tooltip) ++#if GTK_CHECK_VERSION(2, 12, 0) ++ gtk_widget_set_tooltip_text(entry->widget, _(entry->tooltip)); ++#else + gtk_tooltips_set_tip(__widget_tooltips, entry->widget, + _(entry->tooltip), NULL); ++#endif + + return hbox; + } +@@ -557,7 +589,11 @@ + GtkWidget *annot_widgets, *bgcolor_widgets; + gchar *markup; + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++#else + vbox = gtk_vbox_new (FALSE, 0); ++#endif + gtk_widget_show (vbox); + + /* title 1 */ +@@ -573,7 +609,11 @@ + + + /* list size */ +- widget = gtk_hbox_new(FALSE, 0); ++#if GTK_CHECK_VERSION(3, 0, 0) ++ widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else ++ widget = gtk_hbox_new (FALSE, 0); ++#endif + label = gtk_label_new (_("List Size:")); + __widget_listsize = gtk_spin_button_new_with_range(0, 100, 1); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON (__widget_listsize), 0); +@@ -600,7 +640,11 @@ + gtk_box_pack_start (GTK_BOX (vbox), __widget_annot_view, FALSE, FALSE, 1); + gtk_container_set_border_width (GTK_CONTAINER (__widget_annot_view), 0); + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ annot_widgets = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++#else + annot_widgets = gtk_vbox_new(FALSE, 0); ++#endif + gtk_box_pack_start (GTK_BOX(vbox), annot_widgets, FALSE, FALSE, 1); + gtk_widget_show(annot_widgets); + widget = create_combo_widget (_("Position of Annotation:"), +@@ -618,7 +662,11 @@ + gtk_box_pack_start (GTK_BOX (annot_widgets), widget, FALSE, FALSE, 1); + + /* annotation color */ ++#if GTK_CHECK_VERSION(3, 0, 0) ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else + hbox = gtk_hbox_new(FALSE, 0); ++#endif + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 1); + gtk_widget_show(hbox); + __widget_annot_highlight = gtk_check_button_new_with_mnemonic(_("Highlight Annotation.")); +@@ -654,26 +702,38 @@ + { + GtkWidget *vbox, *widget, *label, *button; + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++#else + vbox = gtk_vbox_new (FALSE, 0); ++#endif + gtk_widget_show (vbox); + + /* system dictionaries */ + __widget_sysdicts = dict_selection_widget_setup(); + gtk_box_pack_start (GTK_BOX (vbox), __widget_sysdicts, FALSE, FALSE, 4); ++#if GTK_CHECK_VERSION(3, 2, 0) ++ widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); ++#else + widget = gtk_hseparator_new(); ++#endif + gtk_widget_show(widget); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0); + + /* user dictionary */ +- widget = gtk_hbox_new(FALSE, 0); +- label = gtk_label_new(_("User Dictionary Name:")); +- __widget_userdict = gtk_entry_new(); +- gtk_widget_show(label); +- gtk_widget_show(__widget_userdict); ++#if GTK_CHECK_VERSION(3, 0, 0) ++ widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else ++ widget = gtk_hbox_new (FALSE, 0); ++#endif ++ label = gtk_label_new (_("User Dictionary Name:")); ++ __widget_userdict = gtk_entry_new (); ++ gtk_widget_show (label); ++ gtk_widget_show (__widget_userdict); + gtk_box_pack_start (GTK_BOX (widget), label, FALSE, FALSE, 4); + gtk_box_pack_start (GTK_BOX (widget), __widget_userdict, TRUE, TRUE, 4); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), __widget_userdict); +- gtk_widget_show(widget); ++ gtk_widget_show (widget); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 4); + + g_signal_connect ((gpointer) __widget_userdict, "changed", +@@ -719,7 +779,7 @@ + // Create keyboard setting. + for (unsigned int i = 0; data[i].key; ++ i) { + APPEND_ENTRY(_(data[i].label), data[i].entry, i); +- gtk_entry_set_editable (GTK_ENTRY (data[i].entry), FALSE); ++ gtk_editable_set_editable (GTK_EDITABLE (data[i].entry), FALSE); + + data[i].button = gtk_button_new_with_label ("..."); + gtk_widget_show (data[i].button); +@@ -738,11 +798,18 @@ + &(data[i].data)); + } + ++#if GTK_CHECK_VERSION(2, 12, 0) ++#else + if (!__widget_tooltips) + __widget_tooltips = gtk_tooltips_new(); ++#endif + for (unsigned int i = 0; data[i].key; ++ i) { ++#if GTK_CHECK_VERSION(2, 12, 0) ++ gtk_widget_set_tooltip_text (data[i].entry, _(data[i].tooltip)); ++#else + gtk_tooltips_set_tip (__widget_tooltips, data[i].entry, + _(data[i].tooltip), NULL); ++#endif + } + + return table; +@@ -792,9 +859,19 @@ + } + + static void +-setup_combo_value (GtkCombo *combo, ++setup_combo_value (GtkWidget *combo, + ComboConfigData *data, const String & str) + { ++#if GTK_CHECK_VERSION(2, 4, 0) ++ gint default_index = -1; ++ for (gint i = 0; data[i].label; i++) { ++ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(data[i].label)); ++ if (!strcmp (data[i].data, str.c_str ())) ++ default_index = i; ++ } ++ if (default_index != -1) ++ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), default_index); ++#else + GList *list = NULL; + const char *defval = NULL; + +@@ -809,23 +886,24 @@ + + if (defval) + gtk_entry_set_text (GTK_ENTRY (combo->entry), defval); ++#endif + } + + static void + setup_widget_value () + { + if (__widget_selection_style) { +- setup_combo_value (GTK_COMBO (__widget_selection_style), ++ setup_combo_value (__widget_selection_style, + selection_style, __config_selection_style); + } + + if (__widget_annot_pos) { +- setup_combo_value (GTK_COMBO (__widget_annot_pos), ++ setup_combo_value (__widget_annot_pos, + annot_position, __config_annot_pos); + } + + if (__widget_annot_target) { +- setup_combo_value (GTK_COMBO (__widget_annot_target), ++ setup_combo_value (__widget_annot_target, + annot_target, __config_annot_target); + } + +@@ -1057,6 +1135,29 @@ + FileConfigData *data = static_cast <FileConfigData *> (user_data); + + if (data) { ++#if GTK_CHECK_VERSION(2, 4, 0) ++ GtkWidget *dialog = gtk_file_chooser_dialog_new( ++ _(data->title), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, ++ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, ++ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ++ NULL); ++ gtk_file_chooser_set_filename ( ++ GTK_FILE_CHOOSER (dialog), ++ gtk_entry_get_text (GTK_ENTRY (data->entry))); ++ ++ if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { ++ char *filename; ++ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); ++ gtk_entry_set_text (GTK_ENTRY (data->entry), filename); ++ if (strcmp (filename, gtk_entry_get_text (GTK_ENTRY (data->entry))) != 0) { ++ gtk_entry_set_text (GTK_ENTRY (data->entry), filename); ++ data->data = filename; ++ __have_changed = true; ++ } ++ g_free (filename); ++ } ++ gtk_widget_destroy (dialog); ++#else + GtkWidget *dialog = gtk_file_selection_new (_(data->title)); + gint result; + +@@ -1076,6 +1177,7 @@ + } + + gtk_widget_destroy (dialog); ++#endif + } + } + +Index: scim-skk-0.5.2/src/scim_skk_setup_dictionaries.cpp +=================================================================== +--- scim-skk-0.5.2.orig/src/scim_skk_setup_dictionaries.cpp 2005-12-18 11:36:36.000000000 +0000 ++++ scim-skk-0.5.2/src/scim_skk_setup_dictionaries.cpp 2012-07-08 22:59:49.000000000 +0000 +@@ -59,7 +59,7 @@ + }; + + struct DictionaryConfigWidgets { +- gchar *title; ++ const gchar *title; + GtkWidget *widget; + GtkWidget *entry; + GtkWidget *button; +@@ -170,7 +170,11 @@ + dict_entry_widgets_dictfile_setup (DictionaryConfigWidgets *widgets) + { + GtkWidget *label; ++#if GTK_CHECK_VERSION(3, 0, 0) ++ widgets->widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else + widgets->widget = gtk_hbox_new(FALSE, 0); ++#endif + label = gtk_label_new(widgets->title); + widgets->entry = gtk_entry_new(); + widgets->button = gtk_button_new_with_label ("..."); +@@ -195,8 +199,13 @@ + { + GtkWidget *hbox, *label; + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ widgets->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else + widgets->widget = gtk_vbox_new(FALSE, 0); + hbox = gtk_hbox_new(FALSE, 0); ++#endif + gtk_widget_hide(widgets->widget); + label = gtk_label_new(_("Server Name:")); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4); +@@ -205,7 +214,11 @@ + TRUE, TRUE, 4); + gtk_box_pack_start(GTK_BOX(widgets->widget), hbox, + FALSE, FALSE, 4); ++#if GTK_CHECK_VERSION(3, 0, 0) ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else + hbox = gtk_hbox_new(FALSE, 0); ++#endif + label = gtk_label_new(_("Port Number:")); + widgets->entry2 = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4); +@@ -224,7 +237,11 @@ + GtkWidget *button; + + /* edit buttons */ ++#if GTK_CHECK_VERSION(3, 0, 0) ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else + hbox = gtk_hbox_new(FALSE, 0); ++#endif + button = gtk_button_new_with_label(_("Add")); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 4); + g_signal_connect((gpointer) button, "clicked", +@@ -245,7 +262,11 @@ + { + GtkWidget *tree; + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ __widget_sysdicts = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++#else + __widget_sysdicts = gtk_vbox_new(FALSE, 0); ++#endif + dict_list_setup(__config_sysdicts); + + /* setup container for dictionaries selection */ +@@ -257,10 +278,18 @@ + + { + GtkWidget *hbox, *vbox, *button; ++#if GTK_CHECK_VERSION(3, 0, 0) ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else + hbox = gtk_hbox_new(FALSE, 0); ++#endif + gtk_widget_show(hbox); + gtk_box_pack_start(GTK_BOX(hbox), tree, TRUE, TRUE, 4); ++#if GTK_CHECK_VERSION(3, 0, 0) ++ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++#else + vbox = gtk_vbox_new(FALSE, 0); ++#endif + button = gtk_button_new_from_stock(GTK_STOCK_GO_UP); + gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, FALSE, 4); + g_signal_connect((gpointer) button, "clicked", +@@ -301,6 +330,24 @@ + DictionaryConfigWidgets *data = static_cast <DictionaryConfigWidgets *> (user_data); + + if (data) { ++#if GTK_CHECK_VERSION(2, 4, 0) ++ GtkWidget *dialog = gtk_file_chooser_dialog_new ( ++ _(data->title), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, ++ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, ++ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ++ NULL); ++ gtk_file_chooser_set_filename ( ++ GTK_FILE_CHOOSER (dialog), ++ gtk_entry_get_text (GTK_ENTRY (data->entry))); ++ ++ if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { ++ char *filename; ++ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); ++ gtk_entry_set_text (GTK_ENTRY (data->entry), filename); ++ g_free (filename); ++ } ++ gtk_widget_destroy (dialog); ++#else + GtkWidget *dialog = gtk_file_selection_new (_(data->title)); + gint result; + +@@ -318,6 +365,7 @@ + } + + gtk_widget_destroy (dialog); ++#endif + } + } + +@@ -325,12 +373,20 @@ + dict_type_changed_cb (GtkComboBox *combo, + gpointer userdata) + { ++#if GTK_CHECK_VERSION(2, 24, 0) ++ gchar *typetext = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT (combo)); ++#else + gchar *typetext = gtk_combo_box_get_active_text(combo); ++#endif + for (int i = 0; __dict_type_names[i] != ""; i++) { + if (__dict_type_names[i] == typetext) { + gtk_widget_show_all(__widgets_dicts[i].widget); + } else { ++#if GTK_CHECK_VERSION(2, 24, 0) ++ gtk_widget_hide(__widgets_dicts[i].widget); ++#else + gtk_widget_hide_all(__widgets_dicts[i].widget); ++#endif + } + } + gtk_entry_set_text(GTK_ENTRY(__widgets_dicts[0].entry), ""); +@@ -351,37 +407,74 @@ + gtk_window_set_title(GTK_WINDOW(dialog), + _("Add new dictionary")); + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++#else + hbox = gtk_hbox_new(FALSE, 0); ++#endif + gtk_widget_show(hbox); + label = gtk_label_new(_("Dictionary Type: ")); + gtk_widget_show(label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4); ++#if GTK_CHECK_VERSION(2, 24, 0) ++ __combo_box_dict_types = gtk_combo_box_text_new(); ++#else + __combo_box_dict_types = gtk_combo_box_new_text(); ++#endif + for (int i = 0; !__dict_type_names[i].empty(); i++) { ++#if GTK_CHECK_VERSION(2, 24, 0) ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (__combo_box_dict_types), ++ __dict_type_names[i].data()); ++#else + gtk_combo_box_append_text(GTK_COMBO_BOX(__combo_box_dict_types), + __dict_type_names[i].data()); ++#endif + } + g_signal_connect((gpointer) __combo_box_dict_types, "changed", + G_CALLBACK(dict_type_changed_cb), + NULL); + gtk_widget_show(__combo_box_dict_types); + gtk_box_pack_start(GTK_BOX(hbox), __combo_box_dict_types, FALSE, TRUE, 4); ++#if GTK_CHECK_VERSION(3, 0, 0) ++ gtk_box_pack_start( ++ GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), ++ hbox, FALSE, FALSE, 4); ++#else + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 4); ++#endif + + /* dictionary file widgets */ + dict_entry_widgets_dictfile_setup(&(__widgets_dicts[0])); ++#if GTK_CHECK_VERSION(3, 0, 0) ++ gtk_box_pack_start( ++ GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), ++ __widgets_dicts[0].widget, TRUE, TRUE, 4); ++#else + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), __widgets_dicts[0].widget, + TRUE, FALSE, 4); ++#endif + + /* skkserv widgets */ + dict_entry_widgets_skkserv_setup(&__widgets_dicts[1]); ++#if GTK_CHECK_VERSION(3, 0, 0) ++ gtk_box_pack_start( ++ GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), ++ __widgets_dicts[1].widget, TRUE, FALSE, 4); ++#else + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), __widgets_dicts[1].widget, + TRUE, FALSE, 4); ++#endif + + /* dictionary file widgets */ + dict_entry_widgets_dictfile_setup(&__widgets_dicts[2]); ++#if GTK_CHECK_VERSION(3, 0, 0) ++ gtk_box_pack_start( ++ GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), ++ __widgets_dicts[2].widget, TRUE, FALSE, 4); ++#else + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), __widgets_dicts[2].widget, + TRUE, FALSE, 4); ++#endif + + gtk_combo_box_set_active(GTK_COMBO_BOX(__combo_box_dict_types), 0); + +@@ -392,12 +485,19 @@ + _("Add"), + GTK_RESPONSE_OK); + gtk_widget_grab_default(ok_button); ++#if GTK_CHECK_VERSION(2, 22, 0) ++#else + gtk_dialog_set_has_separator(GTK_DIALOG(dialog), TRUE); ++#endif + gtk_widget_show(dialog); + + result = gtk_dialog_run(GTK_DIALOG(dialog)); + if (result == GTK_RESPONSE_OK) { ++#if GTK_CHECK_VERSION(2, 24, 0) ++ String dict_type = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(__combo_box_dict_types)); ++#else + String dict_type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(__combo_box_dict_types)); ++#endif + String dict_name; + GtkTreeIter iter; + GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(userdata));
