diff options
| -rw-r--r-- | avahi-gobject/AvahiCore-0.6.gir | 6 | ||||
| -rw-r--r-- | avahi-ui/avahi-ui.c | 8 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/avahi-gobject/AvahiCore-0.6.gir b/avahi-gobject/AvahiCore-0.6.gir index 8b25fc1..5d7f68b 100644 --- a/avahi-gobject/AvahiCore-0.6.gir +++ b/avahi-gobject/AvahiCore-0.6.gir @@ -1,10 +1,12 @@ <?xml version="1.0"?> -<repository version="1.0" +<repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> <namespace name="AvahiCore" version="0.6" shared-library="avahi-core"> - <alias name="IfIndex" target="int" c:type="AvahiIfIndex"/> + <alias name="IfIndex" c:type="AvahiIfIndex"> + <type name="gint" c:type="int"/> + </alias> <enumeration name="Protocol" c:type="AvahiProtocol"> <member name="inet" value="0" diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c index 62ccd18..2569ba0 100644 --- a/avahi-ui/avahi-ui.c +++ b/avahi-ui/avahi-ui.c @@ -254,11 +254,13 @@ GtkWidget *aui_service_dialog_new_valist( const gchar *button_text; gint dr; - GtkWidget *w = GTK_WIDGET(g_object_new( + GtkWidget *w = (GtkWidget*)g_object_new( AUI_TYPE_SERVICE_DIALOG, +#if !GTK_CHECK_VERSION (2,21,8) "has-separator", FALSE, +#endif "title", title, - NULL)); + NULL); if (parent) gtk_window_set_transient_for(GTK_WINDOW(w), parent); @@ -985,7 +987,9 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user p->domain_dialog = gtk_dialog_new(); gtk_container_set_border_width(GTK_CONTAINER(p->domain_dialog), 5); gtk_window_set_title(GTK_WINDOW(p->domain_dialog), _("Change domain")); +#if !GTK_CHECK_VERSION(2,21,8) gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE); +#endif vbox = gtk_vbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); diff --git a/configure.ac b/configure.ac index 411961a..7fafc98 100644 --- a/configure.ac +++ b/configure.ac @@ -472,7 +472,7 @@ AM_CONDITIONAL(HAVE_GOBJECT, test "x$HAVE_GOBJECT" = "xyes") # # Introspection support. # -GOBJECT_INTROSPECTION_CHECK([0.6.7]) +GOBJECT_INTROSPECTION_CHECK([0.9.5]) # # Check for Qt 3 @@ -770,7 +770,7 @@ AC_ARG_ENABLE(libdaemon, [HAVE_LIBDAEMON=yes]) if test "x$HAVE_LIBDAEMON" = "xyes" ; then - PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.11 ]) + PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.14 ]) AC_SUBST(LIBDAEMON_CFLAGS) AC_SUBST(LIBDAEMON_LIBS) fi |