Depend on GTK+ >= 2.24.3, cairo >= 1.20.1, gdk-pixbuf >= 2.22.1
and completely separate configure and sanity checks for gdk-pixbuf from GTK+, because it's now distributed as a separate package. Remove all sorts of conditional compiling based on GDK_CHECK_VERSION() and CAIRO_VERSION.
This commit is contained in:
@ -503,22 +503,13 @@ script_fu_interface (SFScript *script,
|
||||
break;
|
||||
|
||||
case SF_OPTION:
|
||||
#if GTK_CHECK_VERSION (2, 24, 0)
|
||||
widget = gtk_combo_box_text_new ();
|
||||
#else
|
||||
widget = gtk_combo_box_new_text ();
|
||||
#endif
|
||||
for (list = arg->default_value.sfa_option.list;
|
||||
list;
|
||||
list = g_slist_next (list))
|
||||
{
|
||||
#if GTK_CHECK_VERSION (2, 24, 0)
|
||||
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget),
|
||||
gettext (list->data));
|
||||
#else
|
||||
gtk_combo_box_append_text (GTK_COMBO_BOX (widget),
|
||||
gettext (list->data));
|
||||
#endif
|
||||
}
|
||||
|
||||
gtk_combo_box_set_active (GTK_COMBO_BOX (widget),
|
||||
|
Reference in New Issue
Block a user